diff --git a/src/tests/Common/CLRTest.Execute.Bash.targets b/src/tests/Common/CLRTest.Execute.Bash.targets
index 89e893539e69da..dbe3a058c8a213 100644
--- a/src/tests/Common/CLRTest.Execute.Bash.targets
+++ b/src/tests/Common/CLRTest.Execute.Bash.targets
@@ -126,7 +126,7 @@ fi
diff --git a/src/tests/Common/CLRTest.Execute.Batch.targets b/src/tests/Common/CLRTest.Execute.Batch.targets
index 7ae089a0ae72ed..74325b97fb9f87 100644
--- a/src/tests/Common/CLRTest.Execute.Batch.targets
+++ b/src/tests/Common/CLRTest.Execute.Batch.targets
@@ -136,7 +136,7 @@ IF NOT "%CrossGen2SynthesizePgo"=="" (
diff --git a/src/tests/Directory.Merged.props b/src/tests/Directory.Merged.props
index 6bd9586b895731..a0a84e7b29537e 100644
--- a/src/tests/Directory.Merged.props
+++ b/src/tests/Directory.Merged.props
@@ -28,6 +28,6 @@
Directory.Build.targets is typically too late as SDK .targets files will have already
been processed and may have used the value.
-->
- $(MSBuildProjectName.Replace('_il_d', '').Replace('_il_r', ''))
+ $(MSBuildProjectName.Replace('_il_do', '').Replace('_il_d', '').Replace('_il_ro', '').Replace('_il_r', ''))
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.cs b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.cs
index d46a396a8a3ce5..fbcd8090fa8d55 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.cs
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.cs
@@ -3,15 +3,13 @@
using System;
-using Xunit;
namespace N
{
- public class X
+ internal class X
{
- [Fact]
- public static void TestEntryPoint()
+ public static void Main(String[] args)
{
}
}
diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
index 0842e4378d663d..27a209663bfffa 100644
--- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
+++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
@@ -1,6 +1,11 @@
1
+
+
+ true
+ false
diff --git a/src/tests/JIT/jit64/Directory.Build.props b/src/tests/JIT/jit64/Directory.Build.props
new file mode 100644
index 00000000000000..689ebf8db31e1a
--- /dev/null
+++ b/src/tests/JIT/jit64/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+ true
+ false
+
+
diff --git a/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.cs b/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.cs
index fe26189b799326..eac4251c7c1544 100644
--- a/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.cs
+++ b/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Xunit;
internal class MCell
{
private T _t;
@@ -29,9 +30,10 @@ internal class MPair : MCell
public MPair(R r, S s) : base(r) { _s = s; }
}
-internal class M
+public class M
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
MCell c = new MCell(1);
MPair p = c.GetMPair("2");
diff --git a/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj b/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
index cab0a418443f47..221b99c432a708 100644
--- a/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
+++ b/src/tests/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.cs b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.cs
index ea58e3efb7b0d4..59b3884f66b5cc 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.cs
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.cs
@@ -2,8 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-class Program
+public class Program
{
private static TestUtil.TestLog testLog;
@@ -24,7 +25,7 @@ static Program()
testLog = new TestUtil.TestLog(expectedOut);
}
- public static void Test(int count)
+ internal static void Test(int count)
{
try
{
@@ -54,7 +55,8 @@ public static void Test(int count)
}
}
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
// start recording
testLog.StartRecording();
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
index 81ebaed8c56fd9..7b0e0dc00bbf55 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
index 2abef8da589078..b402c1721af911 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.cs b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.cs
index 7413b946342d99..a6fe1d7d6f118a 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.cs
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.cs
@@ -2,8 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-class Program
+public class Program
{
private static TestUtil.TestLog testLog;
@@ -24,7 +25,7 @@ static Program()
testLog = new TestUtil.TestLog(expectedOut);
}
- public static void Test(int count)
+ internal static void Test(int count)
{
try
{
@@ -53,7 +54,8 @@ public static void Test(int count)
}
}
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
// start recording
testLog.StartRecording();
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
index d5eba66acbfefa..89da882b61d862 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
index f52038eeb4d599..2b94e33db9d5e3 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.cs b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.cs
index 8c7002f8ae7ade..76b5ee99603745 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.cs
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.cs
@@ -2,8 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-class Program
+public class Program
{
private static TestUtil.TestLog testLog;
@@ -29,7 +30,7 @@ static Program()
testLog = new TestUtil.TestLog(expectedOut);
}
- public static void Test(int count)
+ internal static void Test(int count)
{
try
{
@@ -76,7 +77,8 @@ public static void Test(int count)
}
}
- static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
// start recording
testLog.StartRecording();
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
index 354fb3bec09f24..289f3e4eb56086 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
index 0c988b857a05a3..fbe4e9dfe426b7 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.il
index 1bf95156761b15..7224eea4859f9c 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.il
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.il
@@ -8,14 +8,18 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
+.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitincatch.exe
+.assembly 'nonlocalexitincatch' {}
+.class public auto ansi nonlocalexitincatch {
.method public static int32 Main()
{
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
.entrypoint
.maxstack 2
.locals init (
@@ -61,6 +65,7 @@
ret
}
+}
.method public static void Run()
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
index 0205c4188ecbe1..7d126d8ebaa2db 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.il
index d446846d89974a..6f265c44b362f9 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.il
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.il
@@ -8,14 +8,18 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
+.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitinfinally.exe
+.assembly 'nonlocalexitinfinally' {}
+.class public auto ansi nonlocalexitinfinally {
.method public static int32 Main()
{
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
.entrypoint
.maxstack 2
.locals init (
@@ -61,6 +65,7 @@
ret
}
+}
.method public static void Run()
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
index 13c507b0746e48..e3c87327b0b460 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.il
index 0eb70159c13eab..cc2454d5d4ddfb 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.il
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.il
@@ -8,14 +8,18 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
+.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitinhandler.exe
+.assembly 'nonlocalexitinhandler' {}
+.class public auto ansi nonlocalexitinhandler {
.method public static int32 Main()
{
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
.entrypoint
.maxstack 2
.locals init (
@@ -64,6 +68,7 @@
ret
}
+}
.method public static void Run()
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
index 20c9dc98a6dea5..f8b85e4d228fa7 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.il
index 3226227fd3a170..991cc42b56fae9 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.il
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.il
@@ -8,14 +8,18 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
+.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitinroot.exe
+.assembly 'nonlocalexitinroot' {}
+.class public auto ansi nonlocalexitinroot {
.method public static int32 Main()
{
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
.entrypoint
.maxstack 2
.locals init (
@@ -55,6 +59,7 @@
ret
}
+}
.method public static void Run()
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
index 0bbd4157df6af1..b2ea1f3aeb2048 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.il b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.il
index 0604aae8d230df..016f047b999c33 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.il
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.il
@@ -8,14 +8,18 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
+.assembly extern xunit.core {}
.assembly extern mscorlib {}
.assembly extern eh_common {}
-.assembly test {}
-.module nonlocalexitintry.exe
+.assembly 'nonlocalexitintry' {}
+.class public auto ansi nonlocalexitintry {
.method public static int32 Main()
{
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
.entrypoint
.maxstack 2
.locals init (
@@ -61,6 +65,7 @@
ret
}
+}
.method public static void Run()
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
index 7af83ce878a374..7e6d51a809fe42 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.cs b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.cs
index b1f597138b9e3b..e3698288cde187 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.cs
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.cs
@@ -7,8 +7,9 @@
// LEAVE with an OPGOTO to the beginning of the cascading CATCHRET chain to unwind the stack...
using System;
+using Xunit;
-class simple
+public class simple
{
private static TestUtil.TestLog testLog;
@@ -26,7 +27,8 @@ static simple()
// Create and initialize test log object
testLog = new TestUtil.TestLog(expectedOut);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
//Start recording
testLog.StartRecording();
diff --git a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
index ce7e56c3e9bd01..8b669192922dc7 100644
--- a/src/tests/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
+++ b/src/tests/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.cs b/src/tests/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.cs
index eabd2ffe545c79..64d8d22bd97fd4 100644
--- a/src/tests/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.cs
+++ b/src/tests/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.cs
@@ -4,8 +4,9 @@
// Non local exit from a catch handler nested inside another catch handler
using System;
+using Xunit;
-class test
+public class test
{
private static TestUtil.TestLog testLog;
@@ -26,7 +27,8 @@ static test()
// Create and initialize test log object
testLog = new TestUtil.TestLog(expectedOut);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
//Start recording
testLog.StartRecording();
diff --git a/src/tests/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj b/src/tests/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
index 23bd18f0211489..706bdec58308b3 100644
--- a/src/tests/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
+++ b/src/tests/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/basics/loopEH.cs b/src/tests/JIT/jit64/eh/basics/loopEH.cs
index 12ead3e0efeb7b..a7ab36a689aa80 100644
--- a/src/tests/JIT/jit64/eh/basics/loopEH.cs
+++ b/src/tests/JIT/jit64/eh/basics/loopEH.cs
@@ -4,10 +4,12 @@
using System;
using System.Collections.Generic;
using System.Text;
+using Xunit;
-internal class Program
+public class Program
{
- private static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
return Test(null, null, null, 0, 1);
}
diff --git a/src/tests/JIT/jit64/eh/basics/loopEH.csproj b/src/tests/JIT/jit64/eh/basics/loopEH.csproj
index 870efffc434e86..fb9a8e3016e6a7 100644
--- a/src/tests/JIT/jit64/eh/basics/loopEH.csproj
+++ b/src/tests/JIT/jit64/eh/basics/loopEH.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter1.il b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter1.il
index b362ae0f79f20f..e370099ee6d072 100644
--- a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter1.il
+++ b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter1.il
@@ -8,14 +8,18 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
+.assembly extern xunit.core {}
.assembly extern mscorlib {}
-.assembly test {}
-.module test.exe
+.assembly 'throwinfinallyintryfilter1' {}
.assembly extern eh_common {}
+.class public auto ansi throwinfinallyintryfilter1 {
.method public static int32 Main()
{
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
.entrypoint
.maxstack 2
.locals init (
@@ -78,6 +82,7 @@
ret
}
+}
.method public static void func(int32 i)
diff --git a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
index 429b7e5a039ab4..0963e12ad2e41f 100644
--- a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
+++ b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter2.il b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter2.il
index 2b321f329b3088..0e23543a18e138 100644
--- a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter2.il
+++ b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter2.il
@@ -8,14 +8,18 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
+.assembly extern xunit.core {}
.assembly extern mscorlib {}
-.assembly test {}
+.assembly 'throwinfinallyintryfilter2' {}
.assembly extern eh_common {}
-.module test.exe
+.class public auto ansi throwinfinallyintryfilter2 {
.method public static int32 Main()
{
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
.entrypoint
.maxstack 2
.locals init (
@@ -78,6 +82,7 @@
ret
}
+}
.method public static void func(int32 i)
diff --git a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
index f16ac198867922..e8b608b208fd80 100644
--- a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
+++ b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
@@ -1,7 +1,4 @@
-
- Exe
-
PdbOnly
True
diff --git a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter3.il b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter3.il
index 6121cad3247107..13aa0841f60817 100644
--- a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter3.il
+++ b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter3.il
@@ -8,14 +8,18 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
+.assembly extern xunit.core {}
.assembly extern mscorlib {}
-.assembly test {}
+.assembly 'throwinfinallyintryfilter3' {}
.assembly extern eh_common {}
-.module test.exe
+.class public auto ansi throwinfinallyintryfilter3 {
.method public static int32 Main()
{
+ .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
+ 01 00 00 00
+ )
.entrypoint
.maxstack 2
.locals init (
@@ -87,6 +91,7 @@
ret
}
+}
.method public static void func(int32 i)
diff --git a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
index 93a7d72cef9dd9..0f929f5dd98959 100644
--- a/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
+++ b/src/tests/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.il b/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.il
index 949d0aa0fe2128..6136f7d0de69e9 100644
--- a/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.il
+++ b/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.il
@@ -12,7 +12,7 @@
.assembly extern eh_common {}
.assembly 'throwisfirstinstruction' {}
-.class private auto ansi beforefieldinit test
+.class public auto ansi beforefieldinit test
extends [mscorlib]System.Object
{
.field private static class [eh_common]TestUtil.TestLog testLog
diff --git a/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj b/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
index 36bb3298067988..373cf57c2b48c1 100644
--- a/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
+++ b/src/tests/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/148343.cs b/src/tests/JIT/jit64/gc/misc/148343.cs
index d5d62381d2aa99..a8e3f9279cd31e 100644
--- a/src/tests/JIT/jit64/gc/misc/148343.cs
+++ b/src/tests/JIT/jit64/gc/misc/148343.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
public class T
{
@@ -27,7 +28,8 @@ public static bool test(ref Object[] arr, ref Object o, int index)
}
static Object[] o = new Object[5];
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
o[1] = "1";
o[2] = "2";
diff --git a/src/tests/JIT/jit64/gc/misc/148343.csproj b/src/tests/JIT/jit64/gc/misc/148343.csproj
index 6e03e2ec7f35c9..6381f6c0526431 100644
--- a/src/tests/JIT/jit64/gc/misc/148343.csproj
+++ b/src/tests/JIT/jit64/gc/misc/148343.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/9_and_alloca2.cs b/src/tests/JIT/jit64/gc/misc/9_and_alloca2.cs
index 80ec7871d75c4b..80a870e0670599 100644
--- a/src/tests/JIT/jit64/gc/misc/9_and_alloca2.cs
+++ b/src/tests/JIT/jit64/gc/misc/9_and_alloca2.cs
@@ -3,10 +3,12 @@
//
using System;
+using Xunit;
-class T
+public class T
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
string s1 = "a";
string s2 = "b";
@@ -24,7 +26,7 @@ public static int Main()
return 100;
}
- public static void foo(string s1, string s2, string s3, string s4, string s5, string s6, string s7, string s8, string s9, string s10, string s11)
+ internal static void foo(string s1, string s2, string s3, string s4, string s5, string s6, string s7, string s8, string s9, string s10, string s11)
{
Console.WriteLine(s8);
Console.WriteLine(s9);
diff --git a/src/tests/JIT/jit64/gc/misc/9_and_alloca2.csproj b/src/tests/JIT/jit64/gc/misc/9_and_alloca2.csproj
index 3bde6b36b6951e..f63a530012f954 100644
--- a/src/tests/JIT/jit64/gc/misc/9_and_alloca2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/9_and_alloca2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/9param.cs b/src/tests/JIT/jit64/gc/misc/9param.cs
index 1362330f45a033..b5c926a71a0523 100644
--- a/src/tests/JIT/jit64/gc/misc/9param.cs
+++ b/src/tests/JIT/jit64/gc/misc/9param.cs
@@ -3,10 +3,12 @@
//
using System;
+using Xunit;
-class T
+public class T
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
string s1 = "Hello World";
@@ -15,7 +17,7 @@ public static int Main()
return 100;
}
- public static void foo(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, string s9)
+ internal static void foo(int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, string s9)
{
Console.WriteLine(s9);
}
diff --git a/src/tests/JIT/jit64/gc/misc/9param.csproj b/src/tests/JIT/jit64/gc/misc/9param.csproj
index ba23a23c471349..ce18dce2cd3c68 100644
--- a/src/tests/JIT/jit64/gc/misc/9param.csproj
+++ b/src/tests/JIT/jit64/gc/misc/9param.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/alloca3.cs b/src/tests/JIT/jit64/gc/misc/alloca3.cs
index e472705b780ba3..34dfc76d565795 100644
--- a/src/tests/JIT/jit64/gc/misc/alloca3.cs
+++ b/src/tests/JIT/jit64/gc/misc/alloca3.cs
@@ -2,12 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System;
+using Xunit;
-internal class Test_alloca3
+public class Test_alloca3
{
private static int s_x = 25;
- public static unsafe int Main()
+ [Fact]
+ public static unsafe int TestEntryPoint()
{
int* px = stackalloc int[s_x];
diff --git a/src/tests/JIT/jit64/gc/misc/alloca3.csproj b/src/tests/JIT/jit64/gc/misc/alloca3.csproj
index 2af3d9d274f89d..f33211168387d7 100644
--- a/src/tests/JIT/jit64/gc/misc/alloca3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/alloca3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/eh1.cs b/src/tests/JIT/jit64/gc/misc/eh1.cs
index 2bac4789f19629..ad84290bc975b3 100644
--- a/src/tests/JIT/jit64/gc/misc/eh1.cs
+++ b/src/tests/JIT/jit64/gc/misc/eh1.cs
@@ -3,10 +3,12 @@
//
using System;
+using Xunit;
-class T
+public class T
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
try
{
diff --git a/src/tests/JIT/jit64/gc/misc/eh1.csproj b/src/tests/JIT/jit64/gc/misc/eh1.csproj
index a59fa59d7a0423..f9a709cc162e31 100644
--- a/src/tests/JIT/jit64/gc/misc/eh1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/eh1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/fgtest1.cs b/src/tests/JIT/jit64/gc/misc/fgtest1.cs
index 3aede1c19c7558..00d47b609c6820 100644
--- a/src/tests/JIT/jit64/gc/misc/fgtest1.cs
+++ b/src/tests/JIT/jit64/gc/misc/fgtest1.cs
@@ -3,12 +3,14 @@
//
using System;
+using Xunit;
-class T
+public class T
{
public static int x = 4;
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int exitcode = -1;
try
diff --git a/src/tests/JIT/jit64/gc/misc/fgtest1.csproj b/src/tests/JIT/jit64/gc/misc/fgtest1.csproj
index 62d0e0258e1be8..8b2acff7dabbd3 100644
--- a/src/tests/JIT/jit64/gc/misc/fgtest1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/fgtest1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/fgtest2.cs b/src/tests/JIT/jit64/gc/misc/fgtest2.cs
index 804cf1438027e5..8fa3894ee6a7b1 100644
--- a/src/tests/JIT/jit64/gc/misc/fgtest2.cs
+++ b/src/tests/JIT/jit64/gc/misc/fgtest2.cs
@@ -3,12 +3,14 @@
//
using System;
+using Xunit;
-class T
+public class T
{
public static int x = 4;
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int exitcode = 94;
diff --git a/src/tests/JIT/jit64/gc/misc/fgtest2.csproj b/src/tests/JIT/jit64/gc/misc/fgtest2.csproj
index 01d5eecf4b31d4..be864690a81202 100644
--- a/src/tests/JIT/jit64/gc/misc/fgtest2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/fgtest2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/funclet.cs b/src/tests/JIT/jit64/gc/misc/funclet.cs
index 1b10f36cc50abf..48cb444e7287f0 100644
--- a/src/tests/JIT/jit64/gc/misc/funclet.cs
+++ b/src/tests/JIT/jit64/gc/misc/funclet.cs
@@ -2,12 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT license.
//
+using Xunit;
// The main purpose of this test is make sure that an object ref passed on the stack
// out of a funclet works properly. The varargs is a bit extraneous.
-class test
+public class test
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
try
{
@@ -34,7 +36,7 @@ public static int Main()
return 100;
}
- public static void VarArgFunction(__arglist)
+ internal static void VarArgFunction(__arglist)
{
System.Console.WriteLine("inside call");
}
diff --git a/src/tests/JIT/jit64/gc/misc/funclet.csproj b/src/tests/JIT/jit64/gc/misc/funclet.csproj
index d13f85957ed903..2ab9db2b73a74a 100644
--- a/src/tests/JIT/jit64/gc/misc/funclet.csproj
+++ b/src/tests/JIT/jit64/gc/misc/funclet.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
true
diff --git a/src/tests/JIT/jit64/gc/misc/gc-pinned-code-motion.cs b/src/tests/JIT/jit64/gc/misc/gc-pinned-code-motion.cs
index 9bbe873ad319a1..0f00b45e7125ec 100644
--- a/src/tests/JIT/jit64/gc/misc/gc-pinned-code-motion.cs
+++ b/src/tests/JIT/jit64/gc/misc/gc-pinned-code-motion.cs
@@ -1,14 +1,16 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Xunit;
//this is regression test for 307867
//this failed due to inlining under gcstress
-internal class TEST
+public class TEST
{
// prevent induction variable from being optimized away
private volatile static int s_numLeft;
- public static unsafe int Main()
+ [Fact]
+ public static unsafe int TestEntryPoint()
{
string value = "Hello, World!";
char[] dest = new char[value.Length];
diff --git a/src/tests/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj b/src/tests/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
index 0721b947ce1bdb..48e4bf310650c2 100644
--- a/src/tests/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
+++ b/src/tests/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/gcparaminreg.cs b/src/tests/JIT/jit64/gc/misc/gcparaminreg.cs
index cf3c03d18d1e7b..b8f887cb30f915 100644
--- a/src/tests/JIT/jit64/gc/misc/gcparaminreg.cs
+++ b/src/tests/JIT/jit64/gc/misc/gcparaminreg.cs
@@ -8,10 +8,12 @@
// actually process the address of the local, rather than the local.
using System;
+using Xunit;
-class test
+public class test
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
int i = 0;
i += ParamInReg();
diff --git a/src/tests/JIT/jit64/gc/misc/gcparaminreg.csproj b/src/tests/JIT/jit64/gc/misc/gcparaminreg.csproj
index d8118e5f99dcba..7d5dcad9ecf005 100644
--- a/src/tests/JIT/jit64/gc/misc/gcparaminreg.csproj
+++ b/src/tests/JIT/jit64/gc/misc/gcparaminreg.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/ret_struct_test1.cs b/src/tests/JIT/jit64/gc/misc/ret_struct_test1.cs
index f81a299a1956de..fe1b0f609cbe69 100644
--- a/src/tests/JIT/jit64/gc/misc/ret_struct_test1.cs
+++ b/src/tests/JIT/jit64/gc/misc/ret_struct_test1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct MyValueClass
{
@@ -12,9 +13,10 @@ struct MyValueClass
public string S4;
};
-class T
+public class T
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
MyValueClass mvc = foo();
@@ -29,7 +31,7 @@ public static int Main()
return 100;
}
- public static MyValueClass foo()
+ private static MyValueClass foo()
{
MyValueClass mvcRetVal = new MyValueClass();
diff --git a/src/tests/JIT/jit64/gc/misc/ret_struct_test1.csproj b/src/tests/JIT/jit64/gc/misc/ret_struct_test1.csproj
index 66bddac320848e..6053339a3ccff1 100644
--- a/src/tests/JIT/jit64/gc/misc/ret_struct_test1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/ret_struct_test1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/ret_struct_test4.cs b/src/tests/JIT/jit64/gc/misc/ret_struct_test4.cs
index e72ba963b9a0ec..5aa9b84662b480 100644
--- a/src/tests/JIT/jit64/gc/misc/ret_struct_test4.cs
+++ b/src/tests/JIT/jit64/gc/misc/ret_struct_test4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct MyValueClass
{
@@ -14,9 +15,10 @@ struct MyValueClass
public int i6;
};
-class T
+public class T
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
MyValueClass mvc = foo();
@@ -37,7 +39,7 @@ public static int Main()
return 100;
}
- public static MyValueClass foo()
+ private static MyValueClass foo()
{
MyValueClass mvcRetVal = new MyValueClass();
diff --git a/src/tests/JIT/jit64/gc/misc/ret_struct_test4.csproj b/src/tests/JIT/jit64/gc/misc/ret_struct_test4.csproj
index f22448b7ad86eb..919d4676d908cf 100644
--- a/src/tests/JIT/jit64/gc/misc/ret_struct_test4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/ret_struct_test4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/simple1.cs b/src/tests/JIT/jit64/gc/misc/simple1.cs
index 8875c7555efa2a..ddabefa90d2065 100644
--- a/src/tests/JIT/jit64/gc/misc/simple1.cs
+++ b/src/tests/JIT/jit64/gc/misc/simple1.cs
@@ -3,15 +3,17 @@
//
using System;
+using Xunit;
struct S
{
public Object O;
}
-class test
+public class test
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S s = new S();
@@ -28,7 +30,7 @@ public static int Main()
}
- public static S foo(S s)
+ private static S foo(S s)
{
Console.WriteLine(s.O);
diff --git a/src/tests/JIT/jit64/gc/misc/simple1.csproj b/src/tests/JIT/jit64/gc/misc/simple1.csproj
index 3dde3511bfd4fe..67ee8ffc3ac16c 100644
--- a/src/tests/JIT/jit64/gc/misc/simple1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/simple1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct1.cs b/src/tests/JIT/jit64/gc/misc/struct1.cs
index 06fd701de73cd8..2042c53325e0a7 100644
--- a/src/tests/JIT/jit64/gc/misc/struct1.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct1.cs
@@ -3,22 +3,24 @@
//
using System;
+using Xunit;
struct S
{
public String str;
}
-class Test_struct1
+public class Test_struct1
{
- public static void c(S s1)
+ private static void c(S s1)
{
GC.Collect();
Console.WriteLine(s1.str);
GC.Collect();
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM;
diff --git a/src/tests/JIT/jit64/gc/misc/struct1.csproj b/src/tests/JIT/jit64/gc/misc/struct1.csproj
index e2b31f5905059d..d1ac52ebc7c69c 100644
--- a/src/tests/JIT/jit64/gc/misc/struct1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct1_2.cs b/src/tests/JIT/jit64/gc/misc/struct1_2.cs
index f778c98aad9580..5d6e64a621d801 100644
--- a/src/tests/JIT/jit64/gc/misc/struct1_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct1_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -12,14 +13,15 @@ struct S
public String str;
}
-class Test_struct1_2
+public class Test_struct1_2
{
- public static void c(S s1)
+ private static void c(S s1)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM;
diff --git a/src/tests/JIT/jit64/gc/misc/struct1_2.csproj b/src/tests/JIT/jit64/gc/misc/struct1_2.csproj
index 6c73cc5c8df58f..facbf49ef24ae0 100644
--- a/src/tests/JIT/jit64/gc/misc/struct1_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct1_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct1_4.cs b/src/tests/JIT/jit64/gc/misc/struct1_4.cs
index ef022273410826..3d5b1c31502974 100644
--- a/src/tests/JIT/jit64/gc/misc/struct1_4.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct1_4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -81,14 +82,15 @@ public S(String s)
}
}
-class Test_struct1_4
+public class Test_struct1_4
{
- public static void c(S s1)
+ private static void c(S s1)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/struct1_4.csproj b/src/tests/JIT/jit64/gc/misc/struct1_4.csproj
index b8d906581e6405..185b65bccb9347 100644
--- a/src/tests/JIT/jit64/gc/misc/struct1_4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct1_4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct1_5.cs b/src/tests/JIT/jit64/gc/misc/struct1_5.cs
index 671ec09ff185ad..405ccfbe513671 100644
--- a/src/tests/JIT/jit64/gc/misc/struct1_5.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct1_5.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_struct1_5
+public class Test_struct1_5
{
- public static void c(S s1)
+ private static void c(S s1)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/struct1_5.csproj b/src/tests/JIT/jit64/gc/misc/struct1_5.csproj
index b53f1801a3809f..40d4be7cc0ce35 100644
--- a/src/tests/JIT/jit64/gc/misc/struct1_5.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct1_5.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct2.cs b/src/tests/JIT/jit64/gc/misc/struct2.cs
index c4d8c4bf565d9e..fafda598c3a1f6 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct2.cs
@@ -3,20 +3,22 @@
//
using System;
+using Xunit;
struct S
{
public String str;
}
-class Test_struct2
+public class Test_struct2
{
- public static void c(S s1, S s2)
+ private static void c(S s1, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM, sM2;
diff --git a/src/tests/JIT/jit64/gc/misc/struct2.csproj b/src/tests/JIT/jit64/gc/misc/struct2.csproj
index 6675ce9fe66277..a26e4e82f6fdc1 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct2_2.cs b/src/tests/JIT/jit64/gc/misc/struct2_2.cs
index b8bdc7d0be04d2..0d1516f653f023 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct2_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -12,14 +13,15 @@ struct S
public String str;
}
-class Test_struct2_2
+public class Test_struct2_2
{
- public static void c(S s1, S s2)
+ private static void c(S s1, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM, sM2;
diff --git a/src/tests/JIT/jit64/gc/misc/struct2_2.csproj b/src/tests/JIT/jit64/gc/misc/struct2_2.csproj
index e2e5beefdfbf80..552157faab5755 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct2_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct2_4.cs b/src/tests/JIT/jit64/gc/misc/struct2_4.cs
index 1b9e348af15c2a..0c79c7a30bf23f 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2_4.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct2_4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -81,14 +82,15 @@ public S(String s)
}
}
-class Test_struct2_4
+public class Test_struct2_4
{
- public static void c(S s1, S s2)
+ private static void c(S s1, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct2_4.csproj b/src/tests/JIT/jit64/gc/misc/struct2_4.csproj
index d12c8c08028e0f..eba5fc51854d1d 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2_4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct2_4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct2_5.cs b/src/tests/JIT/jit64/gc/misc/struct2_5.cs
index 28324826b7c2e3..d2f935b23ce7be 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2_5.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct2_5.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_struct2_5
+public class Test_struct2_5
{
- public static void c(S s1, S s2)
+ private static void c(S s1, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct2_5.csproj b/src/tests/JIT/jit64/gc/misc/struct2_5.csproj
index cc1adf143f79e4..095ab93c896a06 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2_5.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct2_5.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct2_5_2.cs b/src/tests/JIT/jit64/gc/misc/struct2_5_2.cs
index 6a84ec284ab4af..cc313c561b50aa 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2_5_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct2_5_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -130,19 +131,20 @@ public T(long l)
}
}
-class Test_struct2_5_2
+public class Test_struct2_5_2
{
- public static void c(S s1, S s2)
+ private static void c(S s1, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static void d(T t1, T t2)
+ private static void d(T t1, T t2)
{
Console.WriteLine(t1.l1 + t2.l1);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
T t = new T(0);
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/struct2_5_2.csproj b/src/tests/JIT/jit64/gc/misc/struct2_5_2.csproj
index 62c34143845e48..b095a5bc00487c 100644
--- a/src/tests/JIT/jit64/gc/misc/struct2_5_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct2_5_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct3.cs b/src/tests/JIT/jit64/gc/misc/struct3.cs
index 0a6ca852ed4416..6e215a04c2469d 100644
--- a/src/tests/JIT/jit64/gc/misc/struct3.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct3.cs
@@ -3,20 +3,22 @@
//
using System;
+using Xunit;
struct S
{
public String str;
}
-class Test_struct3
+public class Test_struct3
{
- public static void c(S s1, S s2, S s3)
+ private static void c(S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM;
diff --git a/src/tests/JIT/jit64/gc/misc/struct3.csproj b/src/tests/JIT/jit64/gc/misc/struct3.csproj
index b7e78666697912..49d09fed3ce017 100644
--- a/src/tests/JIT/jit64/gc/misc/struct3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct3_2.cs b/src/tests/JIT/jit64/gc/misc/struct3_2.cs
index 45380fce24f301..f3a75ebe9f71e7 100644
--- a/src/tests/JIT/jit64/gc/misc/struct3_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct3_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -12,14 +13,15 @@ struct S
public String str;
}
-class Test_struct3_2
+public class Test_struct3_2
{
- public static void c(S s1, S s2, S s3)
+ private static void c(S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM;
diff --git a/src/tests/JIT/jit64/gc/misc/struct3_2.csproj b/src/tests/JIT/jit64/gc/misc/struct3_2.csproj
index 200829879f898a..a2b090dd454be9 100644
--- a/src/tests/JIT/jit64/gc/misc/struct3_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct3_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct3_4.cs b/src/tests/JIT/jit64/gc/misc/struct3_4.cs
index c8552b0c7283ce..ffcafbb58f598f 100644
--- a/src/tests/JIT/jit64/gc/misc/struct3_4.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct3_4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -81,14 +82,15 @@ public S(String s)
}
}
-class Test_struct3_4
+public class Test_struct3_4
{
- public static void c(S s1, S s2, S s3)
+ private static void c(S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/struct3_4.csproj b/src/tests/JIT/jit64/gc/misc/struct3_4.csproj
index 3ed4ffce8d0aac..e675f62ff79bf9 100644
--- a/src/tests/JIT/jit64/gc/misc/struct3_4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct3_4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct3_5.cs b/src/tests/JIT/jit64/gc/misc/struct3_5.cs
index 9bc22a7b87c1e0..a9745d61003ae1 100644
--- a/src/tests/JIT/jit64/gc/misc/struct3_5.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct3_5.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_struct3_5
+public class Test_struct3_5
{
- public static void c(S s1, S s2, S s3)
+ private static void c(S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/struct3_5.csproj b/src/tests/JIT/jit64/gc/misc/struct3_5.csproj
index 1b022844d422f4..f477811140a306 100644
--- a/src/tests/JIT/jit64/gc/misc/struct3_5.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct3_5.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct4.cs b/src/tests/JIT/jit64/gc/misc/struct4.cs
index 26cee5e7e30b0b..c7491a8b0ccf21 100644
--- a/src/tests/JIT/jit64/gc/misc/struct4.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct4.cs
@@ -3,20 +3,22 @@
//
using System;
+using Xunit;
struct S
{
public String str;
}
-class Test_struct4
+public class Test_struct4
{
- public static void c(S s1, S s2, S s3)
+ private static void c(S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM, sM2, sM3;
diff --git a/src/tests/JIT/jit64/gc/misc/struct4.csproj b/src/tests/JIT/jit64/gc/misc/struct4.csproj
index c90655abf1a989..82b773cb86af10 100644
--- a/src/tests/JIT/jit64/gc/misc/struct4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct4_2.cs b/src/tests/JIT/jit64/gc/misc/struct4_2.cs
index f0616abe873d06..57852b47e385da 100644
--- a/src/tests/JIT/jit64/gc/misc/struct4_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct4_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -12,14 +13,15 @@ struct S
public String str;
}
-class Test_struct4_2
+public class Test_struct4_2
{
- public static void c(S s1, S s2, S s3)
+ private static void c(S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM, sM2, sM3;
diff --git a/src/tests/JIT/jit64/gc/misc/struct4_2.csproj b/src/tests/JIT/jit64/gc/misc/struct4_2.csproj
index ddfb54af990b09..96db162b80ac42 100644
--- a/src/tests/JIT/jit64/gc/misc/struct4_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct4_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct4_4.cs b/src/tests/JIT/jit64/gc/misc/struct4_4.cs
index f929ec2077654f..8df1a99a620561 100644
--- a/src/tests/JIT/jit64/gc/misc/struct4_4.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct4_4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -81,14 +82,15 @@ public S(String s)
}
}
-class Test_struct4_4
+public class Test_struct4_4
{
- public static void c(S s1, S s2, S s3)
+ private static void c(S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct4_4.csproj b/src/tests/JIT/jit64/gc/misc/struct4_4.csproj
index bf7a844ea28b8d..78a4b69bb5dc78 100644
--- a/src/tests/JIT/jit64/gc/misc/struct4_4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct4_4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct4_5.cs b/src/tests/JIT/jit64/gc/misc/struct4_5.cs
index ee0f8d32f62367..96c016fcbc1d49 100644
--- a/src/tests/JIT/jit64/gc/misc/struct4_5.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct4_5.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_struct4_5
+public class Test_struct4_5
{
- public static void c(S s1, S s2, S s3)
+ private static void c(S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct4_5.csproj b/src/tests/JIT/jit64/gc/misc/struct4_5.csproj
index 15ecf7b8f12c3d..6de9b91fd406f7 100644
--- a/src/tests/JIT/jit64/gc/misc/struct4_5.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct4_5.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct5.cs b/src/tests/JIT/jit64/gc/misc/struct5.cs
index 2cabea838bff2f..f12ce8f7c39d94 100644
--- a/src/tests/JIT/jit64/gc/misc/struct5.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct5.cs
@@ -3,20 +3,22 @@
//
using System;
+using Xunit;
struct S
{
public String str;
}
-class Test_struct5
+public class Test_struct5
{
- public static void c(S s1, S s2, S s3, S s4)
+ private static void c(S s1, S s2, S s3, S s4)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM, sM2, sM3, sM4;
diff --git a/src/tests/JIT/jit64/gc/misc/struct5.csproj b/src/tests/JIT/jit64/gc/misc/struct5.csproj
index 350c721adc91c3..a091e768dadeb5 100644
--- a/src/tests/JIT/jit64/gc/misc/struct5.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct5.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct5_2.cs b/src/tests/JIT/jit64/gc/misc/struct5_2.cs
index 122ffaa363ac7b..2c6811a82cc5d3 100644
--- a/src/tests/JIT/jit64/gc/misc/struct5_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct5_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -12,14 +13,15 @@ struct S
public String str;
}
-class Test_struct5_2
+public class Test_struct5_2
{
- public static void c(S s1, S s2, S s3, S s4)
+ private static void c(S s1, S s2, S s3, S s4)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM, sM2, sM3, sM4;
diff --git a/src/tests/JIT/jit64/gc/misc/struct5_2.csproj b/src/tests/JIT/jit64/gc/misc/struct5_2.csproj
index d308a85cb3b02d..6f9f0a6512161c 100644
--- a/src/tests/JIT/jit64/gc/misc/struct5_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct5_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct5_4.cs b/src/tests/JIT/jit64/gc/misc/struct5_4.cs
index 86528660c41552..d9f9b032ac35b4 100644
--- a/src/tests/JIT/jit64/gc/misc/struct5_4.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct5_4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -81,14 +82,15 @@ public S(String s)
}
}
-class Test_struct5_4
+public class Test_struct5_4
{
- public static void c(S s1, S s2, S s3, S s4)
+ private static void c(S s1, S s2, S s3, S s4)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct5_4.csproj b/src/tests/JIT/jit64/gc/misc/struct5_4.csproj
index a720b0a5fd0f69..b781debe4def44 100644
--- a/src/tests/JIT/jit64/gc/misc/struct5_4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct5_4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct5_5.cs b/src/tests/JIT/jit64/gc/misc/struct5_5.cs
index 0de33c5a3d9306..a76234f76a8c9f 100644
--- a/src/tests/JIT/jit64/gc/misc/struct5_5.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct5_5.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_struct5_5
+public class Test_struct5_5
{
- public static void c(S s1, S s2, S s3, S s4)
+ private static void c(S s1, S s2, S s3, S s4)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct5_5.csproj b/src/tests/JIT/jit64/gc/misc/struct5_5.csproj
index 3b358973919d3f..e2c54aae29322b 100644
--- a/src/tests/JIT/jit64/gc/misc/struct5_5.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct5_5.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct6.cs b/src/tests/JIT/jit64/gc/misc/struct6.cs
index 6a1551e7fa57b0..b2cfbf1e8b9d1b 100644
--- a/src/tests/JIT/jit64/gc/misc/struct6.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct6.cs
@@ -3,20 +3,22 @@
//
using System;
+using Xunit;
struct S
{
public String str;
}
-class Test_struct6
+public class Test_struct6
{
- public static void c(S s1, S s2, S s3, S s4, S s5)
+ private static void c(S s1, S s2, S s3, S s4, S s5)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str + s5.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM1, sM2, sM3, sM4, sM5;
diff --git a/src/tests/JIT/jit64/gc/misc/struct6.csproj b/src/tests/JIT/jit64/gc/misc/struct6.csproj
index 508492fba11bfe..0040d3b4a2ef37 100644
--- a/src/tests/JIT/jit64/gc/misc/struct6.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct6.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct6_2.cs b/src/tests/JIT/jit64/gc/misc/struct6_2.cs
index 6ff2aa53045a0b..e07f0f4cd01995 100644
--- a/src/tests/JIT/jit64/gc/misc/struct6_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct6_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -12,14 +13,15 @@ struct S
public String str;
}
-class Test_struct6_2
+public class Test_struct6_2
{
- public static void c(S s1, S s2, S s3, S s4, S s5)
+ private static void c(S s1, S s2, S s3, S s4, S s5)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str + s5.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM1, sM2, sM3, sM4, sM5;
diff --git a/src/tests/JIT/jit64/gc/misc/struct6_2.csproj b/src/tests/JIT/jit64/gc/misc/struct6_2.csproj
index b3b90a27ec8a5a..bf07a5d952e5f2 100644
--- a/src/tests/JIT/jit64/gc/misc/struct6_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct6_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct6_4.cs b/src/tests/JIT/jit64/gc/misc/struct6_4.cs
index a9f37f72ad6af3..e5192e1839e5d1 100644
--- a/src/tests/JIT/jit64/gc/misc/struct6_4.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct6_4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -81,14 +82,15 @@ public S(String s)
}
}
-class Test_struct6_4
+public class Test_struct6_4
{
- public static void c(S s1, S s2, S s3, S s4, S s5)
+ private static void c(S s1, S s2, S s3, S s4, S s5)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str + s5.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct6_4.csproj b/src/tests/JIT/jit64/gc/misc/struct6_4.csproj
index 5204f5f0145296..5387cddbaf9e1e 100644
--- a/src/tests/JIT/jit64/gc/misc/struct6_4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct6_4.csproj
@@ -1,7 +1,4 @@
-
- Exe
-
Full
False
diff --git a/src/tests/JIT/jit64/gc/misc/struct6_5.cs b/src/tests/JIT/jit64/gc/misc/struct6_5.cs
index 201e509d6c4d12..0e87c5cbd064e4 100644
--- a/src/tests/JIT/jit64/gc/misc/struct6_5.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct6_5.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -131,14 +132,15 @@ public S(String s)
}
}
-class Test_struct6_5
+public class Test_struct6_5
{
- public static void c(S s1, S s2, S s3, S s4, S s5)
+ private static void c(S s1, S s2, S s3, S s4, S s5)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str + s5.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct6_5.csproj b/src/tests/JIT/jit64/gc/misc/struct6_5.csproj
index 37847b2965dc41..3af08315dde5e3 100644
--- a/src/tests/JIT/jit64/gc/misc/struct6_5.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct6_5.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct7_1.cs b/src/tests/JIT/jit64/gc/misc/struct7_1.cs
index e59df7ce295b57..1bf405a9e2e364 100644
--- a/src/tests/JIT/jit64/gc/misc/struct7_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct7_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -106,14 +107,15 @@ public S(String s)
}
}
-class Test_struct7_1
+public class Test_struct7_1
{
- public static void c(S s1, S s2, S s3, S s4, S s5)
+ private static void c(S s1, S s2, S s3, S s4, S s5)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str + s5.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/struct7_1.csproj b/src/tests/JIT/jit64/gc/misc/struct7_1.csproj
index 2c9dd53b2c51ad..cda6dea35fa0c6 100644
--- a/src/tests/JIT/jit64/gc/misc/struct7_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct7_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct8.cs b/src/tests/JIT/jit64/gc/misc/struct8.cs
index 238daace465743..ae6ba5a4dbd21e 100644
--- a/src/tests/JIT/jit64/gc/misc/struct8.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct8.cs
@@ -3,15 +3,16 @@
//
using System;
+using Xunit;
struct S
{
public String str;
}
-class Test_struct8
+public class Test_struct8
{
- public static void c(ref S s1, ref int i)
+ private static void c(ref S s1, ref int i)
{
if (i < 10)
{
@@ -21,7 +22,8 @@ public static void c(ref S s1, ref int i)
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM;
int i = 0;
diff --git a/src/tests/JIT/jit64/gc/misc/struct8.csproj b/src/tests/JIT/jit64/gc/misc/struct8.csproj
index 4d3175c0099d4a..4afd0031d315ef 100644
--- a/src/tests/JIT/jit64/gc/misc/struct8.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct8.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct9.cs b/src/tests/JIT/jit64/gc/misc/struct9.cs
index 803195402b3eeb..b82155b9e5288e 100644
--- a/src/tests/JIT/jit64/gc/misc/struct9.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct9.cs
@@ -3,15 +3,16 @@
//
using System;
+using Xunit;
struct S
{
public String str;
}
-class Test_struct9
+public class Test_struct9
{
- public static void c(ref S s1, ref int i)
+ private static void c(ref S s1, ref int i)
{
if (i < 10)
{
@@ -25,7 +26,8 @@ public static void c(ref S s1, ref int i)
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM;
int i = 0;
diff --git a/src/tests/JIT/jit64/gc/misc/struct9.csproj b/src/tests/JIT/jit64/gc/misc/struct9.csproj
index 37752dc1665ead..443702a0671002 100644
--- a/src/tests/JIT/jit64/gc/misc/struct9.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct9.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/struct9_2.cs b/src/tests/JIT/jit64/gc/misc/struct9_2.cs
index 7d8462146d0c61..496c62475148be 100644
--- a/src/tests/JIT/jit64/gc/misc/struct9_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/struct9_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_struct9_2
+public class Test_struct9_2
{
- public static void c(ref S s1, ref int i)
+ private static void c(ref S s1, ref int i)
{
if (i < 10)
{
@@ -101,7 +102,8 @@ public static void c(ref S s1, ref int i)
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
int i = 0;
diff --git a/src/tests/JIT/jit64/gc/misc/struct9_2.csproj b/src/tests/JIT/jit64/gc/misc/struct9_2.csproj
index e0d402fb7d3a0c..531dd54f30a33e 100644
--- a/src/tests/JIT/jit64/gc/misc/struct9_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/struct9_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_1.cs b/src/tests/JIT/jit64/gc/misc/structfp1_1.cs
index 56ae1135823229..e124e0fb04c05b 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp1_1
+public class Test_structfp1_1
{
- public static void c(S s1, float f)
+ private static void c(S s1, float f)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_1.csproj b/src/tests/JIT/jit64/gc/misc/structfp1_1.csproj
index d6d526cc51a518..049e65911bb006 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_2.cs b/src/tests/JIT/jit64/gc/misc/structfp1_2.cs
index b5f370a44ea153..40d4125613c15e 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp1_2
+public class Test_structfp1_2
{
- public static void c(float f1, S s1, float f2)
+ private static void c(float f1, S s1, float f2)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_2.csproj b/src/tests/JIT/jit64/gc/misc/structfp1_2.csproj
index 88a2d71a9b9849..26c9d60cbbc81f 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_3.cs b/src/tests/JIT/jit64/gc/misc/structfp1_3.cs
index 6b4d25848d6099..6a9696ba4f9d68 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_3.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp1_3
+public class Test_structfp1_3
{
- public static void c(float f1, float f2, float f3, float f4, S s1)
+ private static void c(float f1, float f2, float f3, float f4, S s1)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_3.csproj b/src/tests/JIT/jit64/gc/misc/structfp1_3.csproj
index 6b3050c99bb117..ff2c76aa32762a 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_4.cs b/src/tests/JIT/jit64/gc/misc/structfp1_4.cs
index c9efa4576d6d22..bd4fa3269d86f5 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_4.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp1_4
+public class Test_structfp1_4
{
- public static void c(float f1, float f2, float f3, float f4, float f5, S s1)
+ private static void c(float f1, float f2, float f3, float f4, float f5, S s1)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_4.csproj b/src/tests/JIT/jit64/gc/misc/structfp1_4.csproj
index 1c39d5835571da..e46220d8941229 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_5.cs b/src/tests/JIT/jit64/gc/misc/structfp1_5.cs
index 69fd7b04e53a2c..4b52fa0525c4b5 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_5.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_5.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp1_5
+public class Test_structfp1_5
{
- public static void c(float a1, int a2, float a3, float a4, float a5, S s1)
+ private static void c(float a1, int a2, float a3, float a4, float a5, S s1)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_5.csproj b/src/tests/JIT/jit64/gc/misc/structfp1_5.csproj
index 95ae957f0a4bf5..c8ef7c961de591 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_5.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_5.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_6.cs b/src/tests/JIT/jit64/gc/misc/structfp1_6.cs
index 6af8350142909c..9d0ec18e32b874 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_6.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_6.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp1_6
+public class Test_structfp1_6
{
- public static void c(float a1, S s1, float a3, float a4, float a5)
+ private static void c(float a1, S s1, float a3, float a4, float a5)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp1_6.csproj b/src/tests/JIT/jit64/gc/misc/structfp1_6.csproj
index 986a10a489cd12..a72cb70668a4cb 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp1_6.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp1_6.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp2_1.cs b/src/tests/JIT/jit64/gc/misc/structfp2_1.cs
index 08779e2ad4311f..e771d70f1ff4f1 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp2_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp2_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp2_1
+public class Test_structfp2_1
{
- public static void c(S s1, float f, S s2)
+ private static void c(S s1, float f, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp2_1.csproj b/src/tests/JIT/jit64/gc/misc/structfp2_1.csproj
index 8f4e07a3698919..2b675acb1a3ef3 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp2_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp2_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp2_2.cs b/src/tests/JIT/jit64/gc/misc/structfp2_2.cs
index ca7597b23c5bf7..40be97ffe6f093 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp2_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp2_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp2_2
+public class Test_structfp2_2
{
- public static void c(float a1, float a2, float a3, S s1, S s2)
+ private static void c(float a1, float a2, float a3, S s1, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp2_2.csproj b/src/tests/JIT/jit64/gc/misc/structfp2_2.csproj
index 96018315b9fc9e..047b59d38eefda 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp2_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp2_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp2_3.cs b/src/tests/JIT/jit64/gc/misc/structfp2_3.cs
index 324f97f51e0026..506cde85062ec4 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp2_3.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp2_3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp2_3
+public class Test_structfp2_3
{
- public static void c(float a1, short a2, long a3, double a4, S s1, S s2)
+ private static void c(float a1, short a2, long a3, double a4, S s1, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp2_3.csproj b/src/tests/JIT/jit64/gc/misc/structfp2_3.csproj
index 1ba27a8d3f2f65..41c1fb1168e389 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp2_3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp2_3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp2_4.cs b/src/tests/JIT/jit64/gc/misc/structfp2_4.cs
index e3306f584d6689..556da270733eab 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp2_4.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp2_4.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structfp2_4
+public class Test_structfp2_4
{
- public static void c(double a1, double a2, float a3, double a4, S s1, S s2)
+ private static void c(double a1, double a2, float a3, double a4, S s1, S s2)
{
Console.WriteLine(s1.str + s2.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp2_4.csproj b/src/tests/JIT/jit64/gc/misc/structfp2_4.csproj
index 0e7a74619c7850..78dfc55f79f5b4 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp2_4.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp2_4.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp3_1.cs b/src/tests/JIT/jit64/gc/misc/structfp3_1.cs
index 04559f68fc0713..5081b197216d71 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp3_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp3_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
-class Test_structfp3_1
+public class Test_structfp3_1
{
- public static void c(S s1, float a1, S s2, double a2, S s3)
+ private static void c(S s1, float a1, S s2, double a2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp3_1.csproj b/src/tests/JIT/jit64/gc/misc/structfp3_1.csproj
index 3d648f95e3a07f..83b93eb0fed060 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp3_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp3_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp4_1.cs b/src/tests/JIT/jit64/gc/misc/structfp4_1.cs
index 575d07aa979b20..e69fbf6bcfdaf9 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp4_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp4_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -86,14 +87,15 @@ public S(String s)
}
-class Test_structfp4_1
+public class Test_structfp4_1
{
- public static void c(float a1, double a2, int a3, S s1, S s2, S s3)
+ private static void c(float a1, double a2, int a3, S s1, S s2, S s3)
{
Console.WriteLine(s1.str + s2.str + s3.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp4_1.csproj b/src/tests/JIT/jit64/gc/misc/structfp4_1.csproj
index 79878567f72477..8ed9d74c2b5570 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp4_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp4_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp5_1.cs b/src/tests/JIT/jit64/gc/misc/structfp5_1.cs
index 6316d0bf9a5d10..d66dbc6aeb444b 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp5_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp5_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -86,14 +87,15 @@ public S(String s)
}
-class Test_structfp5_1
+public class Test_structfp5_1
{
- public static void c(int a1, float a2, double a3, S s1, S s2, S s3, S s4, double a4)
+ private static void c(int a1, float a2, double a3, S s1, S s2, S s3, S s4, double a4)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp5_1.csproj b/src/tests/JIT/jit64/gc/misc/structfp5_1.csproj
index 04967e2be84273..c768fa08d97e3a 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp5_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp5_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfp6_1.cs b/src/tests/JIT/jit64/gc/misc/structfp6_1.cs
index 361f584655802d..6d89a337e1f441 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp6_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfp6_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -87,14 +88,15 @@ public S(String s)
}
-class Test_structfp6_1
+public class Test_structfp6_1
{
- public static void c(S s1, float a1, S s2, double a2, S s3, S s4, S s5)
+ private static void c(S s1, float a1, S s2, double a2, S s3, S s4, S s5)
{
Console.WriteLine(s1.str + s2.str + s3.str + s4.str + s5.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfp6_1.csproj b/src/tests/JIT/jit64/gc/misc/structfp6_1.csproj
index ee673302dd9047..331c2e5101f980 100644
--- a/src/tests/JIT/jit64/gc/misc/structfp6_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfp6_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfpseh5_1.cs b/src/tests/JIT/jit64/gc/misc/structfpseh5_1.cs
index defcf3c02d7c99..b5bf43fb252810 100644
--- a/src/tests/JIT/jit64/gc/misc/structfpseh5_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfpseh5_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structfpseh5_1
+public class Test_structfpseh5_1
{
- public static unsafe void c(int a1, float a2, double a3, S s1, S s2, S s3, S s4, double a4)
+ private static unsafe void c(int a1, float a2, double a3, S s1, S s2, S s3, S s4, double a4)
{
int* t = stackalloc int[1];
@@ -101,7 +102,8 @@ public static unsafe void c(int a1, float a2, double a3, S s1, S s2, S s3, S s4,
}
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfpseh5_1.csproj b/src/tests/JIT/jit64/gc/misc/structfpseh5_1.csproj
index bf35da56452ecf..c5946c5c85b476 100644
--- a/src/tests/JIT/jit64/gc/misc/structfpseh5_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfpseh5_1.csproj
@@ -1,6 +1,5 @@
- Exe
true
1
diff --git a/src/tests/JIT/jit64/gc/misc/structfpseh6_1.cs b/src/tests/JIT/jit64/gc/misc/structfpseh6_1.cs
index bbd893d8ce9bbf..fd33fb8759fc79 100644
--- a/src/tests/JIT/jit64/gc/misc/structfpseh6_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structfpseh6_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -86,9 +87,9 @@ public S(String s)
}
}
-class Test_structfpseh6_1
+public class Test_structfpseh6_1
{
- public static unsafe void c(S s1, float a1, S s2, double a2, S s3, S s4, S s5)
+ private static unsafe void c(S s1, float a1, S s2, double a2, S s3, S s4, S s5)
{
int* t = stackalloc int[1];
try
@@ -101,7 +102,8 @@ public static unsafe void c(S s1, float a1, S s2, double a2, S s3, S s4, S s5)
}
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structfpseh6_1.csproj b/src/tests/JIT/jit64/gc/misc/structfpseh6_1.csproj
index 08ca92f95fb0b8..c7fa537000ebd1 100644
--- a/src/tests/JIT/jit64/gc/misc/structfpseh6_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structfpseh6_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structref1_1.cs b/src/tests/JIT/jit64/gc/misc/structref1_1.cs
index 16ac6ced062a70..ed0a0311ba4841 100644
--- a/src/tests/JIT/jit64/gc/misc/structref1_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structref1_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -84,14 +85,15 @@ public S(String s){
}
}
-class Test_structref1_1
+public class Test_structref1_1
{
- public static void c(ref S s1)
+ private static void c(ref S s1)
{
Console.WriteLine(s1.str);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structref1_1.csproj b/src/tests/JIT/jit64/gc/misc/structref1_1.csproj
index d93203aadc31a8..b7a54d5f5b06b7 100644
--- a/src/tests/JIT/jit64/gc/misc/structref1_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structref1_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret1_1.cs b/src/tests/JIT/jit64/gc/misc/structret1_1.cs
index 7a83530039edb4..fd64853856e074 100644
--- a/src/tests/JIT/jit64/gc/misc/structret1_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret1_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,14 +86,15 @@ public S(String s)
}
}
-class Test_structret1_1
+public class Test_structret1_1
{
- public static S c(S s1)
+ private static S c(S s1)
{
return (s1);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structret1_1.csproj b/src/tests/JIT/jit64/gc/misc/structret1_1.csproj
index b23f936d2ec0ab..386bec0f80d11a 100644
--- a/src/tests/JIT/jit64/gc/misc/structret1_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret1_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret1_2.cs b/src/tests/JIT/jit64/gc/misc/structret1_2.cs
index 28574543a60672..fce51deadd951c 100644
--- a/src/tests/JIT/jit64/gc/misc/structret1_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret1_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,16 +86,17 @@ public S(String s)
}
}
-class Test_structret1_2
+public class Test_structret1_2
{
- public static S c(S s1)
+ private static S c(S s1)
{
S r;
r = s1;
return (r);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structret1_2.csproj b/src/tests/JIT/jit64/gc/misc/structret1_2.csproj
index 9cae36161161a8..fbf1b510169a24 100644
--- a/src/tests/JIT/jit64/gc/misc/structret1_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret1_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret1_3.cs b/src/tests/JIT/jit64/gc/misc/structret1_3.cs
index 0b351883d0e0db..72beb84e9eb5b1 100644
--- a/src/tests/JIT/jit64/gc/misc/structret1_3.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret1_3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structret1_3
+public class Test_structret1_3
{
- public static S c(S s1)
+ private static S c(S s1)
{
S r;
r = s1;
@@ -95,7 +96,8 @@ public static S c(S s1)
return (r);
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structret1_3.csproj b/src/tests/JIT/jit64/gc/misc/structret1_3.csproj
index 54b9dae2b9f656..2349df810def6f 100644
--- a/src/tests/JIT/jit64/gc/misc/structret1_3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret1_3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret2_1.cs b/src/tests/JIT/jit64/gc/misc/structret2_1.cs
index 047bf9917f7983..74e122474c6517 100644
--- a/src/tests/JIT/jit64/gc/misc/structret2_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret2_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -86,15 +87,16 @@ public S(String s)
}
}
-class Test_structret2_1
+public class Test_structret2_1
{
- public static S c(S s1, S s2)
+ private static S c(S s1, S s2)
{
s1.str = (s1.str + s2.str);
return s1;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret2_1.csproj b/src/tests/JIT/jit64/gc/misc/structret2_1.csproj
index f0b12213abe12b..3c80f27ad9597a 100644
--- a/src/tests/JIT/jit64/gc/misc/structret2_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret2_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret2_2.cs b/src/tests/JIT/jit64/gc/misc/structret2_2.cs
index 47974591273f99..e4afe984d7604b 100644
--- a/src/tests/JIT/jit64/gc/misc/structret2_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret2_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -86,9 +87,9 @@ public S(String s)
}
}
-class Test_structret2_2
+public class Test_structret2_2
{
- public static S c(S s1, S s2)
+ private static S c(S s1, S s2)
{
S r;
s1.str = (s1.str + s2.str);
@@ -96,7 +97,8 @@ public static S c(S s1, S s2)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret2_2.csproj b/src/tests/JIT/jit64/gc/misc/structret2_2.csproj
index 352c02bbccbf1b..5430229f1c63b5 100644
--- a/src/tests/JIT/jit64/gc/misc/structret2_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret2_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret2_3.cs b/src/tests/JIT/jit64/gc/misc/structret2_3.cs
index 0eb860f2bcdded..f201422b30c364 100644
--- a/src/tests/JIT/jit64/gc/misc/structret2_3.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret2_3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -86,9 +87,9 @@ public S(String s)
}
-class Test_structret2_3
+public class Test_structret2_3
{
- public static S c(S s1, S s2)
+ private static S c(S s1, S s2)
{
S r;
r = s1;
@@ -96,7 +97,8 @@ public static S c(S s1, S s2)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret2_3.csproj b/src/tests/JIT/jit64/gc/misc/structret2_3.csproj
index 238ae703697c93..634739d6051a1c 100644
--- a/src/tests/JIT/jit64/gc/misc/structret2_3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret2_3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret3_1.cs b/src/tests/JIT/jit64/gc/misc/structret3_1.cs
index c1a1c7075f08d6..f167c6d4245735 100644
--- a/src/tests/JIT/jit64/gc/misc/structret3_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret3_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,15 +86,16 @@ public S(String s)
}
}
-class Test_structret3_1
+public class Test_structret3_1
{
- public static S c(S s1, S s2, S s3)
+ private static S c(S s1, S s2, S s3)
{
s1.str = (s1.str + s2.str + s3.str);
return s1;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structret3_1.csproj b/src/tests/JIT/jit64/gc/misc/structret3_1.csproj
index 05fc0ed0b088fc..e99bce4d15ca52 100644
--- a/src/tests/JIT/jit64/gc/misc/structret3_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret3_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret3_2.cs b/src/tests/JIT/jit64/gc/misc/structret3_2.cs
index 1bcd8bcc378115..7161361ba99987 100644
--- a/src/tests/JIT/jit64/gc/misc/structret3_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret3_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structret3_2
+public class Test_structret3_2
{
- public static S c(S s1, S s2, S s3)
+ private static S c(S s1, S s2, S s3)
{
S r;
s1.str = (s1.str + s2.str + s3.str);
@@ -95,7 +96,8 @@ public static S c(S s1, S s2, S s3)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structret3_2.csproj b/src/tests/JIT/jit64/gc/misc/structret3_2.csproj
index 8a5d938042e931..aa9053f5005386 100644
--- a/src/tests/JIT/jit64/gc/misc/structret3_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret3_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret3_3.cs b/src/tests/JIT/jit64/gc/misc/structret3_3.cs
index 0ea2b849736c5d..be3e96df2c1d51 100644
--- a/src/tests/JIT/jit64/gc/misc/structret3_3.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret3_3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -84,9 +85,9 @@ public S(String s)
}
}
-class Test_structret3_3
+public class Test_structret3_3
{
- public static S c(S s1, S s2, S s3)
+ private static S c(S s1, S s2, S s3)
{
S r;
r = s1;
@@ -94,7 +95,8 @@ public static S c(S s1, S s2, S s3)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structret3_3.csproj b/src/tests/JIT/jit64/gc/misc/structret3_3.csproj
index 89017af4846c80..b0fecf0af02c95 100644
--- a/src/tests/JIT/jit64/gc/misc/structret3_3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret3_3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret4_1.cs b/src/tests/JIT/jit64/gc/misc/structret4_1.cs
index e5d608b3ab51c7..cc5da57fb169a3 100644
--- a/src/tests/JIT/jit64/gc/misc/structret4_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret4_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,15 +86,16 @@ public S(String s)
}
}
-class Test_structret4_1
+public class Test_structret4_1
{
- public static S c(S s1, S s2, S s3)
+ private static S c(S s1, S s2, S s3)
{
s1.str = (s1.str + s2.str + s3.str);
return s1;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret4_1.csproj b/src/tests/JIT/jit64/gc/misc/structret4_1.csproj
index 39327b208c270e..ccce9811a6f739 100644
--- a/src/tests/JIT/jit64/gc/misc/structret4_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret4_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret4_2.cs b/src/tests/JIT/jit64/gc/misc/structret4_2.cs
index 9c639a665bd06e..906f0bbf868495 100644
--- a/src/tests/JIT/jit64/gc/misc/structret4_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret4_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structret4_2
+public class Test_structret4_2
{
- public static S c(S s1, S s2, S s3)
+ private static S c(S s1, S s2, S s3)
{
S r;
s1.str = (s1.str + s2.str + s3.str);
@@ -95,7 +96,8 @@ public static S c(S s1, S s2, S s3)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret4_2.csproj b/src/tests/JIT/jit64/gc/misc/structret4_2.csproj
index ea4a48bdac4579..c593606a17b5c7 100644
--- a/src/tests/JIT/jit64/gc/misc/structret4_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret4_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret4_3.cs b/src/tests/JIT/jit64/gc/misc/structret4_3.cs
index 35adfab5fcc125..a635db981ea392 100644
--- a/src/tests/JIT/jit64/gc/misc/structret4_3.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret4_3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structret4_3
+public class Test_structret4_3
{
- public static S c(S s1, S s2, S s3)
+ private static S c(S s1, S s2, S s3)
{
S r;
r = s1;
@@ -95,7 +96,8 @@ public static S c(S s1, S s2, S s3)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret4_3.csproj b/src/tests/JIT/jit64/gc/misc/structret4_3.csproj
index 5236ce565deeef..582e53e3eb6712 100644
--- a/src/tests/JIT/jit64/gc/misc/structret4_3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret4_3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret5_1.cs b/src/tests/JIT/jit64/gc/misc/structret5_1.cs
index 54b873b96ba4d4..37ff26a2f6f88b 100644
--- a/src/tests/JIT/jit64/gc/misc/structret5_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret5_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,15 +86,16 @@ public S(String s)
}
}
-class Test_structret5_1
+public class Test_structret5_1
{
- public static S c(S s1, S s2, S s3, S s4)
+ private static S c(S s1, S s2, S s3, S s4)
{
s1.str = s1.str + s2.str + s3.str + s4.str;
return s1;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret5_1.csproj b/src/tests/JIT/jit64/gc/misc/structret5_1.csproj
index 77822c69002725..97219764516b26 100644
--- a/src/tests/JIT/jit64/gc/misc/structret5_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret5_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret5_2.cs b/src/tests/JIT/jit64/gc/misc/structret5_2.cs
index dea745f17b4ccd..4cea5e3306f68a 100644
--- a/src/tests/JIT/jit64/gc/misc/structret5_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret5_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structret5_2
+public class Test_structret5_2
{
- public static S c(S s1, S s2, S s3, S s4)
+ private static S c(S s1, S s2, S s3, S s4)
{
S r;
s1.str = s1.str + s2.str + s3.str + s4.str;
@@ -95,7 +96,8 @@ public static S c(S s1, S s2, S s3, S s4)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret5_2.csproj b/src/tests/JIT/jit64/gc/misc/structret5_2.csproj
index 9d6a2594353296..207d410101c76e 100644
--- a/src/tests/JIT/jit64/gc/misc/structret5_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret5_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret5_3.cs b/src/tests/JIT/jit64/gc/misc/structret5_3.cs
index d7774fa8cd9fbe..bb98f91a465475 100644
--- a/src/tests/JIT/jit64/gc/misc/structret5_3.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret5_3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structret5_3
+public class Test_structret5_3
{
- public static S c(S s1, S s2, S s3, S s4)
+ private static S c(S s1, S s2, S s3, S s4)
{
S r;
r = s1;
@@ -95,7 +96,8 @@ public static S c(S s1, S s2, S s3, S s4)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret5_3.csproj b/src/tests/JIT/jit64/gc/misc/structret5_3.csproj
index a5aee9cce7cfca..8275941336d89c 100644
--- a/src/tests/JIT/jit64/gc/misc/structret5_3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret5_3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret6_1.cs b/src/tests/JIT/jit64/gc/misc/structret6_1.cs
index 39f44a78e3d715..f95dd01a9fcc28 100644
--- a/src/tests/JIT/jit64/gc/misc/structret6_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret6_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -86,15 +87,16 @@ public S(String s)
}
}
-class Test_structret6_1
+public class Test_structret6_1
{
- public static S c(S s1, S s2, S s3, S s4, S s5)
+ private static S c(S s1, S s2, S s3, S s4, S s5)
{
s1.str = s1.str + s2.str + s3.str + s4.str + s5.str;
return s1;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret6_1.csproj b/src/tests/JIT/jit64/gc/misc/structret6_1.csproj
index 497a2b0455a6be..c2965ba09e5c46 100644
--- a/src/tests/JIT/jit64/gc/misc/structret6_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret6_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret6_2.cs b/src/tests/JIT/jit64/gc/misc/structret6_2.cs
index a41694a3dcc59c..d80245b59dc8c6 100644
--- a/src/tests/JIT/jit64/gc/misc/structret6_2.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret6_2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structret6_2
+public class Test_structret6_2
{
- public static S c(S s1, S s2, S s3, S s4, S s5)
+ private static S c(S s1, S s2, S s3, S s4, S s5)
{
S r;
s1.str = s1.str + s2.str + s3.str + s4.str + s5.str;
@@ -95,7 +96,8 @@ public static S c(S s1, S s2, S s3, S s4, S s5)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret6_2.csproj b/src/tests/JIT/jit64/gc/misc/structret6_2.csproj
index dc651c9614b758..fc86c9aefb9c23 100644
--- a/src/tests/JIT/jit64/gc/misc/structret6_2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret6_2.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structret6_3.cs b/src/tests/JIT/jit64/gc/misc/structret6_3.cs
index 7a7221401f8406..533a091402b7ea 100644
--- a/src/tests/JIT/jit64/gc/misc/structret6_3.cs
+++ b/src/tests/JIT/jit64/gc/misc/structret6_3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -86,9 +87,9 @@ public S(String s)
}
}
-class Test_structret6_3
+public class Test_structret6_3
{
- public static S c(S s1, S s2, S s3, S s4, S s5)
+ private static S c(S s1, S s2, S s3, S s4, S s5)
{
S r;
r = s1;
@@ -96,7 +97,8 @@ public static S c(S s1, S s2, S s3, S s4, S s5)
return r;
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
S sM2 = new S("test2");
diff --git a/src/tests/JIT/jit64/gc/misc/structret6_3.csproj b/src/tests/JIT/jit64/gc/misc/structret6_3.csproj
index e18ee089dc24f0..7c08be426f5927 100644
--- a/src/tests/JIT/jit64/gc/misc/structret6_3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structret6_3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/structva1_1.cs b/src/tests/JIT/jit64/gc/misc/structva1_1.cs
index f746bf30d86978..bc5dcbf4bb342c 100644
--- a/src/tests/JIT/jit64/gc/misc/structva1_1.cs
+++ b/src/tests/JIT/jit64/gc/misc/structva1_1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct Pad
{
@@ -85,9 +86,9 @@ public S(String s)
}
}
-class Test_structva1_1
+public class Test_structva1_1
{
- public static void c(params object[] pp)
+ private static void c(params object[] pp)
{
for (int i = 0; i < pp.GetLength(0); i++)
{
@@ -95,7 +96,8 @@ public static void c(params object[] pp)
}
}
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S sM = new S("test");
diff --git a/src/tests/JIT/jit64/gc/misc/structva1_1.csproj b/src/tests/JIT/jit64/gc/misc/structva1_1.csproj
index 5a8fdb12890b09..2af9ddd6be04ff 100644
--- a/src/tests/JIT/jit64/gc/misc/structva1_1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/structva1_1.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/test1.cs b/src/tests/JIT/jit64/gc/misc/test1.cs
index ac140cb2939920..fb35d9564a9038 100644
--- a/src/tests/JIT/jit64/gc/misc/test1.cs
+++ b/src/tests/JIT/jit64/gc/misc/test1.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -24,15 +25,9 @@ public C()
}
}
-class Test_test1
+public class Test_test1
{
- public static int Main()
- {
- test1();
- test2();
- return (100);
- }
-
+ [Fact]
public static void test1()
{
C c = new C();
@@ -40,6 +35,7 @@ public static void test1()
foo(c.s1);
}
+ [Fact]
public static void test2()
{
C c = new C();
@@ -48,7 +44,7 @@ public static void test2()
foo(s);
}
- public static void foo(S s)
+ private static void foo(S s)
{
Console.WriteLine(s.O1);
Console.WriteLine(s.O2);
diff --git a/src/tests/JIT/jit64/gc/misc/test1.csproj b/src/tests/JIT/jit64/gc/misc/test1_misc.csproj
similarity index 89%
rename from src/tests/JIT/jit64/gc/misc/test1.csproj
rename to src/tests/JIT/jit64/gc/misc/test1_misc.csproj
index 4162a7e21dbda9..2c61b708a51322 100644
--- a/src/tests/JIT/jit64/gc/misc/test1.csproj
+++ b/src/tests/JIT/jit64/gc/misc/test1_misc.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/test2.cs b/src/tests/JIT/jit64/gc/misc/test2.cs
index d8ec3027a90f20..c62c9bc56db0cc 100644
--- a/src/tests/JIT/jit64/gc/misc/test2.cs
+++ b/src/tests/JIT/jit64/gc/misc/test2.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -28,15 +29,9 @@ public C()
}
}
-class Test_test2
+public class Test_test2
{
- public static int Main()
- {
- test1();
- test2();
- return (100);
- }
-
+ [Fact]
public static void test1()
{
C c = new C();
@@ -44,6 +39,7 @@ public static void test1()
foo(c.s1);
}
+ [Fact]
public static void test2()
{
C c = new C();
@@ -52,7 +48,7 @@ public static void test2()
foo(s);
}
- public static void foo(S s)
+ private static void foo(S s)
{
Console.WriteLine(s.O1);
Console.WriteLine(s.O2);
diff --git a/src/tests/JIT/jit64/gc/misc/test2.csproj b/src/tests/JIT/jit64/gc/misc/test2_misc.csproj
similarity index 89%
rename from src/tests/JIT/jit64/gc/misc/test2.csproj
rename to src/tests/JIT/jit64/gc/misc/test2_misc.csproj
index f3eeaac4f4b3dd..9bf6b8b3c1f832 100644
--- a/src/tests/JIT/jit64/gc/misc/test2.csproj
+++ b/src/tests/JIT/jit64/gc/misc/test2_misc.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/test3.cs b/src/tests/JIT/jit64/gc/misc/test3.cs
index 47432d35b81ec3..89901892c76e05 100644
--- a/src/tests/JIT/jit64/gc/misc/test3.cs
+++ b/src/tests/JIT/jit64/gc/misc/test3.cs
@@ -3,6 +3,7 @@
//
using System;
+using Xunit;
struct S
{
@@ -19,9 +20,10 @@ struct S
public Object O11;
}
-class Test_test3
+public class Test_test3
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
S s = new S();
@@ -41,7 +43,7 @@ public static int Main()
return (100);
}
- public static void test(S s)
+ private static void test(S s)
{
Console.WriteLine(s.O1);
Console.WriteLine(s.O2);
diff --git a/src/tests/JIT/jit64/gc/misc/test3.csproj b/src/tests/JIT/jit64/gc/misc/test3.csproj
index aa1c6b56faf28a..3202fe597f3ee3 100644
--- a/src/tests/JIT/jit64/gc/misc/test3.csproj
+++ b/src/tests/JIT/jit64/gc/misc/test3.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/test_noalloca.cs b/src/tests/JIT/jit64/gc/misc/test_noalloca.cs
index f237c4412d66f3..d596b7115d8fa0 100644
--- a/src/tests/JIT/jit64/gc/misc/test_noalloca.cs
+++ b/src/tests/JIT/jit64/gc/misc/test_noalloca.cs
@@ -3,14 +3,16 @@
//
using System;
+using Xunit;
-class Test_test_noalloca
+public class Test_test_noalloca
{
#pragma warning disable 0414
static int x = 25;
#pragma warning restore 0414
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
String s1 = "a";
String s2 = "b";
@@ -31,7 +33,7 @@ public static int Main()
return (100);
}
- public static void foo(String s1, String s2, String s3, String s4, String s5, String s6, String s7, String s8, String s9, String s10)
+ internal static void foo(String s1, String s2, String s3, String s4, String s5, String s6, String s7, String s8, String s9, String s10)
{
Console.WriteLine(s10);
}
diff --git a/src/tests/JIT/jit64/gc/misc/test_noalloca.csproj b/src/tests/JIT/jit64/gc/misc/test_noalloca.csproj
index 03ce50cdbb47df..88dc54e28c50fa 100644
--- a/src/tests/JIT/jit64/gc/misc/test_noalloca.csproj
+++ b/src/tests/JIT/jit64/gc/misc/test_noalloca.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/misc/vbil.cs b/src/tests/JIT/jit64/gc/misc/vbil.cs
index 724bb9fa31d66d..378d300ff576a1 100644
--- a/src/tests/JIT/jit64/gc/misc/vbil.cs
+++ b/src/tests/JIT/jit64/gc/misc/vbil.cs
@@ -2,17 +2,19 @@
// The .NET Foundation licenses this file to you under the MIT license.
//
+using Xunit;
class C
{
public int x = 5;
public int y = 7;
}
-class T
+public class T
{
public static bool GLOBAL = true;
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
C c = new C();
diff --git a/src/tests/JIT/jit64/gc/misc/vbil.csproj b/src/tests/JIT/jit64/gc/misc/vbil.csproj
index 636f3e325e9275..ca1238c0fecf38 100644
--- a/src/tests/JIT/jit64/gc/misc/vbil.csproj
+++ b/src/tests/JIT/jit64/gc/misc/vbil.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/gc/regress/vswhidbey/143837.cs b/src/tests/JIT/jit64/gc/regress/vswhidbey/143837.cs
index 07d4f13c84ff82..b2d613f90f04ca 100644
--- a/src/tests/JIT/jit64/gc/regress/vswhidbey/143837.cs
+++ b/src/tests/JIT/jit64/gc/regress/vswhidbey/143837.cs
@@ -3,13 +3,15 @@
//
using System;
+using Xunit;
public class Test_143837
{
public static TestClass static_TestClass;
public static DerivedClass static_DerivedClass;
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
if (Test1() != 100) return 1;
diff --git a/src/tests/JIT/jit64/gc/regress/vswhidbey/143837.csproj b/src/tests/JIT/jit64/gc/regress/vswhidbey/143837.csproj
index f3d9c93f5c64dc..75174b019d00ef 100644
--- a/src/tests/JIT/jit64/gc/regress/vswhidbey/143837.csproj
+++ b/src/tests/JIT/jit64/gc/regress/vswhidbey/143837.csproj
@@ -1,7 +1,4 @@
-
- Exe
-
Full
False
diff --git a/src/tests/JIT/jit64/gc/regress/vswhidbey/339415.cs b/src/tests/JIT/jit64/gc/regress/vswhidbey/339415.cs
index ca8b6213881457..f04bede853f63c 100644
--- a/src/tests/JIT/jit64/gc/regress/vswhidbey/339415.cs
+++ b/src/tests/JIT/jit64/gc/regress/vswhidbey/339415.cs
@@ -2,15 +2,17 @@
// The .NET Foundation licenses this file to you under the MIT license.
//
+using Xunit;
// Basically, the problem is FP relative stack reporting + GC pointer passed on the stack. GC offsets
// are normally reported relative to PSP which is valid during prolog. When there is EH we report
// stack offsets relative to FP. This is causing problems. This is likely due to the fact that we
// haven't yet set up the frame pointer register.
-class TEST
+public class TEST
{
- public static int Main()
+ [Fact]
+ public static int TestEntryPoint()
{
object o = "test";
diff --git a/src/tests/JIT/jit64/gc/regress/vswhidbey/339415.csproj b/src/tests/JIT/jit64/gc/regress/vswhidbey/339415.csproj
index 3fb87bd0e73d43..ec0fa053fb39a3 100644
--- a/src/tests/JIT/jit64/gc/regress/vswhidbey/339415.csproj
+++ b/src/tests/JIT/jit64/gc/regress/vswhidbey/339415.csproj
@@ -1,6 +1,5 @@
- Exe
1
diff --git a/src/tests/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj b/src/tests/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
index c470c81db6a691..d82380d9f192b8 100644
--- a/src/tests/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
+++ b/src/tests/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
@@ -1,5 +1,7 @@
+
+ true
Library
BuildOnly
false
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
index 8d24dbdf510e5e..144281b7875e25 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
index 2dc35782c00fb8..59283283f66451 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
index 7a503ed98f2431..8b1500bee41bd6 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
index 71791560ba65b8..6937ea9846c446 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
index 41ae82058ff83a..f6446a53f58d6e 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
index f93723c700d59a..1623da04f2371e 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
index 89e8b854a3dc00..8651e5abb23628 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
index d3d6ecb8a1ef66..05fe26037aedcd 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
index 7ca74cecbff0fe..376fac88591a56 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
index b052cf34429ad2..3a5893f6b336a4 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
index 4f01abdad769e9..bdc39b8eed92d1 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
index 30bd95a2e3b309..1760d3f7cda870 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
index 289f8ac319f5f2..36e3ae5e205fe5 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
index afcf87f602afc8..7b409dab0296dd 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
index c8aa1b5895416e..21bdad87843d1e 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
index 65f5827c039545..3a46ef05347e07 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
index f4732e0813c9fe..c6033cb9704649 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
@@ -1,6 +1,7 @@
- Exe
+
+ true
1
diff --git a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
index 7cd93d0a91f24a..84e865a88838db 100644
--- a/src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
+++ b/src/tests/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
@@ -1,6 +1,7 @@
-