From a78f9bde2edd384f5d26c9d394eb7fcc5f48a664 Mon Sep 17 00:00:00 2001
From: Brian Bohe <brianbohe@gmail.com>
Date: Tue, 14 Mar 2023 14:06:59 -0300
Subject: [PATCH] Test merging baseservices/threading (#83143)

* Removing cs test entrypoint args

* Running ILTransform -n

* Running ILTransform -prociso

* Running ILTransform -public

* Running ILTransform -ilfact

* Adding JIT/Directed merge tests wrapper

* Patching merge wrapper generator code

* Fixing accesibility problems after wrapper generator updates
---
 .../XUnitWrapperGenerator.cs                  |  5 +++++
 .../Loader/classloader/Casting/punning.cs     | 20 +++++++++----------
 .../threading/DeadThreads/DeadThreads.cs      |  4 +++-
 .../threading/DeadThreads/DeadThreads.csproj  |  3 ++-
 .../threading/Directory.Build.props           | 11 ++++++++++
 .../DefaultStackCommit.cs                     |  6 ++++--
 .../DefaultStackCommit.csproj                 |  3 ++-
 .../coverage/Nullref/CS_ARENullRefEx.cs       |  4 +++-
 .../coverage/Nullref/CS_ARENullRefEx.csproj   |  1 -
 .../coverage/Nullref/CS_MRENullRefEx.cs       |  4 +++-
 .../coverage/Nullref/CS_MRENullRefEx.csproj   |  1 -
 .../coverage/Nullref/CS_MutexNullRefEx.cs     |  4 +++-
 .../coverage/Nullref/CS_MutexNullRefEx.csproj |  1 -
 .../coverage/Nullref/CS_RWHNullRefEx.cs       |  4 +++-
 .../coverage/Nullref/CS_RWHNullRefEx.csproj   |  1 -
 .../coverage/Nullref/CS_SLENullRefEx.cs       |  4 +++-
 .../coverage/Nullref/CS_SLENullRefEx.csproj   |  1 -
 .../coverage/Nullref/CS_TSNullRefEx.cs        |  4 +++-
 .../coverage/Nullref/CS_TSNullRefEx.csproj    |  1 -
 .../coverage/Nullref/CS_TimerNullRefEx.cs     |  4 +++-
 .../coverage/Nullref/CS_TimerNullRefEx.csproj |  1 -
 .../coverage/Nullref/CS_WHNullRefEx.cs        |  4 +++-
 .../coverage/Nullref/CS_WHNullRefEx.csproj    |  1 -
 .../coverage/OSThreadId/OSThreadId.cs         |  4 +++-
 .../coverage/OSThreadId/osthreadid.csproj     |  1 -
 .../delegate/BeginInvokeEndInvoke.cs          |  6 ++++--
 .../delegate/BeginInvokeEndInvoke.csproj      |  1 -
 .../threading/generics/Monitor/EnterExit01.cs |  4 +++-
 .../generics/Monitor/EnterExit01.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit02.cs |  4 +++-
 .../generics/Monitor/EnterExit02.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit03.cs |  4 +++-
 .../generics/Monitor/EnterExit03.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit04.cs |  4 +++-
 .../generics/Monitor/EnterExit04.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit05.cs |  4 +++-
 .../generics/Monitor/EnterExit05.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit06.cs |  4 +++-
 .../generics/Monitor/EnterExit06.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit07.cs |  4 +++-
 .../generics/Monitor/EnterExit07.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit08.cs |  4 +++-
 .../generics/Monitor/EnterExit08.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit09.cs |  4 +++-
 .../generics/Monitor/EnterExit09.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit10.cs |  4 +++-
 .../generics/Monitor/EnterExit10.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit11.cs |  4 +++-
 .../generics/Monitor/EnterExit11.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit12.cs |  4 +++-
 .../generics/Monitor/EnterExit12.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit13.cs |  4 +++-
 .../generics/Monitor/EnterExit13.csproj       |  1 -
 .../threading/generics/Monitor/EnterExit14.cs |  4 +++-
 .../generics/Monitor/EnterExit14.csproj       |  1 -
 .../threading/generics/Monitor/TryEnter01.cs  |  4 +++-
 .../generics/Monitor/TryEnter01.csproj        |  1 -
 .../threading/generics/Monitor/TryEnter03.cs  |  4 +++-
 .../generics/Monitor/TryEnter03.csproj        |  1 -
 .../threading/generics/Monitor/TryEnter04.cs  |  4 +++-
 .../generics/Monitor/TryEnter04.csproj        |  1 -
 .../threading/generics/Monitor/TryEnter05.cs  |  4 +++-
 .../generics/Monitor/TryEnter05.csproj        |  1 -
 .../threading/generics/Monitor/TryEnter06.cs  |  4 +++-
 .../generics/Monitor/TryEnter06.csproj        |  1 -
 .../generics/TimerCallback/thread01.cs        |  4 +++-
 ...1.csproj => thread01_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread02.cs        |  4 +++-
 .../thread02_TimerCallback.csproj}            |  1 -
 .../generics/TimerCallback/thread03.cs        |  4 +++-
 .../thread03_TimerCallback.csproj}            |  1 -
 .../generics/TimerCallback/thread04.cs        |  4 +++-
 .../thread04_TimerCallback.csproj}            |  1 -
 .../generics/TimerCallback/thread05.cs        |  4 +++-
 ...5.csproj => thread05_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread06.cs        |  4 +++-
 ...6.csproj => thread06_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread07.cs        |  4 +++-
 ...7.csproj => thread07_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread08.cs        |  4 +++-
 ...8.csproj => thread08_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread09.cs        |  4 +++-
 ...9.csproj => thread09_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread10.cs        |  4 +++-
 ...0.csproj => thread10_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread11.cs        |  4 +++-
 ...1.csproj => thread11_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread12.cs        |  4 +++-
 ...2.csproj => thread12_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread13.cs        |  4 +++-
 ...3.csproj => thread13_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread14.cs        |  4 +++-
 ...4.csproj => thread14_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread15.cs        |  4 +++-
 ...5.csproj => thread15_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread16.cs        |  4 +++-
 ...6.csproj => thread16_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread17.cs        |  4 +++-
 ...7.csproj => thread17_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread18.cs        |  4 +++-
 ...8.csproj => thread18_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread19.cs        |  4 +++-
 ...9.csproj => thread19_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread20.cs        |  4 +++-
 ...0.csproj => thread20_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread21.cs        |  4 +++-
 ...1.csproj => thread21_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread22.cs        |  4 +++-
 ...2.csproj => thread22_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread23.cs        |  4 +++-
 ...3.csproj => thread23_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread24.cs        |  4 +++-
 ...4.csproj => thread24_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread25.cs        |  4 +++-
 ...5.csproj => thread25_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread26.cs        |  4 +++-
 ...6.csproj => thread26_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread27.cs        |  4 +++-
 ...7.csproj => thread27_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread28.cs        |  4 +++-
 ...8.csproj => thread28_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread29.cs        |  4 +++-
 ...9.csproj => thread29_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/thread30.cs        |  4 +++-
 ...0.csproj => thread30_TimerCallback.csproj} |  1 -
 .../TimerCallback/tighttimercallback.cs       |  4 +++-
 .../TimerCallback/tighttimercallback.csproj   |  1 -
 .../generics/WaitCallback/thread01.cs         |  4 +++-
 ...01.csproj => thread01_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread02.cs         |  4 +++-
 .../thread02_WaitCallback.csproj}             |  1 -
 .../generics/WaitCallback/thread03.cs         |  4 +++-
 .../thread03_WaitCallback.csproj}             |  1 -
 .../generics/WaitCallback/thread04.cs         |  4 +++-
 .../thread04_WaitCallback.csproj}             |  1 -
 .../generics/WaitCallback/thread05.cs         |  4 +++-
 ...05.csproj => thread05_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread06.cs         |  4 +++-
 ...06.csproj => thread06_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread07.cs         |  4 +++-
 ...07.csproj => thread07_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread08.cs         |  4 +++-
 ...08.csproj => thread08_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread09.cs         |  4 +++-
 ...09.csproj => thread09_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread10.cs         |  4 +++-
 ...10.csproj => thread10_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread11.cs         |  4 +++-
 ...11.csproj => thread11_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread12.cs         |  4 +++-
 ...12.csproj => thread12_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread13.cs         |  4 +++-
 ...13.csproj => thread13_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread14.cs         |  4 +++-
 ...14.csproj => thread14_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread15.cs         |  4 +++-
 ...15.csproj => thread15_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread16.cs         |  4 +++-
 ...16.csproj => thread16_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread17.cs         |  4 +++-
 ...17.csproj => thread17_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread18.cs         |  4 +++-
 ...18.csproj => thread18_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread19.cs         |  4 +++-
 ...19.csproj => thread19_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread20.cs         |  4 +++-
 ...20.csproj => thread20_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread21.cs         |  4 +++-
 ...21.csproj => thread21_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread22.cs         |  4 +++-
 ...22.csproj => thread22_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread23.cs         |  4 +++-
 ...23.csproj => thread23_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread24.cs         |  4 +++-
 ...24.csproj => thread24_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread25.cs         |  4 +++-
 ...25.csproj => thread25_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread26.cs         |  4 +++-
 ...26.csproj => thread26_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread27.cs         |  4 +++-
 ...27.csproj => thread27_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread28.cs         |  4 +++-
 ...28.csproj => thread28_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread29.cs         |  4 +++-
 ...29.csproj => thread29_WaitCallback.csproj} |  1 -
 .../generics/WaitCallback/thread30.cs         |  4 +++-
 ...30.csproj => thread30_WaitCallback.csproj} |  1 -
 ...1.csproj => GThread01_syncdelegate.csproj} |  1 -
 ...2.csproj => GThread02_syncdelegate.csproj} |  1 -
 .../GThread03_syncdelegate.csproj}            |  1 -
 .../GThread04_syncdelegate.csproj}            |  1 -
 ...5.csproj => GThread05_syncdelegate.csproj} |  1 -
 ...6.csproj => GThread06_syncdelegate.csproj} |  1 -
 ...7.csproj => GThread07_syncdelegate.csproj} |  1 -
 ...8.csproj => GThread08_syncdelegate.csproj} |  1 -
 ...9.csproj => GThread09_syncdelegate.csproj} |  1 -
 ...0.csproj => GThread10_syncdelegate.csproj} |  1 -
 ...1.csproj => GThread11_syncdelegate.csproj} |  1 -
 ...2.csproj => GThread12_syncdelegate.csproj} |  1 -
 ...3.csproj => GThread13_syncdelegate.csproj} |  1 -
 ...4.csproj => GThread14_syncdelegate.csproj} |  1 -
 ...5.csproj => GThread15_syncdelegate.csproj} |  1 -
 ...6.csproj => GThread16_syncdelegate.csproj} |  1 -
 ...7.csproj => GThread17_syncdelegate.csproj} |  1 -
 ...8.csproj => GThread18_syncdelegate.csproj} |  1 -
 ...9.csproj => GThread19_syncdelegate.csproj} |  1 -
 ...0.csproj => GThread20_syncdelegate.csproj} |  1 -
 ...1.csproj => GThread21_syncdelegate.csproj} |  1 -
 ...2.csproj => GThread22_syncdelegate.csproj} |  1 -
 ...3.csproj => GThread23_syncdelegate.csproj} |  1 -
 ...4.csproj => GThread24_syncdelegate.csproj} |  1 -
 ...5.csproj => GThread25_syncdelegate.csproj} |  1 -
 ...6.csproj => GThread26_syncdelegate.csproj} |  1 -
 ...7.csproj => GThread27_syncdelegate.csproj} |  1 -
 ...8.csproj => GThread28_syncdelegate.csproj} |  1 -
 ...9.csproj => GThread29_syncdelegate.csproj} |  1 -
 ...0.csproj => GThread30_syncdelegate.csproj} |  1 -
 .../generics/syncdelegate/thread01.cs         |  4 +++-
 .../generics/syncdelegate/thread02.cs         |  4 +++-
 .../generics/syncdelegate/thread03.cs         |  4 +++-
 .../generics/syncdelegate/thread04.cs         |  4 +++-
 .../generics/syncdelegate/thread05.cs         |  4 +++-
 .../generics/syncdelegate/thread06.cs         |  4 +++-
 .../generics/syncdelegate/thread07.cs         |  4 +++-
 .../generics/syncdelegate/thread08.cs         |  4 +++-
 .../generics/syncdelegate/thread09.cs         |  4 +++-
 .../generics/syncdelegate/thread10.cs         |  4 +++-
 .../generics/syncdelegate/thread11.cs         |  4 +++-
 .../generics/syncdelegate/thread12.cs         |  4 +++-
 .../generics/syncdelegate/thread13.cs         |  4 +++-
 .../generics/syncdelegate/thread14.cs         |  4 +++-
 .../generics/syncdelegate/thread15.cs         |  4 +++-
 .../generics/syncdelegate/thread16.cs         |  4 +++-
 .../generics/syncdelegate/thread17.cs         |  4 +++-
 .../generics/syncdelegate/thread18.cs         |  4 +++-
 .../generics/syncdelegate/thread19.cs         |  4 +++-
 .../generics/syncdelegate/thread20.cs         |  4 +++-
 .../generics/syncdelegate/thread21.cs         |  4 +++-
 .../generics/syncdelegate/thread22.cs         |  4 +++-
 .../generics/syncdelegate/thread23.cs         |  4 +++-
 .../generics/syncdelegate/thread24.cs         |  4 +++-
 .../generics/syncdelegate/thread25.cs         |  4 +++-
 .../generics/syncdelegate/thread26.cs         |  4 +++-
 .../generics/syncdelegate/thread27.cs         |  4 +++-
 .../generics/syncdelegate/thread28.cs         |  4 +++-
 .../generics/syncdelegate/thread29.cs         |  4 +++-
 .../generics/syncdelegate/thread30.cs         |  4 +++-
 ...01.csproj => GThread01_threadstart.csproj} |  1 -
 ...02.csproj => GThread02_threadstart.csproj} |  1 -
 ...03.csproj => GThread03_threadstart.csproj} |  1 -
 .../GThread04_threadstart.csproj}             |  1 -
 ...05.csproj => GThread05_threadstart.csproj} |  1 -
 ...06.csproj => GThread06_threadstart.csproj} |  1 -
 ...07.csproj => GThread07_threadstart.csproj} |  1 -
 ...08.csproj => GThread08_threadstart.csproj} |  1 -
 ...09.csproj => GThread09_threadstart.csproj} |  1 -
 ...10.csproj => GThread10_threadstart.csproj} |  1 -
 ...11.csproj => GThread11_threadstart.csproj} |  1 -
 ...12.csproj => GThread12_threadstart.csproj} |  1 -
 ...13.csproj => GThread13_threadstart.csproj} |  1 -
 ...14.csproj => GThread14_threadstart.csproj} |  1 -
 ...15.csproj => GThread15_threadstart.csproj} |  1 -
 ...16.csproj => GThread16_threadstart.csproj} |  1 -
 ...17.csproj => GThread17_threadstart.csproj} |  1 -
 ...18.csproj => GThread18_threadstart.csproj} |  1 -
 ...19.csproj => GThread19_threadstart.csproj} |  1 -
 ...20.csproj => GThread20_threadstart.csproj} |  1 -
 ...21.csproj => GThread21_threadstart.csproj} |  1 -
 ...22.csproj => GThread22_threadstart.csproj} |  1 -
 ...23.csproj => GThread23_threadstart.csproj} |  1 -
 ...24.csproj => GThread24_threadstart.csproj} |  1 -
 ...25.csproj => GThread25_threadstart.csproj} |  1 -
 ...26.csproj => GThread26_threadstart.csproj} |  1 -
 ...27.csproj => GThread27_threadstart.csproj} |  1 -
 ...28.csproj => GThread28_threadstart.csproj} |  1 -
 ...29.csproj => GThread29_threadstart.csproj} |  1 -
 ...30.csproj => GThread30_threadstart.csproj} |  1 -
 .../generics/threadstart/thread01.cs          |  4 +++-
 .../generics/threadstart/thread02.cs          |  4 +++-
 .../generics/threadstart/thread03.cs          |  4 +++-
 .../generics/threadstart/thread04.cs          |  4 +++-
 .../generics/threadstart/thread05.cs          |  4 +++-
 .../generics/threadstart/thread06.cs          |  4 +++-
 .../generics/threadstart/thread07.cs          |  4 +++-
 .../generics/threadstart/thread08.cs          |  4 +++-
 .../generics/threadstart/thread09.cs          |  4 +++-
 .../generics/threadstart/thread10.cs          |  4 +++-
 .../generics/threadstart/thread11.cs          |  4 +++-
 .../generics/threadstart/thread12.cs          |  4 +++-
 .../generics/threadstart/thread13.cs          |  4 +++-
 .../generics/threadstart/thread14.cs          |  4 +++-
 .../generics/threadstart/thread15.cs          |  4 +++-
 .../generics/threadstart/thread16.cs          |  4 +++-
 .../generics/threadstart/thread17.cs          |  4 +++-
 .../generics/threadstart/thread18.cs          |  4 +++-
 .../generics/threadstart/thread19.cs          |  4 +++-
 .../generics/threadstart/thread20.cs          |  4 +++-
 .../generics/threadstart/thread21.cs          |  4 +++-
 .../generics/threadstart/thread22.cs          |  4 +++-
 .../generics/threadstart/thread23.cs          |  4 +++-
 .../generics/threadstart/thread24.cs          |  4 +++-
 .../generics/threadstart/thread25.cs          |  4 +++-
 .../generics/threadstart/thread26.cs          |  4 +++-
 .../generics/threadstart/thread27.cs          |  4 +++-
 .../generics/threadstart/thread28.cs          |  4 +++-
 .../generics/threadstart/thread29.cs          |  4 +++-
 .../generics/threadstart/thread30.cs          |  4 +++-
 .../threading/regressions/13662/13662-a.cs    |  4 +++-
 .../regressions/13662/13662-a.csproj          |  3 ++-
 .../threading/regressions/13662/13662-b.cs    |  4 +++-
 .../regressions/13662/13662-b.csproj          |  3 ++-
 .../regressions/13662/13662-simple.csproj     |  3 ++-
 .../threading/regressions/13662/simple.cs     |  4 +++-
 .../regressions/2164/foreground-shutdown.cs   |  4 +++-
 .../2164/foreground-shutdown.csproj           |  3 ++-
 .../regressions/269336/objmonhelper.cs        |  6 ++++--
 .../regressions/269336/objmonhelper.csproj    |  3 ++-
 .../threading/regressions/30032/30032.cs      |  4 +++-
 .../threading/regressions/30032/30032.csproj  |  1 -
 .../threading/regressions/576463/576463.cs    | 11 +++++++---
 .../regressions/576463/576463.csproj          |  3 ++-
 .../threading/regressions/6906/6906.csproj    |  1 -
 .../threading/regressions/6906/repro.cs       |  4 +++-
 .../threading/regressions/beta1/347011.cs     |  4 +++-
 .../threading/regressions/beta1/347011.csproj |  1 -
 .../threading/regressions/beta2/437017.cs     |  6 ++++--
 .../threading/regressions/beta2/437017.csproj |  3 ++-
 .../threading/regressions/beta2/437044.cs     |  6 ++++--
 .../threading/regressions/beta2/437044.csproj |  3 ++-
 .../regressions/devdiv489437/test489437.cs    |  6 ++++--
 .../devdiv489437/test489437.csproj            |  1 -
 .../regressions/whidbey_m3/200176.cs          |  4 +++-
 .../regressions/whidbey_m3/200176.csproj      |  3 ++-
 .../threading/threading_group1.csproj         | 16 +++++++++++++++
 .../threading/threading_group2.csproj         | 17 ++++++++++++++++
 .../threadpool/bindhandle/bindhandle1.cs      |  6 ++++--
 .../threadpool/bindhandle/bindhandle1.csproj  |  3 ++-
 .../bindhandle/bindhandleinvalid.cs           |  6 ++++--
 .../bindhandle/bindhandleinvalid.csproj       |  3 ++-
 .../bindhandle/bindhandleinvalid3.cs          |  6 ++++--
 .../bindhandle/bindhandleinvalid3.csproj      |  3 ++-
 .../bindhandle/bindhandleinvalid4.cs          |  6 ++++--
 .../bindhandle/bindhandleinvalid4.csproj      |  3 ++-
 .../bindhandle/bindhandleinvalid5.cs          |  6 ++++--
 .../bindhandle/bindhandleinvalid5.csproj      |  3 ++-
 .../bindhandle/bindhandleinvalid6.cs          |  6 ++++--
 .../bindhandle/bindhandleinvalid6.csproj      |  3 ++-
 .../threadpool/bindhandle/bindhandlenull.cs   |  6 ++++--
 .../bindhandle/bindhandlenull.csproj          |  3 ++-
 .../unregister/regression_749068.cs           |  6 ++++--
 .../unregister/regression_749068.csproj       |  1 -
 .../threadstatic/ThreadStatic01.csproj        |  1 -
 .../threadstatic/ThreadStatic02.csproj        |  1 -
 .../threadstatic/ThreadStatic03.csproj        |  1 -
 .../threadstatic/ThreadStatic05.csproj        |  1 -
 .../threadstatic/ThreadStatic06.csproj        |  1 -
 .../threading/threadstatic/threadstatic01.cs  |  4 +++-
 .../threading/threadstatic/threadstatic02.cs  |  4 +++-
 .../threading/threadstatic/threadstatic03.cs  |  4 +++-
 .../threading/threadstatic/threadstatic05.cs  |  4 +++-
 .../threading/threadstatic/threadstatic06.cs  |  4 +++-
 .../threading/threadstatic/threadstatic07.cs  |  4 +++-
 .../threadstatic/threadstatic07.csproj        |  1 -
 .../threading/threadstatic/threadstatic08.cs  |  4 +++-
 .../threadstatic/threadstatic08.csproj        |  3 ---
 365 files changed, 654 insertions(+), 388 deletions(-)
 create mode 100644 src/tests/baseservices/threading/Directory.Build.props
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread01.csproj => thread01_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{WaitCallback/thread02.csproj => TimerCallback/thread02_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{WaitCallback/thread03.csproj => TimerCallback/thread03_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{WaitCallback/thread04.csproj => TimerCallback/thread04_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread05.csproj => thread05_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread06.csproj => thread06_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread07.csproj => thread07_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread08.csproj => thread08_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread09.csproj => thread09_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread10.csproj => thread10_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread11.csproj => thread11_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread12.csproj => thread12_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread13.csproj => thread13_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread14.csproj => thread14_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread15.csproj => thread15_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread16.csproj => thread16_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread17.csproj => thread17_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread18.csproj => thread18_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread19.csproj => thread19_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread20.csproj => thread20_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread21.csproj => thread21_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread22.csproj => thread22_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread23.csproj => thread23_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread24.csproj => thread24_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread25.csproj => thread25_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread26.csproj => thread26_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread27.csproj => thread27_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread28.csproj => thread28_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread29.csproj => thread29_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/TimerCallback/{thread30.csproj => thread30_TimerCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread01.csproj => thread01_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{TimerCallback/thread02.csproj => WaitCallback/thread02_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{syncdelegate/GThread03.csproj => WaitCallback/thread03_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{syncdelegate/GThread04.csproj => WaitCallback/thread04_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread05.csproj => thread05_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread06.csproj => thread06_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread07.csproj => thread07_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread08.csproj => thread08_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread09.csproj => thread09_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread10.csproj => thread10_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread11.csproj => thread11_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread12.csproj => thread12_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread13.csproj => thread13_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread14.csproj => thread14_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread15.csproj => thread15_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread16.csproj => thread16_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread17.csproj => thread17_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread18.csproj => thread18_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread19.csproj => thread19_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread20.csproj => thread20_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread21.csproj => thread21_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread22.csproj => thread22_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread23.csproj => thread23_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread24.csproj => thread24_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread25.csproj => thread25_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread26.csproj => thread26_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread27.csproj => thread27_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread28.csproj => thread28_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread29.csproj => thread29_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/WaitCallback/{thread30.csproj => thread30_WaitCallback.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread01.csproj => GThread01_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread02.csproj => GThread02_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{TimerCallback/thread03.csproj => syncdelegate/GThread03_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{threadstart/GThread04.csproj => syncdelegate/GThread04_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread05.csproj => GThread05_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread06.csproj => GThread06_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread07.csproj => GThread07_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread08.csproj => GThread08_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread09.csproj => GThread09_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread10.csproj => GThread10_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread11.csproj => GThread11_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread12.csproj => GThread12_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread13.csproj => GThread13_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread14.csproj => GThread14_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread15.csproj => GThread15_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread16.csproj => GThread16_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread17.csproj => GThread17_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread18.csproj => GThread18_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread19.csproj => GThread19_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread20.csproj => GThread20_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread21.csproj => GThread21_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread22.csproj => GThread22_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread23.csproj => GThread23_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread24.csproj => GThread24_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread25.csproj => GThread25_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread26.csproj => GThread26_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread27.csproj => GThread27_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread28.csproj => GThread28_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread29.csproj => GThread29_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/syncdelegate/{GThread30.csproj => GThread30_syncdelegate.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread01.csproj => GThread01_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread02.csproj => GThread02_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread03.csproj => GThread03_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/{TimerCallback/thread04.csproj => threadstart/GThread04_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread05.csproj => GThread05_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread06.csproj => GThread06_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread07.csproj => GThread07_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread08.csproj => GThread08_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread09.csproj => GThread09_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread10.csproj => GThread10_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread11.csproj => GThread11_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread12.csproj => GThread12_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread13.csproj => GThread13_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread14.csproj => GThread14_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread15.csproj => GThread15_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread16.csproj => GThread16_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread17.csproj => GThread17_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread18.csproj => GThread18_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread19.csproj => GThread19_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread20.csproj => GThread20_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread21.csproj => GThread21_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread22.csproj => GThread22_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread23.csproj => GThread23_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread24.csproj => GThread24_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread25.csproj => GThread25_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread26.csproj => GThread26_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread27.csproj => GThread27_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread28.csproj => GThread28_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread29.csproj => GThread29_threadstart.csproj} (87%)
 rename src/tests/baseservices/threading/generics/threadstart/{GThread30.csproj => GThread30_threadstart.csproj} (87%)
 create mode 100644 src/tests/baseservices/threading/threading_group1.csproj
 create mode 100644 src/tests/baseservices/threading/threading_group2.csproj

diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
index 816b567c2e653..ae1d12d57b0f8 100644
--- a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
+++ b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
@@ -305,10 +305,15 @@ private static string GenerateStandaloneSimpleTestRunner(ImmutableArray<ITestInf
         ITestReporterWrapper reporter = new NoTestReporting();
         StringBuilder builder = new();
         builder.AppendLine(string.Join("\n", aliasMap.Values.Where(alias => alias != "global").Select(alias => $"extern alias {alias};")));
+        builder.AppendLine("namespace __GeneratedMainWrapper;");
+        builder.AppendLine("class __GeneratedMainWrapper {");
+        builder.AppendLine("public static int Main() {");
         builder.AppendLine("try {");
         builder.AppendLine(string.Join("\n", testInfos.Select(m => m.GenerateTestExecution(reporter))));
         builder.AppendLine("} catch(System.Exception ex) { System.Console.WriteLine(ex.ToString()); return 101; }");
         builder.AppendLine("return 100;");
+        builder.AppendLine("}");
+        builder.AppendLine("}");
         return builder.ToString();
     }
 
diff --git a/src/tests/Loader/classloader/Casting/punning.cs b/src/tests/Loader/classloader/Casting/punning.cs
index 3971a781578b7..01064d2f26822 100644
--- a/src/tests/Loader/classloader/Casting/punning.cs
+++ b/src/tests/Loader/classloader/Casting/punning.cs
@@ -9,7 +9,7 @@
 partial class Program
 {
     [Fact]
-    static void Via_GetFunctionPointer()
+    internal static void Via_GetFunctionPointer()
     {
         Console.WriteLine($"Running {nameof(Via_GetFunctionPointer)}...");
 
@@ -24,7 +24,7 @@ static void Via_GetFunctionPointer()
     }
 
     [Fact]
-    static void Via_GetFunctionPointer_Generics()
+    internal static void Via_GetFunctionPointer_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_GetFunctionPointer_Generics)}...");
 
@@ -39,7 +39,7 @@ static void Via_GetFunctionPointer_Generics()
     }
 
     [Fact]
-    static void Via_Ldftn()
+    internal static void Via_Ldftn()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn)}...");
 
@@ -54,7 +54,7 @@ static void Via_Ldftn()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics()
+    internal static void Via_Ldftn_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics)}...");
 
@@ -69,7 +69,7 @@ static void Via_Ldftn_Generics()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_Virtual()
+    internal static void Via_Ldftn_Generics_Virtual()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual)}...");
 
@@ -85,7 +85,7 @@ static void Via_Ldftn_Generics_Virtual()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_EarlyLoad()
+    internal static void Via_Ldftn_Generics_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_EarlyLoad)}...");
 
@@ -100,7 +100,7 @@ static void Via_Ldftn_Generics_EarlyLoad()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_Virtual_EarlyLoad()
+    internal static void Via_Ldftn_Generics_Virtual_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual_EarlyLoad)}...");
 
@@ -116,7 +116,7 @@ static void Via_Ldftn_Generics_Virtual_EarlyLoad()
     }
 
     [Fact]
-    static void Via_Ldvirtftn()
+    internal static void Via_Ldvirtftn()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn)}...");
 
@@ -132,7 +132,7 @@ static void Via_Ldvirtftn()
     }
 
     [Fact]
-    static void Via_Ldvirtftn_Generics()
+    internal static void Via_Ldvirtftn_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics)}...");
 
@@ -148,7 +148,7 @@ static void Via_Ldvirtftn_Generics()
     }
 
     [Fact]
-    static void Via_Ldvirtftn_Generics_EarlyLoad()
+    internal static void Via_Ldvirtftn_Generics_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics_EarlyLoad)}...");
 
diff --git a/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs b/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs
index 9a3b9e9e15f18..dc3c30f108e61 100644
--- a/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs
+++ b/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Xunit;
 
 public class DeadThreads
 {
@@ -34,7 +35,8 @@ private static void StartNoOpThread()
         t.Start();
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         GCTriggerSanityTest();
         return 100;
diff --git a/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj b/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj
index 595107279fe40..230a32de42e06 100644
--- a/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj
+++ b/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestEnvironmentVariable -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
diff --git a/src/tests/baseservices/threading/Directory.Build.props b/src/tests/baseservices/threading/Directory.Build.props
new file mode 100644
index 0000000000000..118a6455c09b8
--- /dev/null
+++ b/src/tests/baseservices/threading/Directory.Build.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <BuildAsStandalone Condition="'$(BuildAsStandalone)' == ''">false</BuildAsStandalone>
+
+    <AssemblyName Condition="'$(BuildAsStandalone)' != 'true'">$(MSBuildProjectName.Replace('_il_d', '').Replace('_il_r', ''))</AssemblyName>
+  </PropertyGroup>
+
+  <Import Project="..\..\Directory.Build.props" />
+</Project>
\ No newline at end of file
diff --git a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
index fbd68c3226c8b..fe5daeebb38d0 100644
--- a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
+++ b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
@@ -6,12 +6,14 @@
 using System.Text;
 // using System.Configuration;
 using System.Runtime.InteropServices;
+using Xunit;
 
 namespace StackCommitTest
 {
-    class DefaultStackCommit
+    public class DefaultStackCommit
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int result = 1;
             bool commitEnabled = false;
diff --git a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
index 352498419f392..82f065f115cf4 100644
--- a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
+++ b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs
index f99957df49851..f078a6f95d1ff 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int 		  rValue = 100;
 		AutoResetEvent    are  = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
index 23dca2e0b3d22..f08305e7eda54 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs
index 71a02b315e9ac..e187d0c8a5862 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int 		  rValue = 100;
 		ManualResetEvent  mre  = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
index 01275995abd14..427ee54a15e57 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs
index 678d5e1bb1bde..8c5dad7c08249 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int    rValue = 100;
 		Mutex  mut    = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
index df78acb3a4878..d6abd3d56c902 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs
index a7154325180a6..8a7365d4a4100 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                   rValue = 100;
 		RegisteredWaitHandle  rwh    = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
index b9390fb008c09..729e8bdc69c80 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs
index 25fd930dd6986..f5e7057325620 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs
@@ -4,9 +4,11 @@
 using System.Threading;
 // using System.Runtime.Remoting;
 using System.Runtime.Serialization;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                           rValue = 100;
 		SynchronizationLockException  sle    = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
index 740ba2b27b8ca..0ec448853a1f7 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs
index 62c699e668c6c..19980759fd9e6 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs
@@ -3,9 +3,11 @@
 using System;
 using System.Threading;
 using System.Runtime.Serialization;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                      rValue = 100;
 		ThreadStateException     ta     = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
index bda0279052697..090372d40f043 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs
index 46c5f1daf813c..3e6c5d1767b8b 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		
 		int   rValue = 100;
 		Timer time   = null;
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
index c200e8c14ca75..e08c848bfefcd 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs
index e11717ea2e66f..3cdd7ffe4d1d7 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int         rValue = 100;
 		WaitHandle  wh     = null;
 		
diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
index 4ce88027473a2..d36d906358638 100644
--- a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
+++ b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs b/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs
index 822bf16808971..540e9d186a524 100644
--- a/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs
+++ b/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading;
+using Xunit;
 
 namespace Threading.Tests
 {
@@ -12,7 +13,8 @@ public sealed class OSThreadId
         private static ManualResetEvent s_resetEvent = new ManualResetEvent(false);
         private static ulong[] s_threadIds = new ulong[NumThreads];
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             // The property to be tested is internal.
             Type runtimeThreadType = typeof(object).Assembly.GetType("System.Threading.Thread");
diff --git a/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj b/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
index 817c675753021..63068c89c6c33 100644
--- a/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
+++ b/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs
index 78143a56bb83f..621f3ded221c8 100644
--- a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs
+++ b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 namespace DelegateTest
 {
@@ -13,10 +14,11 @@ public static string TestMethod(int input)
         }
     }
 
-    class BeginInvokeEndInvokeTest
+    public class BeginInvokeEndInvokeTest
     {
         public delegate string AsyncMethodCaller(int input);
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             IAsyncResult result = null;
             AsyncMethodCaller caller = new AsyncMethodCaller(DelegateCommon.TestMethod);
diff --git a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
index c2cc2cbbb03d5..606943bf75e94 100644
--- a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
+++ b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit01.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit01.cs
index 311959e45f61c..e88276b27eb7c 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit01.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public struct ValX1<T> {}
 public class RefX1<T> {}
@@ -51,7 +52,8 @@ public static void Eval(bool exp)
 		}
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit01.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit01.csproj
index acfabb39f1eb0..6f34323213d72 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit01.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit01.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit02.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit02.cs
index 261e61fd49e2a..41d92a203a81f 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit02.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -66,7 +67,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit02.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit02.csproj
index 647cbfea43ebe..224b12b8e5e0b 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit02.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit02.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit03.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit03.cs
index 3ded9033485a5..f538caf4a2fa5 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit03.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -56,7 +57,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit03.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit03.csproj
index a3d953b9071ce..0533d1a91b377 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit03.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit03.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit04.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit04.cs
index dea58d7ca1b53..f9489573c8688 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit04.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -71,7 +72,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit04.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit04.csproj
index 7207cd5bba80b..0049ea7f9febf 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit04.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit04.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit05.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit05.cs
index f4985309cbfec..d58350fdf2a6d 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit05.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -56,7 +57,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit05.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit05.csproj
index 9ce8fdfb554ae..2b581d6c12de0 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit05.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit05.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit06.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit06.cs
index 9da0e3a3e04f6..2e386aeaaab32 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit06.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -70,7 +71,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit06.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit06.csproj
index 829499bcefd15..7ace62ca5543e 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit06.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit06.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit07.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit07.cs
index 133ee564f5989..f0dfe972674b2 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit07.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit07.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit07.csproj
index 73e20e2c4c33b..87095f9e02aae 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit07.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit07.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit08.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit08.cs
index 5190177e46c44..0abe2509ea307 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit08.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -70,7 +71,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit08.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit08.csproj
index 1920b4fe58910..04c89f6af840e 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit08.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit08.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit09.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit09.cs
index c551a86744338..e0a4b8b8f1949 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit09.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public struct ValX1<T> {}
 public class RefX1<T> {}
@@ -54,7 +55,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit09.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit09.csproj
index b20970d630988..b2937b275731a 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit09.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit09.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit10.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit10.cs
index 9dbacbcbd1501..ca99f6631707e 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit10.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -70,7 +71,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit10.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit10.csproj
index d918c43589ad1..627d3bf59383b 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit10.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit10.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit11.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit11.cs
index 9c600998cc457..77fa6d3024b27 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit11.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -59,7 +60,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit11.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit11.csproj
index ed9cc818cd3b1..7ecc2300b39bd 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit11.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit11.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit12.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit12.cs
index 6ffbcee55e489..2768677d93aa7 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit12.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -78,7 +79,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit12.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit12.csproj
index 222d17c20a33f..e2bfbeceb41e8 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit12.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit12.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit13.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit13.cs
index 30e249b788ddd..d2ec36cbc177b 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit13.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -58,7 +59,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.EnterExitTest();	
 		Gen<double>.EnterExitTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit13.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit13.csproj
index 939abd4a9acf2..93f7eb65cb03b 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit13.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit13.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit14.cs b/src/tests/baseservices/threading/generics/Monitor/EnterExit14.cs
index 9fd7e47402429..dc2cd3d6c8d5b 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit14.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -77,7 +78,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<double>.EnterExitTest<int>();
 		Gen<string>.EnterExitTest<int>();
diff --git a/src/tests/baseservices/threading/generics/Monitor/EnterExit14.csproj b/src/tests/baseservices/threading/generics/Monitor/EnterExit14.csproj
index 85402dee303db..133ea2660b65c 100644
--- a/src/tests/baseservices/threading/generics/Monitor/EnterExit14.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/EnterExit14.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter01.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter01.cs
index 77c7b4cdca942..68cc238984bbe 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter01.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest();	
 		Gen<double>.TryEnterTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter01.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter01.csproj
index 68727fa98b74e..480a89b16203f 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter01.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter01.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter03.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter03.cs
index ee4173c290f55..5adde65af3547 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter03.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public struct ValX1<T> {}
 public class RefX1<T> {}
@@ -68,7 +69,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest<int>(true);	
 		Gen<double>.TryEnterTest<int>(false);
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter03.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter03.csproj
index 4cbbc02401707..52b379827838d 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter03.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter03.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter04.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter04.cs
index 5d6ecbd91b807..a8f7a936e9d98 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter04.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -56,7 +57,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest();	
 		/*Gen<double>.TryEnterTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter04.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter04.csproj
index 55f73e2923c0a..b516e43e848ac 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter04.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter04.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter05.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter05.cs
index 3b7003daaae67..af08ccdd83d2c 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter05.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -56,7 +57,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest();	
 		Gen<double>.TryEnterTest();
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter05.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter05.csproj
index 4557dfbd9b975..caf7d507aa99d 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter05.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter05.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter06.cs b/src/tests/baseservices/threading/generics/Monitor/TryEnter06.cs
index 2922f74f01fea..85b54d9732677 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter06.cs
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public struct ValX1<T> {}
@@ -68,7 +69,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.TryEnterTest<int>(true);	
 		Gen<double>.TryEnterTest<int>(false);
diff --git a/src/tests/baseservices/threading/generics/Monitor/TryEnter06.csproj b/src/tests/baseservices/threading/generics/Monitor/TryEnter06.csproj
index 3c829b34023f0..035829374ff02 100644
--- a/src/tests/baseservices/threading/generics/Monitor/TryEnter06.csproj
+++ b/src/tests/baseservices/threading/generics/Monitor/TryEnter06.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread01.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread01.cs
index cdccb8c48d66d..0ae15a98629bd 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread01.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread01.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread01_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread01.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread01_TimerCallback.csproj
index e4f858a0396ea..10b6b39f924b1 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread01.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread01_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread02.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread02.cs
index 5c27e795b1b43..f78de589ab3cc 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread02.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread02.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread02_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread02.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread02_TimerCallback.csproj
index 430250b374679..23f16bffe0730 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread02.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread02_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread03.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread03.cs
index f51e660862aba..fe098311054ba 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread03.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread03.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread03_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread03.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread03_TimerCallback.csproj
index d98eb265922c5..b187d3788ccb7 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread03.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread03_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread04.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread04.cs
index eb3818e114fd4..4784adfe3eb2c 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread04.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread04.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread04_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread04.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread04_TimerCallback.csproj
index 453633a74c171..f2096a4caf544 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread04.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread04_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread05.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread05.cs
index c585711823131..423b29e3d4722 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread05.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread05.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread05_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread05.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread05_TimerCallback.csproj
index c5fee6a26f374..a05d0f9a72262 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread05.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread05_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread06.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread06.cs
index aa289ee6dd36a..9ae4c1957fd5e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread06.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread06.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread06_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread06.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread06_TimerCallback.csproj
index 10eb2b26b956f..cb053f555a452 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread06.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread06_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread07.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread07.cs
index d87b4574adf9f..77fb276111740 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread07.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread07.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread07_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread07.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread07_TimerCallback.csproj
index 450d6df55dcc3..1f50accfe0ea1 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread07.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread07_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread08.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread08.cs
index df92b209142b4..c4d9fe24ffaa7 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread08.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread08.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread08_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread08.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread08_TimerCallback.csproj
index 5f82b86355589..1d1b003dbaa67 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread08.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread08_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread09.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread09.cs
index 5b47dcb91b500..0a031c2cdf337 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread09.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread09.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread09_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread09.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread09_TimerCallback.csproj
index 15757e66ca264..bb56217eeec1d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread09.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread09_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread10.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread10.cs
index ed180b2bc3003..3fe085b9af464 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread10.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -62,7 +63,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread10.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread10_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread10.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread10_TimerCallback.csproj
index 50c9f8b577af1..7beeeef8f8b5d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread10.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread10_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread11.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread11.cs
index 3af2a7a3f4705..3c6bbcb83cc0d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread11.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -62,7 +63,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread11.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread11_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread11.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread11_TimerCallback.csproj
index ba2c41a9bf60b..8e0e7d51593ba 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread11.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread11_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread12.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread12.cs
index a359021400578..9becce63e7734 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread12.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -62,7 +63,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread12.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread12_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread12.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread12_TimerCallback.csproj
index 34ad355611a30..49cd594843a3d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread12.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread12_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread13.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread13.cs
index f9df296102618..729188cd81da1 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread13.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread13.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread13_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread13.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread13_TimerCallback.csproj
index 9733eb9173eb4..de3ea8b662478 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread13.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread13_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread14.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread14.cs
index 7b8047e7ed783..b0dbd4cf1086b 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread14.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread14.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread14_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread14.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread14_TimerCallback.csproj
index 64f08c0b44d42..f2f3aef1b3673 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread14.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread14_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread15.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread15.cs
index 9b9bad5de7fec..de800f797fa05 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread15.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread15.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread15.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread15_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread15.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread15_TimerCallback.csproj
index 046dddf9fa55f..8e4fd42c9c1fb 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread15.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread15_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread16.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread16.cs
index c47df05d69cd6..559645f09892c 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread16.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread16.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread16.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread16_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread16.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread16_TimerCallback.csproj
index 3153426f40620..b5f0f4927bd2d 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread16.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread16_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread17.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread17.cs
index a0850a6be244d..e9ca3eac44582 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread17.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread17.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread17.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread17_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread17.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread17_TimerCallback.csproj
index e96370c26a625..04d2777ffb7cf 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread17.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread17_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread18.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread18.cs
index 0e1698112be65..a958a0f47ea12 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread18.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread18.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread18.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread18_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread18.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread18_TimerCallback.csproj
index bf32e09868556..b4ccb87122f70 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread18.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread18_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread19.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread19.cs
index 03c148ed10e5f..de5d8ec653deb 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread19.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread19.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread19.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread19_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread19.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread19_TimerCallback.csproj
index bfd9fc34c6217..d7de30cfe127c 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread19.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread19_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread20.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread20.cs
index 0e1ad886c9967..4fedb62e94d10 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread20.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread20.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread20.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread20_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread20.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread20_TimerCallback.csproj
index 78af0fab8811c..d804dc9b48454 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread20.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread20_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread21.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread21.cs
index 7b4cd643f3304..ae67c74d7e1bc 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread21.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread21.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread21.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread21_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread21.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread21_TimerCallback.csproj
index a82f9e176a457..69773fa6f0225 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread21.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread21_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread22.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread22.cs
index 130d9a30540ea..312bb5a6e7bea 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread22.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread22.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread22.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread22_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread22.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread22_TimerCallback.csproj
index 0fa4c6c2bd2f7..a050afe11f830 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread22.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread22_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread23.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread23.cs
index 8275435e1a2e3..12caebd477b22 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread23.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread23.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread23.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread23_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread23.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread23_TimerCallback.csproj
index 959010726defa..2e859a958875e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread23.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread23_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread24.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread24.cs
index 62edd7f2af212..2875c278b1508 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread24.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread24.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -193,7 +194,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread24.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread24_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread24.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread24_TimerCallback.csproj
index 16e4591936d94..382efde9c1a86 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread24.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread24_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread25.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread25.cs
index 85ea674dc98e5..458964cde7ee1 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread25.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread25.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -51,7 +52,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread25.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread25_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread25.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread25_TimerCallback.csproj
index 3d8dcb8d4e164..20ef63e37fb61 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread25.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread25_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread26.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread26.cs
index a5741d6050308..2cd92a24420c1 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread26.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread26.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -51,7 +52,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread26.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread26_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread26.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread26_TimerCallback.csproj
index 044a653ba09d8..05e934b6702bc 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread26.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread26_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread27.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread27.cs
index 20ea033473a81..5a479c9c3799e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread27.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread27.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread27.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread27_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread27.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread27_TimerCallback.csproj
index fa0d5d43ff351..7fcfdd560ff75 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread27.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread27_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread28.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread28.cs
index 40c2dc5192de2..a851ea43a55a1 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread28.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread28.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread28.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread28_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread28.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread28_TimerCallback.csproj
index 92d827a4ee2a2..38ccf9fb4ab21 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread28.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread28_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread29.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread29.cs
index 1af5611b50781..ba2cceec76c54 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread29.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread29.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread29.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread29_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread29.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread29_TimerCallback.csproj
index 03cd03474ed7f..f20026fba4083 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread29.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread29_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread30.cs b/src/tests/baseservices/threading/generics/TimerCallback/thread30.cs
index 5b88af47d1141..64f694ce43f3e 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread30.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread30.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread30.csproj b/src/tests/baseservices/threading/generics/TimerCallback/thread30_TimerCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread30.csproj
rename to src/tests/baseservices/threading/generics/TimerCallback/thread30_TimerCallback.csproj
index 4f36d7325676f..5c20d5b6e4e9c 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread30.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/thread30_TimerCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.cs b/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.cs
index 5657841d17e83..2d7edd2a20244 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.cs
+++ b/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Threading;
 using System.Diagnostics;
+using Xunit;
 
 //namespace TimerCallbackTests ////////////// added this namesp
 
@@ -62,7 +63,8 @@ public class Test
 	public static bool result = true;
 	public static int timeToRun = 5000;
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj b/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
index 282237c6aabba..15d567ff14877 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
+++ b/src/tests/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread01.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread01.cs
index c23a74a54ad68..d0885c63b6cbd 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread01.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread01.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread01_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread01.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread01_WaitCallback.csproj
index e4f858a0396ea..10b6b39f924b1 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread01.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread01_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread02.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread02.cs
index cfb0f0350017d..2773fb455e223 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread02.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread02.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread02_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread02.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread02_WaitCallback.csproj
index 430250b374679..23f16bffe0730 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread02.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread02_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread03.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread03.cs
index bdc0faad30e44..6864b527b1129 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread03.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread03.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread03_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread03.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread03_WaitCallback.csproj
index d98eb265922c5..b187d3788ccb7 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread03.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread03_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread04.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread04.cs
index 33c0f717d1ca3..ea669ad05a51e 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread04.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread04.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread04_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread04.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread04_WaitCallback.csproj
index 453633a74c171..f2096a4caf544 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread04.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread04_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread05.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread05.cs
index dc8110c911143..f6ecc934dc163 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread05.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread05.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread05_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread05.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread05_WaitCallback.csproj
index c5fee6a26f374..a05d0f9a72262 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread05.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread05_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread06.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread06.cs
index 1d21f8f7b1042..71936de8e5e62 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread06.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread06.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread06_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread06.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread06_WaitCallback.csproj
index 10eb2b26b956f..cb053f555a452 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread06.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread06_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread07.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread07.cs
index c26b2ab14f4ff..0ace693307a50 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread07.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread07.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread07_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread07.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread07_WaitCallback.csproj
index 450d6df55dcc3..1f50accfe0ea1 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread07.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread07_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread08.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread08.cs
index d649bce0b14d8..76cd0910a265c 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread08.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread08.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread08_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread08.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread08_WaitCallback.csproj
index 5f82b86355589..1d1b003dbaa67 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread08.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread08_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread09.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread09.cs
index 07a8a9c5ad2e8..5e414e16a71a4 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread09.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread09.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread09_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread09.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread09_WaitCallback.csproj
index 15757e66ca264..bb56217eeec1d 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread09.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread09_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread10.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread10.cs
index 3a42ad0d1f8b4..6924798b9677f 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread10.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -63,7 +64,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread10.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread10_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread10.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread10_WaitCallback.csproj
index 50c9f8b577af1..7beeeef8f8b5d 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread10.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread10_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread11.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread11.cs
index 5e4e7d52a91c0..96b0a04f2a070 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread11.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -63,7 +64,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread11.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread11_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread11.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread11_WaitCallback.csproj
index ba2c41a9bf60b..8e0e7d51593ba 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread11.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread11_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread12.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread12.cs
index 51dfec07b00c2..e9a3d7d65bb61 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread12.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -63,7 +64,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread12.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread12_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread12.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread12_WaitCallback.csproj
index 34ad355611a30..49cd594843a3d 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread12.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread12_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread13.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread13.cs
index a639d0ad5a634..d0d9c80d3e8ac 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread13.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -210,7 +211,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread13.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread13_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread13.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread13_WaitCallback.csproj
index 9733eb9173eb4..de3ea8b662478 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread13.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread13_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread14.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread14.cs
index 0ac4660e8fbde..7ed7d375621bd 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread14.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -210,7 +211,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread14.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread14_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread14.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread14_WaitCallback.csproj
index 64f08c0b44d42..f2f3aef1b3673 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread14.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread14_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread15.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread15.cs
index 8ba040b6da1b2..c2f26ac416be3 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread15.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread15.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -210,7 +211,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread15.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread15_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread15.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread15_WaitCallback.csproj
index 046dddf9fa55f..8e4fd42c9c1fb 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread15.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread15_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread16.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread16.cs
index d10f8a44d6d6c..0ea0d254c414e 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread16.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread16.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread16.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread16_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread16.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread16_WaitCallback.csproj
index 3153426f40620..b5f0f4927bd2d 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread16.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread16_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread17.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread17.cs
index 754c9ff13ea4a..78be9436220d4 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread17.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread17.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread17.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread17_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread17.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread17_WaitCallback.csproj
index e96370c26a625..04d2777ffb7cf 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread17.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread17_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread18.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread18.cs
index 882579bd944ee..19d66063c7d99 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread18.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread18.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -60,7 +61,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread18.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread18_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread18.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread18_WaitCallback.csproj
index bf32e09868556..b4ccb87122f70 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread18.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread18_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread19.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread19.cs
index 42feab56adc5a..a7f9c16069fdb 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread19.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread19.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread19.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread19_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread19.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread19_WaitCallback.csproj
index bfd9fc34c6217..d7de30cfe127c 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread19.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread19_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread20.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread20.cs
index 96d530186ce38..e4c7d2d0a13dd 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread20.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread20.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread20.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread20_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread20.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread20_WaitCallback.csproj
index 78af0fab8811c..d804dc9b48454 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread20.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread20_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread21.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread21.cs
index fb3e4d9f51b58..e5d5bfdb8c9d3 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread21.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread21.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -64,7 +65,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread21.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread21_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread21.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread21_WaitCallback.csproj
index a82f9e176a457..69773fa6f0225 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread21.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread21_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread22.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread22.cs
index b0e0dd8f73bf2..57be95352f74c 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread22.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread22.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -220,7 +221,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread22.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread22_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread22.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread22_WaitCallback.csproj
index 0fa4c6c2bd2f7..a050afe11f830 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread22.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread22_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread23.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread23.cs
index 1420d50c0fa38..f2b26a0f7d06b 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread23.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread23.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -218,7 +219,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread23.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread23_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread23.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread23_WaitCallback.csproj
index 959010726defa..2e859a958875e 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread23.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread23_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread24.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread24.cs
index 9c73e17978e28..1bd7d9f638099 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread24.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread24.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -216,7 +217,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread24.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread24_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread24.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread24_WaitCallback.csproj
index 16e4591936d94..382efde9c1a86 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread24.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread24_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread25.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread25.cs
index f1de1913a9daf..53e9aef61ab6c 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread25.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread25.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread25.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread25_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread25.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread25_WaitCallback.csproj
index 3d8dcb8d4e164..20ef63e37fb61 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread25.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread25_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread26.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread26.cs
index 744fea964bfdf..b383e63a3bacf 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread26.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread26.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread26.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread26_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread26.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread26_WaitCallback.csproj
index 044a653ba09d8..05e934b6702bc 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread26.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread26_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread27.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread27.cs
index de80e4b823f36..5d716ebf176aa 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread27.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread27.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread27.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread27_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread27.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread27_WaitCallback.csproj
index fa0d5d43ff351..7fcfdd560ff75 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread27.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread27_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread28.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread28.cs
index 52d0712f75644..3850bec802ad5 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread28.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread28.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -55,7 +56,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread28.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread28_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread28.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread28_WaitCallback.csproj
index 92d827a4ee2a2..38ccf9fb4ab21 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread28.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread28_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread29.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread29.cs
index 4b1dccc772b26..c60e3b509d5b8 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread29.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread29.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread29.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread29_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread29.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread29_WaitCallback.csproj
index 03cd03474ed7f..f20026fba4083 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread29.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread29_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread30.cs b/src/tests/baseservices/threading/generics/WaitCallback/thread30.cs
index 9ec8d7ef9f4ef..a3663bdb7cb6c 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread30.cs
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread30.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -53,7 +54,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/WaitCallback/thread30.csproj b/src/tests/baseservices/threading/generics/WaitCallback/thread30_WaitCallback.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/WaitCallback/thread30.csproj
rename to src/tests/baseservices/threading/generics/WaitCallback/thread30_WaitCallback.csproj
index 4f36d7325676f..5c20d5b6e4e9c 100644
--- a/src/tests/baseservices/threading/generics/WaitCallback/thread30.csproj
+++ b/src/tests/baseservices/threading/generics/WaitCallback/thread30_WaitCallback.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread01.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread01_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread01.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread01_syncdelegate.csproj
index e4f858a0396ea..10b6b39f924b1 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread01.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread01_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread02.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread02_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread02.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread02_syncdelegate.csproj
index 430250b374679..23f16bffe0730 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread02.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread02_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread03.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread03_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread03.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread03_syncdelegate.csproj
index d98eb265922c5..b187d3788ccb7 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread03.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread03_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread04.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread04_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread04.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread04_syncdelegate.csproj
index 453633a74c171..f2096a4caf544 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread04.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread04_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread05.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread05_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread05.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread05_syncdelegate.csproj
index c5fee6a26f374..a05d0f9a72262 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread05.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread05_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread06.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread06_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread06.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread06_syncdelegate.csproj
index 10eb2b26b956f..cb053f555a452 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread06.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread06_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread07.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread07_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread07.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread07_syncdelegate.csproj
index 450d6df55dcc3..1f50accfe0ea1 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread07.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread07_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread08.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread08_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread08.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread08_syncdelegate.csproj
index 5f82b86355589..1d1b003dbaa67 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread08.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread08_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread09.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread09_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread09.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread09_syncdelegate.csproj
index 15757e66ca264..bb56217eeec1d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread09.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread09_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread10.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread10_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread10.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread10_syncdelegate.csproj
index 50c9f8b577af1..7beeeef8f8b5d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread10.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread10_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread11.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread11_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread11.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread11_syncdelegate.csproj
index ba2c41a9bf60b..8e0e7d51593ba 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread11.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread11_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread12.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread12_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread12.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread12_syncdelegate.csproj
index 34ad355611a30..49cd594843a3d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread12.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread12_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread13.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread13_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread13.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread13_syncdelegate.csproj
index 9733eb9173eb4..de3ea8b662478 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread13.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread13_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread14.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread14_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread14.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread14_syncdelegate.csproj
index 64f08c0b44d42..f2f3aef1b3673 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread14.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread14_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread15.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread15_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread15.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread15_syncdelegate.csproj
index 046dddf9fa55f..8e4fd42c9c1fb 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread15.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread15_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread16.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread16_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread16.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread16_syncdelegate.csproj
index 3153426f40620..b5f0f4927bd2d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread16.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread16_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread17.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread17_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread17.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread17_syncdelegate.csproj
index e96370c26a625..04d2777ffb7cf 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread17.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread17_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread18.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread18_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread18.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread18_syncdelegate.csproj
index bf32e09868556..b4ccb87122f70 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread18.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread18_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread19.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread19_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread19.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread19_syncdelegate.csproj
index bfd9fc34c6217..d7de30cfe127c 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread19.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread19_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread20.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread20_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread20.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread20_syncdelegate.csproj
index 78af0fab8811c..d804dc9b48454 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread20.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread20_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread21.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread21_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread21.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread21_syncdelegate.csproj
index a82f9e176a457..69773fa6f0225 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread21.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread21_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread22.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread22_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread22.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread22_syncdelegate.csproj
index 0fa4c6c2bd2f7..a050afe11f830 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread22.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread22_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread23.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread23_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread23.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread23_syncdelegate.csproj
index 959010726defa..2e859a958875e 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread23.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread23_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread24.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread24_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread24.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread24_syncdelegate.csproj
index 16e4591936d94..382efde9c1a86 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread24.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread24_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread25.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread25_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread25.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread25_syncdelegate.csproj
index 3d8dcb8d4e164..20ef63e37fb61 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread25.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread25_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread26.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread26_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread26.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread26_syncdelegate.csproj
index 044a653ba09d8..05e934b6702bc 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread26.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread26_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread27.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread27_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread27.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread27_syncdelegate.csproj
index fa0d5d43ff351..7fcfdd560ff75 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread27.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread27_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread28.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread28_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread28.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread28_syncdelegate.csproj
index 92d827a4ee2a2..38ccf9fb4ab21 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread28.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread28_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread29.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread29_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread29.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread29_syncdelegate.csproj
index 03cd03474ed7f..f20026fba4083 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread29.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread29_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/GThread30.csproj b/src/tests/baseservices/threading/generics/syncdelegate/GThread30_syncdelegate.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/syncdelegate/GThread30.csproj
rename to src/tests/baseservices/threading/generics/syncdelegate/GThread30_syncdelegate.csproj
index 4f36d7325676f..5c20d5b6e4e9c 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/GThread30.csproj
+++ b/src/tests/baseservices/threading/generics/syncdelegate/GThread30_syncdelegate.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread01.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread01.cs
index 371c8ef412cf5..179bcef3379f9 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread01.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -35,7 +36,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread02.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread02.cs
index 39951b6ecfa5b..2cc5e78cc8810 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread02.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -35,7 +36,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread03.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread03.cs
index 5775c0715f0cb..eca17b5aa6b48 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread03.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -37,7 +38,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread04.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread04.cs
index 806ed643d699f..8337a6f50e61a 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread04.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread05.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread05.cs
index 8bd7cc02c3a1a..c8fba0f917026 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread05.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread06.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread06.cs
index be2ae5a96fe9a..8879ce3d3fc5b 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread06.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread07.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread07.cs
index 251ef78496a75..d429ffa258f23 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread07.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -37,7 +38,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread08.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread08.cs
index 150a1c7528682..e4e17e3b44b06 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread08.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread09.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread09.cs
index 6a1751bb59e04..074a8ef378860 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread09.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread10.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread10.cs
index ad4c25ca6f090..d4f8da650cc61 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread10.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread11.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread11.cs
index 114e96737bc26..70934a62a754a 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread11.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread12.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread12.cs
index 276abe6682749..01cf35b252675 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread12.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread13.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread13.cs
index 0d60ace568ec0..130198adcbaa6 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread13.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -130,7 +131,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread14.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread14.cs
index 5f40616ec3632..8d49266d1d801 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread14.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -130,7 +131,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread15.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread15.cs
index cd499e9cd2a3f..ee644d4abac6d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread15.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread15.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -130,7 +131,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread16.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread16.cs
index 32868ba223f92..4ee8a37e6548d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread16.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread16.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -45,7 +46,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread17.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread17.cs
index 1d1227d76efe2..56c390666fe76 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread17.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread17.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -45,7 +46,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread18.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread18.cs
index 260474373ced5..535ea9d6d6331 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread18.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread18.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -45,7 +46,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread19.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread19.cs
index 3e4d05c750786..1fcdef5369459 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread19.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread19.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread20.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread20.cs
index bf19e7244f06a..f6187ca1ff3d2 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread20.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread20.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread21.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread21.cs
index c92947ef569ed..1a7317db4c464 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread21.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread21.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread22.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread22.cs
index 08923b21e4428..fd0adf2358705 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread22.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread22.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -142,7 +143,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest<int>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread23.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread23.cs
index 40bfd13635861..c0227954caa99 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread23.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread23.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -142,7 +143,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest<int>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread24.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread24.cs
index e58d0f74afc3a..bb8f330973bca 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread24.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread24.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -142,7 +143,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.DelegateTest<int>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread25.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread25.cs
index 542b9dde16060..ae007e191728e 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread25.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread25.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -37,7 +38,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread26.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread26.cs
index e2b1427084905..ba16b636a794b 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread26.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread26.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -37,7 +38,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest();
 		Gen<double>.DelegateTest();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread27.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread27.cs
index 832186b0dc3c0..378127f66eafb 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread27.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread27.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -40,7 +41,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread28.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread28.cs
index 7b4b987c5b405..98424a71d663d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread28.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread28.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -40,7 +41,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.DelegateTest<object>();
 		Gen<double>.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread29.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread29.cs
index acee10d089f5a..7094afb1fd78d 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread29.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread29.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/syncdelegate/thread30.cs b/src/tests/baseservices/threading/generics/syncdelegate/thread30.cs
index 6bcc91dad3fbe..471be154dc3a7 100644
--- a/src/tests/baseservices/threading/generics/syncdelegate/thread30.cs
+++ b/src/tests/baseservices/threading/generics/syncdelegate/thread30.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen
 {
@@ -39,7 +40,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.DelegateTest<object>();
 		Gen.DelegateTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread01.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread01_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread01.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread01_threadstart.csproj
index e4f858a0396ea..10b6b39f924b1 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread01.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread01_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread02.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread02_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread02.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread02_threadstart.csproj
index 430250b374679..23f16bffe0730 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread02.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread02_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread03.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread03_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread03.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread03_threadstart.csproj
index d98eb265922c5..b187d3788ccb7 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread03.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread03_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/TimerCallback/thread04.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread04_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/TimerCallback/thread04.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread04_threadstart.csproj
index 453633a74c171..f2096a4caf544 100644
--- a/src/tests/baseservices/threading/generics/TimerCallback/thread04.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread04_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread05.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread05_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread05.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread05_threadstart.csproj
index c5fee6a26f374..a05d0f9a72262 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread05.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread05_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread06.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread06_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread06.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread06_threadstart.csproj
index 10eb2b26b956f..cb053f555a452 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread06.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread06_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread07.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread07_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread07.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread07_threadstart.csproj
index 450d6df55dcc3..1f50accfe0ea1 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread07.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread07_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread08.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread08_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread08.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread08_threadstart.csproj
index 5f82b86355589..1d1b003dbaa67 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread08.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread08_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread09.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread09_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread09.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread09_threadstart.csproj
index 15757e66ca264..bb56217eeec1d 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread09.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread09_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread10.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread10_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread10.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread10_threadstart.csproj
index 50c9f8b577af1..7beeeef8f8b5d 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread10.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread10_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread11.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread11_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread11.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread11_threadstart.csproj
index ba2c41a9bf60b..8e0e7d51593ba 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread11.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread11_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread12.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread12_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread12.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread12_threadstart.csproj
index 34ad355611a30..49cd594843a3d 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread12.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread12_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread13.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread13_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread13.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread13_threadstart.csproj
index 9733eb9173eb4..de3ea8b662478 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread13.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread13_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread14.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread14_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread14.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread14_threadstart.csproj
index 64f08c0b44d42..f2f3aef1b3673 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread14.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread14_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread15.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread15_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread15.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread15_threadstart.csproj
index 046dddf9fa55f..8e4fd42c9c1fb 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread15.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread15_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread16.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread16_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread16.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread16_threadstart.csproj
index 3153426f40620..b5f0f4927bd2d 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread16.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread16_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread17.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread17_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread17.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread17_threadstart.csproj
index e96370c26a625..04d2777ffb7cf 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread17.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread17_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread18.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread18_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread18.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread18_threadstart.csproj
index bf32e09868556..b4ccb87122f70 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread18.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread18_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread19.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread19_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread19.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread19_threadstart.csproj
index bfd9fc34c6217..d7de30cfe127c 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread19.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread19_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread20.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread20_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread20.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread20_threadstart.csproj
index 78af0fab8811c..d804dc9b48454 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread20.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread20_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread21.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread21_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread21.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread21_threadstart.csproj
index a82f9e176a457..69773fa6f0225 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread21.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread21_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread22.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread22_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread22.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread22_threadstart.csproj
index 0fa4c6c2bd2f7..a050afe11f830 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread22.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread22_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread23.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread23_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread23.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread23_threadstart.csproj
index 959010726defa..2e859a958875e 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread23.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread23_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread24.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread24_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread24.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread24_threadstart.csproj
index 16e4591936d94..382efde9c1a86 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread24.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread24_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread25.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread25_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread25.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread25_threadstart.csproj
index 3d8dcb8d4e164..20ef63e37fb61 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread25.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread25_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread26.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread26_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread26.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread26_threadstart.csproj
index 044a653ba09d8..05e934b6702bc 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread26.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread26_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread27.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread27_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread27.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread27_threadstart.csproj
index fa0d5d43ff351..7fcfdd560ff75 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread27.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread27_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread28.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread28_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread28.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread28_threadstart.csproj
index 92d827a4ee2a2..38ccf9fb4ab21 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread28.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread28_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread29.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread29_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread29.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread29_threadstart.csproj
index 03cd03474ed7f..f20026fba4083 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread29.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread29_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/GThread30.csproj b/src/tests/baseservices/threading/generics/threadstart/GThread30_threadstart.csproj
similarity index 87%
rename from src/tests/baseservices/threading/generics/threadstart/GThread30.csproj
rename to src/tests/baseservices/threading/generics/threadstart/GThread30_threadstart.csproj
index 4f36d7325676f..5c20d5b6e4e9c 100644
--- a/src/tests/baseservices/threading/generics/threadstart/GThread30.csproj
+++ b/src/tests/baseservices/threading/generics/threadstart/GThread30_threadstart.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread01.cs b/src/tests/baseservices/threading/generics/threadstart/thread01.cs
index 4d7a86767c4f6..cbf1b63861c58 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread01.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread01.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -47,7 +48,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread02.cs b/src/tests/baseservices/threading/generics/threadstart/thread02.cs
index 488f7368d8ea2..201c7a844d722 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread02.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread02.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -47,7 +48,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread03.cs b/src/tests/baseservices/threading/generics/threadstart/thread03.cs
index f9b10384047c5..c29cd4913b957 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread03.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread03.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread04.cs b/src/tests/baseservices/threading/generics/threadstart/thread04.cs
index 4c710dc36660e..e05e3a50e56ce 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread04.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread04.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread05.cs b/src/tests/baseservices/threading/generics/threadstart/thread05.cs
index 57a28207de5d3..9e93990325840 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread05.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread05.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread06.cs b/src/tests/baseservices/threading/generics/threadstart/thread06.cs
index b2e593c909dc7..38cba89ec8da4 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread06.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread06.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread07.cs b/src/tests/baseservices/threading/generics/threadstart/thread07.cs
index 9097b6cdb4392..c1c6421789bac 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread07.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread07.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -47,7 +48,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread08.cs b/src/tests/baseservices/threading/generics/threadstart/thread08.cs
index 232b1baf36b49..36ca9fbed712a 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread08.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread08.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread09.cs b/src/tests/baseservices/threading/generics/threadstart/thread09.cs
index 9b71df600caa9..b1f9e3c067cc9 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread09.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread09.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread10.cs b/src/tests/baseservices/threading/generics/threadstart/thread10.cs
index c101ad956a6ac..ef87b8174076e 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread10.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread10.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -57,7 +58,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread11.cs b/src/tests/baseservices/threading/generics/threadstart/thread11.cs
index 5200ea558b370..4fb3d55c4113c 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread11.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread11.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -57,7 +58,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread12.cs b/src/tests/baseservices/threading/generics/threadstart/thread12.cs
index 5d5865c4781dd..ea88a36dcfdf4 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread12.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread12.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -57,7 +58,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread13.cs b/src/tests/baseservices/threading/generics/threadstart/thread13.cs
index dd7c2c4ef89f6..e53d18a9b5e36 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread13.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread13.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -175,7 +176,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread14.cs b/src/tests/baseservices/threading/generics/threadstart/thread14.cs
index cb3259a8f3f86..e015e5e2ee33c 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread14.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread14.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -175,7 +176,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread15.cs b/src/tests/baseservices/threading/generics/threadstart/thread15.cs
index f68339268c378..456bb7f00e265 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread15.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread15.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -175,7 +176,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread16.cs b/src/tests/baseservices/threading/generics/threadstart/thread16.cs
index 8e6f93f8cd62e..bfcb94203f4c6 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread16.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread16.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -54,7 +55,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread17.cs b/src/tests/baseservices/threading/generics/threadstart/thread17.cs
index 42bf6b66f5e11..493cc2b5b5539 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread17.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread17.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -54,7 +55,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread18.cs b/src/tests/baseservices/threading/generics/threadstart/thread18.cs
index d92ac920d30b0..149b461755642 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread18.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread18.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen
 {
@@ -54,7 +55,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread19.cs b/src/tests/baseservices/threading/generics/threadstart/thread19.cs
index 131ff18af97c9..5922497f2e3d3 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread19.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread19.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -58,7 +59,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread20.cs b/src/tests/baseservices/threading/generics/threadstart/thread20.cs
index a461eaf1b2d76..9936a3c10138f 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread20.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread20.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -58,7 +59,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread21.cs b/src/tests/baseservices/threading/generics/threadstart/thread21.cs
index 2ced39d89990d..a6f4b97acec95 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread21.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread21.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 interface IGen<T>
@@ -58,7 +59,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread22.cs b/src/tests/baseservices/threading/generics/threadstart/thread22.cs
index c66066d745ee9..00b4ecd918f3f 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread22.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread22.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -187,7 +188,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread23.cs b/src/tests/baseservices/threading/generics/threadstart/thread23.cs
index 173f8426d825f..f880ed4876395 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread23.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread23.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -187,7 +188,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread24.cs b/src/tests/baseservices/threading/generics/threadstart/thread24.cs
index e5c9f615ef5e7..a14d243fa2fb1 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread24.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread24.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 interface IGen<T>
 {
@@ -187,7 +188,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 	
 		GenInt.ThreadPoolTest<int>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread25.cs b/src/tests/baseservices/threading/generics/threadstart/thread25.cs
index 96c1843f47f6b..d180917e9df84 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread25.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread25.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -46,7 +47,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread26.cs b/src/tests/baseservices/threading/generics/threadstart/thread26.cs
index 268fe6b332396..5b41ecd9f28ca 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread26.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread26.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -46,7 +47,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest();
 		Gen<double>.ThreadPoolTest();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread27.cs b/src/tests/baseservices/threading/generics/threadstart/thread27.cs
index be320cdc0ea63..c294a1174abe7 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread27.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread27.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread28.cs b/src/tests/baseservices/threading/generics/threadstart/thread28.cs
index 3e06325d4b032..bcffc2ed9b301 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread28.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread28.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen<T> 
 {
@@ -49,7 +50,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen<int>.ThreadPoolTest<object>();
 		Gen<double>.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread29.cs b/src/tests/baseservices/threading/generics/threadstart/thread29.cs
index 784c989c01bf2..6c367cea276b8 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread29.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread29.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 class Gen 
 {
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/generics/threadstart/thread30.cs b/src/tests/baseservices/threading/generics/threadstart/thread30.cs
index 65a1c07b3955d..c4380a990a9ab 100644
--- a/src/tests/baseservices/threading/generics/threadstart/thread30.cs
+++ b/src/tests/baseservices/threading/generics/threadstart/thread30.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 struct Gen
 {
@@ -48,7 +49,8 @@ public static void Eval(bool exp)
 	
 	}
 	
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Gen.ThreadPoolTest<object>();
 		Gen.ThreadPoolTest<string>();
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-a.cs b/src/tests/baseservices/threading/regressions/13662/13662-a.cs
index 5cd7b9f4a4015..c6a93c6228dab 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-a.cs
+++ b/src/tests/baseservices/threading/regressions/13662/13662-a.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Test_13662_a {
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 
 		int rValue = 100;
 		Timer[] tArray = new Timer[1000];
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-a.csproj b/src/tests/baseservices/threading/regressions/13662/13662-a.csproj
index bef07383c37bb..4c1fe3255567a 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-a.csproj
+++ b/src/tests/baseservices/threading/regressions/13662/13662-a.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Under heavy load, some of the TimerCallback functions don't complete before the test exits, preventing unload -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-b.cs b/src/tests/baseservices/threading/regressions/13662/13662-b.cs
index 4cbb993337dfb..9f0ced28afff0 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-b.cs
+++ b/src/tests/baseservices/threading/regressions/13662/13662-b.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Test_13662_b {
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 
 		int rValue = 100;
 		Timer[] tArray = new Timer[1000];
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-b.csproj b/src/tests/baseservices/threading/regressions/13662/13662-b.csproj
index b96e49100c370..ec5587a234600 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-b.csproj
+++ b/src/tests/baseservices/threading/regressions/13662/13662-b.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Under heavy load, some of the TimerCallback functions don't complete before the test exits, preventing unload -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/baseservices/threading/regressions/13662/13662-simple.csproj b/src/tests/baseservices/threading/regressions/13662/13662-simple.csproj
index e172ab2354175..9cbd4492e55fa 100644
--- a/src/tests/baseservices/threading/regressions/13662/13662-simple.csproj
+++ b/src/tests/baseservices/threading/regressions/13662/13662-simple.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- Under heavy load, some of the TimerCallback functions don't complete before the test exits, preventing unload -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/baseservices/threading/regressions/13662/simple.cs b/src/tests/baseservices/threading/regressions/13662/simple.cs
index 5b342eacb9c2e..463c8efca31ee 100644
--- a/src/tests/baseservices/threading/regressions/13662/simple.cs
+++ b/src/tests/baseservices/threading/regressions/13662/simple.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Test_simple {
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 
 		int rValue = 100;
 		Timer[] tArray = new Timer[100];
diff --git a/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.cs b/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.cs
index 3e1670dae7a6a..2352f20451c0d 100644
--- a/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.cs
+++ b/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.cs
@@ -5,6 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Threading;
+using Xunit;
 
 /*
  * Issue description:
@@ -14,7 +15,8 @@
 
 public class Test_foreground_shutdown
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         new Thread(() =>
         {
diff --git a/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.csproj b/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.csproj
index b217844f3a72a..6adb4a421c105 100644
--- a/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.csproj
+++ b/src/tests/baseservices/threading/regressions/2164/foreground-shutdown.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for Environment.Exit -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/regressions/269336/objmonhelper.cs b/src/tests/baseservices/threading/regressions/269336/objmonhelper.cs
index 51989aea4cf6b..ed5f97e99d913 100644
--- a/src/tests/baseservices/threading/regressions/269336/objmonhelper.cs
+++ b/src/tests/baseservices/threading/regressions/269336/objmonhelper.cs
@@ -3,12 +3,14 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-class ObjMonHelper {
+public class ObjMonHelper {
 	const string FailMsg = @"Monitor.Enter appears to have mistaken a hash code in an object header for
 a valid lock owned by the current thread.";
 
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		var ok = true;
 		var arr = new object[1024*1024];
 
diff --git a/src/tests/baseservices/threading/regressions/269336/objmonhelper.csproj b/src/tests/baseservices/threading/regressions/269336/objmonhelper.csproj
index 9f562d8b3b40f..304a8006fa1e8 100644
--- a/src/tests/baseservices/threading/regressions/269336/objmonhelper.csproj
+++ b/src/tests/baseservices/threading/regressions/269336/objmonhelper.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible, CLRTestEnvironmentVariable -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/regressions/30032/30032.cs b/src/tests/baseservices/threading/regressions/30032/30032.cs
index 8c72b4a1472c7..ebd4c8504898f 100644
--- a/src/tests/baseservices/threading/regressions/30032/30032.cs
+++ b/src/tests/baseservices/threading/regressions/30032/30032.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Test_30032 {
 
-	public static int Main(){
+	[Fact]
+	public static int TestEntryPoint(){
 
 		int rValue = 100;
 		Timer[] tArray = new Timer[100];
diff --git a/src/tests/baseservices/threading/regressions/30032/30032.csproj b/src/tests/baseservices/threading/regressions/30032/30032.csproj
index 20447c6494d3a..1e74cf137db13 100644
--- a/src/tests/baseservices/threading/regressions/30032/30032.csproj
+++ b/src/tests/baseservices/threading/regressions/30032/30032.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/regressions/576463/576463.cs b/src/tests/baseservices/threading/regressions/576463/576463.cs
index 2bcb36a38a2a6..bbf8222020d3c 100644
--- a/src/tests/baseservices/threading/regressions/576463/576463.cs
+++ b/src/tests/baseservices/threading/regressions/576463/576463.cs
@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
-
-class Test
+using System.Runtime.CompilerServices;
+using Xunit;
+public class Test
 {
     bool _aRun = false;
     public void A()
@@ -107,7 +108,11 @@ public static void ReadArgs(string[] args)
     static bool s_takeLock = false;
     static bool s_contention = false;
 
-    public static int Main(string[] args)
+    [Fact]
+    public static int TestEntryPoint() => Run(new string[0]);
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static int Run(string[] args)
     {
         ReadArgs(args);
 
diff --git a/src/tests/baseservices/threading/regressions/576463/576463.csproj b/src/tests/baseservices/threading/regressions/576463/576463.csproj
index 239163dce0a65..af9931808c36e 100644
--- a/src/tests/baseservices/threading/regressions/576463/576463.csproj
+++ b/src/tests/baseservices/threading/regressions/576463/576463.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/tests/baseservices/threading/regressions/6906/6906.csproj b/src/tests/baseservices/threading/regressions/6906/6906.csproj
index 469daadd67493..62e4cddc31945 100644
--- a/src/tests/baseservices/threading/regressions/6906/6906.csproj
+++ b/src/tests/baseservices/threading/regressions/6906/6906.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/regressions/6906/repro.cs b/src/tests/baseservices/threading/regressions/6906/repro.cs
index b077fba90e1cd..f740bd05f0e98 100644
--- a/src/tests/baseservices/threading/regressions/6906/repro.cs
+++ b/src/tests/baseservices/threading/regressions/6906/repro.cs
@@ -2,11 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 
 public class Beta 
 {
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
     		int rValue = 100;
 		Console.WriteLine("Setup an Infinite Wait with negative value other than -1");
diff --git a/src/tests/baseservices/threading/regressions/beta1/347011.cs b/src/tests/baseservices/threading/regressions/beta1/347011.cs
index 74bb5b6106886..165a13fd99a2d 100644
--- a/src/tests/baseservices/threading/regressions/beta1/347011.cs
+++ b/src/tests/baseservices/threading/regressions/beta1/347011.cs
@@ -3,12 +3,14 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class TimerTest
 {
     public static void Target(Object foo){}
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         int retVal = 0;
         Timer timer = new Timer(new TimerCallback(Target),new Object(), 1000,1000);
diff --git a/src/tests/baseservices/threading/regressions/beta1/347011.csproj b/src/tests/baseservices/threading/regressions/beta1/347011.csproj
index c351bcc1ad95e..bc9be0089b69d 100644
--- a/src/tests/baseservices/threading/regressions/beta1/347011.csproj
+++ b/src/tests/baseservices/threading/regressions/beta1/347011.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/regressions/beta2/437017.cs b/src/tests/baseservices/threading/regressions/beta2/437017.cs
index c279bff217992..09c7ffd90a54d 100644
--- a/src/tests/baseservices/threading/regressions/beta2/437017.cs
+++ b/src/tests/baseservices/threading/regressions/beta2/437017.cs
@@ -3,15 +3,17 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-class Test
+public class Test
 {    
     static bool _fTestFailed = false;
     static bool _fTestDone = false;
     static ManualResetEvent _mre;
     static AutoResetEvent _are = new AutoResetEvent(false);
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Thread th = new Thread(new ThreadStart(Thread2));
         th.Start();
diff --git a/src/tests/baseservices/threading/regressions/beta2/437017.csproj b/src/tests/baseservices/threading/regressions/beta2/437017.csproj
index 716b572402f55..493f8de370cc9 100644
--- a/src/tests/baseservices/threading/regressions/beta2/437017.csproj
+++ b/src/tests/baseservices/threading/regressions/beta2/437017.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for UnloadabilityIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <!-- This test leaves random number of WaitOrTimerCallbacks registered at the exit, which prevents unloading -->
     <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/src/tests/baseservices/threading/regressions/beta2/437044.cs b/src/tests/baseservices/threading/regressions/beta2/437044.cs
index 98abd96294ee2..daaaac7874e8c 100644
--- a/src/tests/baseservices/threading/regressions/beta2/437044.cs
+++ b/src/tests/baseservices/threading/regressions/beta2/437044.cs
@@ -3,15 +3,17 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-class Test
+public class Test
 {    
     static bool _fTestFailed = false;
     static bool _fTestDone = false;
     static ManualResetEvent _mre;
     static AutoResetEvent _are = new AutoResetEvent(false);
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Thread th = new Thread(new ThreadStart(Thread2));
         th.Start();
diff --git a/src/tests/baseservices/threading/regressions/beta2/437044.csproj b/src/tests/baseservices/threading/regressions/beta2/437044.csproj
index 8c1c050c7d090..11e4aec55051e 100644
--- a/src/tests/baseservices/threading/regressions/beta2/437044.csproj
+++ b/src/tests/baseservices/threading/regressions/beta2/437044.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for GCStressIncompatible -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- This test isn't technically incompatible with GCStress, but it ends up running very slowly
          in some configurations, e.g. GCStress=3 on Linux/arm32 measured at 20 minutes.
diff --git a/src/tests/baseservices/threading/regressions/devdiv489437/test489437.cs b/src/tests/baseservices/threading/regressions/devdiv489437/test489437.cs
index 7f9b83d0abea2..3434de6615eaf 100644
--- a/src/tests/baseservices/threading/regressions/devdiv489437/test489437.cs
+++ b/src/tests/baseservices/threading/regressions/devdiv489437/test489437.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Xunit;
 
 /*
  * Issue description:
@@ -19,9 +20,10 @@ release the erroneously-acquired count.
   cancel the associated Task.
 */
 
-class Test
+public class Test
 {
-    static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         SemaphoreSlim s = new SemaphoreSlim(initialCount: 1);
 
diff --git a/src/tests/baseservices/threading/regressions/devdiv489437/test489437.csproj b/src/tests/baseservices/threading/regressions/devdiv489437/test489437.csproj
index dda86d35df4a0..7500ecabf35fd 100644
--- a/src/tests/baseservices/threading/regressions/devdiv489437/test489437.csproj
+++ b/src/tests/baseservices/threading/regressions/devdiv489437/test489437.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/regressions/whidbey_m3/200176.cs b/src/tests/baseservices/threading/regressions/whidbey_m3/200176.cs
index 0ee848ee0dd4c..44030bf7a8d84 100644
--- a/src/tests/baseservices/threading/regressions/whidbey_m3/200176.cs
+++ b/src/tests/baseservices/threading/regressions/whidbey_m3/200176.cs
@@ -3,10 +3,12 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class Stop {
 
-    public static int Main() {              
+    [Fact]
+    public static int TestEntryPoint() {              
 
         Stop tm = new Stop();
 	try
diff --git a/src/tests/baseservices/threading/regressions/whidbey_m3/200176.csproj b/src/tests/baseservices/threading/regressions/whidbey_m3/200176.csproj
index 6ee702a0f5b0a..02279f3109bc0 100644
--- a/src/tests/baseservices/threading/regressions/whidbey_m3/200176.csproj
+++ b/src/tests/baseservices/threading/regressions/whidbey_m3/200176.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threading_group1.csproj b/src/tests/baseservices/threading/threading_group1.csproj
new file mode 100644
index 0000000000000..a099f2d9e87c5
--- /dev/null
+++ b/src/tests/baseservices/threading/threading_group1.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <MergedWrapperProjectReference Include="commitstackonlyasneeded/**/*.??proj" />
+    <MergedWrapperProjectReference Include="coverage/**/*.??proj" />
+    <MergedWrapperProjectReference Include="DeadThreads/**/*.??proj" />
+    <MergedWrapperProjectReference Include="delegate/**/*.??proj" />
+    <MergedWrapperProjectReference Include="generics/threadstart/*.??proj" />
+    <MergedWrapperProjectReference Include="generics/syncdelegate/*.??proj" />
+    <MergedWrapperProjectReference Include="regressions/**/*.??proj" />
+    <MergedWrapperProjectReference Update="**" Aliases="$([System.String]::Concat(&quot;_&quot;,$([System.String]::Copy(&quot;%(Filename)&quot;).Replace(&quot;-&quot;,&quot;_&quot;))))" />
+    <ProjectReference Include="@(MergedWrapperProjectReference)" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tests/baseservices/threading/threading_group2.csproj b/src/tests/baseservices/threading/threading_group2.csproj
new file mode 100644
index 0000000000000..bb5468800359d
--- /dev/null
+++ b/src/tests/baseservices/threading/threading_group2.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsMergedTestRunnerAssembly>true</IsMergedTestRunnerAssembly>
+  </PropertyGroup>
+  <ItemGroup>
+    <MergedWrapperProjectReference Include="*/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="commitstackonlyasneeded/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="coverage/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="DeadThreads/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="delegate/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="generics/syncdelegate/*.??proj" />
+    <MergedWrapperProjectReference Remove="generics/threadstart/*.??proj" />
+    <MergedWrapperProjectReference Remove="regressions/**/*.??proj" />
+    <MergedWrapperProjectReference Update="**" Aliases="$([System.String]::Concat(&quot;_&quot;,$([System.String]::Copy(&quot;%(Filename)&quot;).Replace(&quot;-&quot;,&quot;_&quot;))))" />
+    <ProjectReference Include="@(MergedWrapperProjectReference)" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.cs
index 0f28d3a777952..35b81d35a5bf6 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandle1
+public class BindHandle1
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandle1().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
index f799530306736..3eb68ccc39c5e 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.cs
index 65866a6f2e978..aabbaf75c43d4 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Threading;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
-class BindHandleInvalid
+public class BindHandleInvalid
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleInvalid().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
index e58a53f06c50d..5e8bb1cb82da1 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.cs
index 5015773e5da71..120ea64f89f4a 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandleInvalid3
+public class BindHandleInvalid3
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleInvalid3().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
index 949f202963c5d..766f7696668ab 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.cs
index 953efb598d937..6aaede08cb4a3 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandleInvalid3
+public class BindHandleInvalid3
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleInvalid3().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
index bd85b46f26a8c..6229100279eb8 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.cs
index b67a37f3729cc..59d9ce96260fd 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandleInvalid3
+public class BindHandleInvalid3
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleInvalid3().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
index 751974a825b0b..f372f741ccaf9 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.cs
index 49ce25514acdf..5a8000d23b9e6 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.cs
@@ -6,13 +6,15 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
+using Xunit;
 
 /// <summary>
 /// Verifies passing an invalid handle (not overlapped) to BindHandle works as expected
 /// </summary>
-class BindHandle1
+public class BindHandle1
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandle1().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
index 6f41f919b65ac..2aa066885f7f2 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.cs b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.cs
index 1d4c283ab34f5..8a050dff9c8b8 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.cs
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.cs
@@ -3,10 +3,12 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-class BindHandleNull
+public class BindHandleNull
 {
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         return (new BindHandleNull().RunTest());
     }
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
index b76ee45c7d68b..f47c695865c73 100644
--- a/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->
     <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
diff --git a/src/tests/baseservices/threading/threadpool/unregister/regression_749068.cs b/src/tests/baseservices/threading/threadpool/unregister/regression_749068.cs
index eb5f7b6556f6b..54f7060737e1c 100644
--- a/src/tests/baseservices/threading/threadpool/unregister/regression_749068.cs
+++ b/src/tests/baseservices/threading/threadpool/unregister/regression_749068.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading;
+using Xunit;
 
 /************************
  * Regression test for bug Bug 749068:WatsonCrash: coreclr.dll!Thread::DoAppropriateWaitWorker -- APPLICATION_HANG_BlockedOn_EventHandle c0000194
@@ -88,9 +89,10 @@ public void unregister()
         }
     }
 
-    class Program
+    public class Program
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             Callback obj = new Callback();
 
diff --git a/src/tests/baseservices/threading/threadpool/unregister/regression_749068.csproj b/src/tests/baseservices/threading/threadpool/unregister/regression_749068.csproj
index f639a63d1e023..b831c8534d4d6 100644
--- a/src/tests/baseservices/threading/threadpool/unregister/regression_749068.csproj
+++ b/src/tests/baseservices/threading/threadpool/unregister/regression_749068.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic01.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic01.csproj
index 8d462f6f6182b..c9d90e5f0f933 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic01.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic01.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic02.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic02.csproj
index e8f1bb73b14e7..8a21ed855b1c5 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic02.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic02.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic03.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic03.csproj
index a47c73cca9686..f0609a0f334cd 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic03.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic03.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic05.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic05.csproj
index df59233b08967..4ec77f7e97b58 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic05.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic05.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/ThreadStatic06.csproj b/src/tests/baseservices/threading/threadstatic/ThreadStatic06.csproj
index f49099a7cc48e..cab75580cc4f0 100644
--- a/src/tests/baseservices/threading/threadstatic/ThreadStatic06.csproj
+++ b/src/tests/baseservices/threading/threadstatic/ThreadStatic06.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic01.cs b/src/tests/baseservices/threading/threadstatic/threadstatic01.cs
index f663c21c782a3..478fe4e2acba4 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic01.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic01.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class Value0
 {
@@ -767,7 +768,8 @@ public class Test_threadstatic01
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic01 staticsTest = new Test_threadstatic01();
         staticsTest.RunTest();
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic02.cs b/src/tests/baseservices/threading/threadstatic/threadstatic02.cs
index 184d58c002c7d..dfe1f31ef9851 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic02.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic02.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class MyData
 {
@@ -46,7 +47,8 @@ public class Test_threadstatic02
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic02 staticsTest = new Test_threadstatic02();        
         staticsTest.RunTest();        
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic03.cs b/src/tests/baseservices/threading/threadstatic/threadstatic03.cs
index f6d31afa9c5d0..4d49e4d38d808 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic03.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic03.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class MyData
 {
@@ -41,7 +42,8 @@ public class Test_threadstatic03
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic03 staticsTest = new Test_threadstatic03();        
         staticsTest.RunTest();
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic05.cs b/src/tests/baseservices/threading/threadstatic/threadstatic05.cs
index 4d161f51e5a2d..063b4c215e09e 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic05.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic05.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class MyData
 {
@@ -41,7 +42,8 @@ public class Test_threadstatic05
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic05 staticsTest = new Test_threadstatic05();        
         staticsTest.RunTest();        
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic06.cs b/src/tests/baseservices/threading/threadstatic/threadstatic06.cs
index ecabcc6771bc1..1b86ab2b4c969 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic06.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic06.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
 public class MyData
 {
@@ -36,7 +37,8 @@ public class Test_threadstatic06
 
     private int retVal = 0;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         Test_threadstatic06 staticsTest = new Test_threadstatic06();        
         staticsTest.RunTest();
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic07.cs b/src/tests/baseservices/threading/threadstatic/threadstatic07.cs
index b366fa2f90a4c..bbc741a213ed8 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic07.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic07.cs
@@ -5,6 +5,7 @@
 using System;
 using System.IO;
 using System.Threading;
+using Xunit;
 
 // Test Description:
 // Just basic heavy reading and writing from ThreadStatic members in normal threads and threadpools threads as well.
@@ -46,7 +47,8 @@ public class Sensor
 	[ThreadStatic]
 	static String SSS = "Olden Polynice";
 
-	public static int Main()
+	[Fact]
+	public static int TestEntryPoint()
 	{
 		Console.WriteLine("Hello NBA Fans!!");
 		Console.WriteLine("ThreadStatic test 2: Various reading and writing of Threadstatic variables.");
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic07.csproj b/src/tests/baseservices/threading/threadstatic/threadstatic07.csproj
index 0414055aad760..1e33078e28ec0 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic07.csproj
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic07.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic08.cs b/src/tests/baseservices/threading/threadstatic/threadstatic08.cs
index 6c5da659f15f5..074fa9b13633f 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic08.cs
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic08.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Threading;
+using Xunit;
 
 public struct Struct
 {
@@ -15,7 +16,8 @@ public class Program
     [ThreadStatic]
     private static Struct TSStruct;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         if(TSStruct.a != 0 || TSStruct.b != 0)
             return 101;
diff --git a/src/tests/baseservices/threading/threadstatic/threadstatic08.csproj b/src/tests/baseservices/threading/threadstatic/threadstatic08.csproj
index 551495b9a6fda..8af1838da9ded 100644
--- a/src/tests/baseservices/threading/threadstatic/threadstatic08.csproj
+++ b/src/tests/baseservices/threading/threadstatic/threadstatic08.csproj
@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="threadstatic08.cs" />
   </ItemGroup>