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/XUnitWrapperGenerator.cs   |  5 +++++
 src/tests/Loader/classloader/Casting/punning.cs      | 20 ++++++++++----------
 .../threading/DeadThreads/DeadThreads.cs             |  4 +++-
 .../threading/DeadThreads/DeadThreads.csproj         |  3 ++-
 .../baseservices/threading/Directory.Build.props     | 11 +++++++++++
 .../commitstackonlyasneeded/DefaultStackCommit.cs    |  6 ++++--
 .../DefaultStackCommit.csproj                        |  3 ++-
 .../threading/coverage/Nullref/CS_ARENullRefEx.cs    |  4 +++-
 .../coverage/Nullref/CS_ARENullRefEx.csproj          |  1 -
 .../threading/coverage/Nullref/CS_MRENullRefEx.cs    |  4 +++-
 .../coverage/Nullref/CS_MRENullRefEx.csproj          |  1 -
 .../threading/coverage/Nullref/CS_MutexNullRefEx.cs  |  4 +++-
 .../coverage/Nullref/CS_MutexNullRefEx.csproj        |  1 -
 .../threading/coverage/Nullref/CS_RWHNullRefEx.cs    |  4 +++-
 .../coverage/Nullref/CS_RWHNullRefEx.csproj          |  1 -
 .../threading/coverage/Nullref/CS_SLENullRefEx.cs    |  4 +++-
 .../coverage/Nullref/CS_SLENullRefEx.csproj          |  1 -
 .../threading/coverage/Nullref/CS_TSNullRefEx.cs     |  4 +++-
 .../threading/coverage/Nullref/CS_TSNullRefEx.csproj |  1 -
 .../threading/coverage/Nullref/CS_TimerNullRefEx.cs  |  4 +++-
 .../coverage/Nullref/CS_TimerNullRefEx.csproj        |  1 -
 .../threading/coverage/Nullref/CS_WHNullRefEx.cs     |  4 +++-
 .../threading/coverage/Nullref/CS_WHNullRefEx.csproj |  1 -
 .../threading/coverage/OSThreadId/OSThreadId.cs      |  4 +++-
 .../threading/coverage/OSThreadId/osthreadid.csproj  |  1 -
 .../threading/delegate/BeginInvokeEndInvoke.cs       |  6 ++++--
 .../threading/delegate/BeginInvokeEndInvoke.csproj   |  1 -
 .../threading/generics/Monitor/EnterExit01.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit01.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit02.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit02.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit03.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit03.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit04.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit04.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit05.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit05.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit06.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit06.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit07.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit07.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit08.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit08.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit09.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit09.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit10.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit10.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit11.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit11.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit12.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit12.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit13.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit13.csproj    |  1 -
 .../threading/generics/Monitor/EnterExit14.cs        |  4 +++-
 .../threading/generics/Monitor/EnterExit14.csproj    |  1 -
 .../threading/generics/Monitor/TryEnter01.cs         |  4 +++-
 .../threading/generics/Monitor/TryEnter01.csproj     |  1 -
 .../threading/generics/Monitor/TryEnter03.cs         |  4 +++-
 .../threading/generics/Monitor/TryEnter03.csproj     |  1 -
 .../threading/generics/Monitor/TryEnter04.cs         |  4 +++-
 .../threading/generics/Monitor/TryEnter04.csproj     |  1 -
 .../threading/generics/Monitor/TryEnter05.cs         |  4 +++-
 .../threading/generics/Monitor/TryEnter05.csproj     |  1 -
 .../threading/generics/Monitor/TryEnter06.cs         |  4 +++-
 .../threading/generics/Monitor/TryEnter06.csproj     |  1 -
 .../threading/generics/TimerCallback/thread01.cs     |  4 +++-
 ...thread01.csproj => thread01_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread02.cs     |  4 +++-
 .../thread02_TimerCallback.csproj}                   |  1 -
 .../threading/generics/TimerCallback/thread03.cs     |  4 +++-
 .../thread03_TimerCallback.csproj}                   |  1 -
 .../threading/generics/TimerCallback/thread04.cs     |  4 +++-
 .../thread04_TimerCallback.csproj}                   |  1 -
 .../threading/generics/TimerCallback/thread05.cs     |  4 +++-
 ...thread05.csproj => thread05_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread06.cs     |  4 +++-
 ...thread06.csproj => thread06_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread07.cs     |  4 +++-
 ...thread07.csproj => thread07_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread08.cs     |  4 +++-
 ...thread08.csproj => thread08_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread09.cs     |  4 +++-
 ...thread09.csproj => thread09_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread10.cs     |  4 +++-
 ...thread10.csproj => thread10_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread11.cs     |  4 +++-
 ...thread11.csproj => thread11_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread12.cs     |  4 +++-
 ...thread12.csproj => thread12_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread13.cs     |  4 +++-
 ...thread13.csproj => thread13_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread14.cs     |  4 +++-
 ...thread14.csproj => thread14_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread15.cs     |  4 +++-
 ...thread15.csproj => thread15_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread16.cs     |  4 +++-
 ...thread16.csproj => thread16_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread17.cs     |  4 +++-
 ...thread17.csproj => thread17_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread18.cs     |  4 +++-
 ...thread18.csproj => thread18_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread19.cs     |  4 +++-
 ...thread19.csproj => thread19_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread20.cs     |  4 +++-
 ...thread20.csproj => thread20_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread21.cs     |  4 +++-
 ...thread21.csproj => thread21_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread22.cs     |  4 +++-
 ...thread22.csproj => thread22_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread23.cs     |  4 +++-
 ...thread23.csproj => thread23_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread24.cs     |  4 +++-
 ...thread24.csproj => thread24_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread25.cs     |  4 +++-
 ...thread25.csproj => thread25_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread26.cs     |  4 +++-
 ...thread26.csproj => thread26_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread27.cs     |  4 +++-
 ...thread27.csproj => thread27_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread28.cs     |  4 +++-
 ...thread28.csproj => thread28_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread29.cs     |  4 +++-
 ...thread29.csproj => thread29_TimerCallback.csproj} |  1 -
 .../threading/generics/TimerCallback/thread30.cs     |  4 +++-
 ...thread30.csproj => thread30_TimerCallback.csproj} |  1 -
 .../generics/TimerCallback/tighttimercallback.cs     |  4 +++-
 .../generics/TimerCallback/tighttimercallback.csproj |  1 -
 .../threading/generics/WaitCallback/thread01.cs      |  4 +++-
 ...{thread01.csproj => thread01_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread02.cs      |  4 +++-
 .../thread02_WaitCallback.csproj}                    |  1 -
 .../threading/generics/WaitCallback/thread03.cs      |  4 +++-
 .../thread03_WaitCallback.csproj}                    |  1 -
 .../threading/generics/WaitCallback/thread04.cs      |  4 +++-
 .../thread04_WaitCallback.csproj}                    |  1 -
 .../threading/generics/WaitCallback/thread05.cs      |  4 +++-
 ...{thread05.csproj => thread05_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread06.cs      |  4 +++-
 ...{thread06.csproj => thread06_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread07.cs      |  4 +++-
 ...{thread07.csproj => thread07_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread08.cs      |  4 +++-
 ...{thread08.csproj => thread08_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread09.cs      |  4 +++-
 ...{thread09.csproj => thread09_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread10.cs      |  4 +++-
 ...{thread10.csproj => thread10_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread11.cs      |  4 +++-
 ...{thread11.csproj => thread11_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread12.cs      |  4 +++-
 ...{thread12.csproj => thread12_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread13.cs      |  4 +++-
 ...{thread13.csproj => thread13_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread14.cs      |  4 +++-
 ...{thread14.csproj => thread14_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread15.cs      |  4 +++-
 ...{thread15.csproj => thread15_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread16.cs      |  4 +++-
 ...{thread16.csproj => thread16_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread17.cs      |  4 +++-
 ...{thread17.csproj => thread17_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread18.cs      |  4 +++-
 ...{thread18.csproj => thread18_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread19.cs      |  4 +++-
 ...{thread19.csproj => thread19_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread20.cs      |  4 +++-
 ...{thread20.csproj => thread20_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread21.cs      |  4 +++-
 ...{thread21.csproj => thread21_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread22.cs      |  4 +++-
 ...{thread22.csproj => thread22_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread23.cs      |  4 +++-
 ...{thread23.csproj => thread23_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread24.cs      |  4 +++-
 ...{thread24.csproj => thread24_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread25.cs      |  4 +++-
 ...{thread25.csproj => thread25_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread26.cs      |  4 +++-
 ...{thread26.csproj => thread26_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread27.cs      |  4 +++-
 ...{thread27.csproj => thread27_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread28.cs      |  4 +++-
 ...{thread28.csproj => thread28_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread29.cs      |  4 +++-
 ...{thread29.csproj => thread29_WaitCallback.csproj} |  1 -
 .../threading/generics/WaitCallback/thread30.cs      |  4 +++-
 ...{thread30.csproj => thread30_WaitCallback.csproj} |  1 -
 ...Thread01.csproj => GThread01_syncdelegate.csproj} |  1 -
 ...Thread02.csproj => GThread02_syncdelegate.csproj} |  1 -
 .../GThread03_syncdelegate.csproj}                   |  1 -
 .../GThread04_syncdelegate.csproj}                   |  1 -
 ...Thread05.csproj => GThread05_syncdelegate.csproj} |  1 -
 ...Thread06.csproj => GThread06_syncdelegate.csproj} |  1 -
 ...Thread07.csproj => GThread07_syncdelegate.csproj} |  1 -
 ...Thread08.csproj => GThread08_syncdelegate.csproj} |  1 -
 ...Thread09.csproj => GThread09_syncdelegate.csproj} |  1 -
 ...Thread10.csproj => GThread10_syncdelegate.csproj} |  1 -
 ...Thread11.csproj => GThread11_syncdelegate.csproj} |  1 -
 ...Thread12.csproj => GThread12_syncdelegate.csproj} |  1 -
 ...Thread13.csproj => GThread13_syncdelegate.csproj} |  1 -
 ...Thread14.csproj => GThread14_syncdelegate.csproj} |  1 -
 ...Thread15.csproj => GThread15_syncdelegate.csproj} |  1 -
 ...Thread16.csproj => GThread16_syncdelegate.csproj} |  1 -
 ...Thread17.csproj => GThread17_syncdelegate.csproj} |  1 -
 ...Thread18.csproj => GThread18_syncdelegate.csproj} |  1 -
 ...Thread19.csproj => GThread19_syncdelegate.csproj} |  1 -
 ...Thread20.csproj => GThread20_syncdelegate.csproj} |  1 -
 ...Thread21.csproj => GThread21_syncdelegate.csproj} |  1 -
 ...Thread22.csproj => GThread22_syncdelegate.csproj} |  1 -
 ...Thread23.csproj => GThread23_syncdelegate.csproj} |  1 -
 ...Thread24.csproj => GThread24_syncdelegate.csproj} |  1 -
 ...Thread25.csproj => GThread25_syncdelegate.csproj} |  1 -
 ...Thread26.csproj => GThread26_syncdelegate.csproj} |  1 -
 ...Thread27.csproj => GThread27_syncdelegate.csproj} |  1 -
 ...Thread28.csproj => GThread28_syncdelegate.csproj} |  1 -
 ...Thread29.csproj => GThread29_syncdelegate.csproj} |  1 -
 ...Thread30.csproj => GThread30_syncdelegate.csproj} |  1 -
 .../threading/generics/syncdelegate/thread01.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread02.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread03.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread04.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread05.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread06.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread07.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread08.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread09.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread10.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread11.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread12.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread13.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread14.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread15.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread16.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread17.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread18.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread19.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread20.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread21.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread22.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread23.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread24.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread25.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread26.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread27.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread28.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread29.cs      |  4 +++-
 .../threading/generics/syncdelegate/thread30.cs      |  4 +++-
 ...GThread01.csproj => GThread01_threadstart.csproj} |  1 -
 ...GThread02.csproj => GThread02_threadstart.csproj} |  1 -
 ...GThread03.csproj => GThread03_threadstart.csproj} |  1 -
 .../GThread04_threadstart.csproj}                    |  1 -
 ...GThread05.csproj => GThread05_threadstart.csproj} |  1 -
 ...GThread06.csproj => GThread06_threadstart.csproj} |  1 -
 ...GThread07.csproj => GThread07_threadstart.csproj} |  1 -
 ...GThread08.csproj => GThread08_threadstart.csproj} |  1 -
 ...GThread09.csproj => GThread09_threadstart.csproj} |  1 -
 ...GThread10.csproj => GThread10_threadstart.csproj} |  1 -
 ...GThread11.csproj => GThread11_threadstart.csproj} |  1 -
 ...GThread12.csproj => GThread12_threadstart.csproj} |  1 -
 ...GThread13.csproj => GThread13_threadstart.csproj} |  1 -
 ...GThread14.csproj => GThread14_threadstart.csproj} |  1 -
 ...GThread15.csproj => GThread15_threadstart.csproj} |  1 -
 ...GThread16.csproj => GThread16_threadstart.csproj} |  1 -
 ...GThread17.csproj => GThread17_threadstart.csproj} |  1 -
 ...GThread18.csproj => GThread18_threadstart.csproj} |  1 -
 ...GThread19.csproj => GThread19_threadstart.csproj} |  1 -
 ...GThread20.csproj => GThread20_threadstart.csproj} |  1 -
 ...GThread21.csproj => GThread21_threadstart.csproj} |  1 -
 ...GThread22.csproj => GThread22_threadstart.csproj} |  1 -
 ...GThread23.csproj => GThread23_threadstart.csproj} |  1 -
 ...GThread24.csproj => GThread24_threadstart.csproj} |  1 -
 ...GThread25.csproj => GThread25_threadstart.csproj} |  1 -
 ...GThread26.csproj => GThread26_threadstart.csproj} |  1 -
 ...GThread27.csproj => GThread27_threadstart.csproj} |  1 -
 ...GThread28.csproj => GThread28_threadstart.csproj} |  1 -
 ...GThread29.csproj => GThread29_threadstart.csproj} |  1 -
 ...GThread30.csproj => GThread30_threadstart.csproj} |  1 -
 .../threading/generics/threadstart/thread01.cs       |  4 +++-
 .../threading/generics/threadstart/thread02.cs       |  4 +++-
 .../threading/generics/threadstart/thread03.cs       |  4 +++-
 .../threading/generics/threadstart/thread04.cs       |  4 +++-
 .../threading/generics/threadstart/thread05.cs       |  4 +++-
 .../threading/generics/threadstart/thread06.cs       |  4 +++-
 .../threading/generics/threadstart/thread07.cs       |  4 +++-
 .../threading/generics/threadstart/thread08.cs       |  4 +++-
 .../threading/generics/threadstart/thread09.cs       |  4 +++-
 .../threading/generics/threadstart/thread10.cs       |  4 +++-
 .../threading/generics/threadstart/thread11.cs       |  4 +++-
 .../threading/generics/threadstart/thread12.cs       |  4 +++-
 .../threading/generics/threadstart/thread13.cs       |  4 +++-
 .../threading/generics/threadstart/thread14.cs       |  4 +++-
 .../threading/generics/threadstart/thread15.cs       |  4 +++-
 .../threading/generics/threadstart/thread16.cs       |  4 +++-
 .../threading/generics/threadstart/thread17.cs       |  4 +++-
 .../threading/generics/threadstart/thread18.cs       |  4 +++-
 .../threading/generics/threadstart/thread19.cs       |  4 +++-
 .../threading/generics/threadstart/thread20.cs       |  4 +++-
 .../threading/generics/threadstart/thread21.cs       |  4 +++-
 .../threading/generics/threadstart/thread22.cs       |  4 +++-
 .../threading/generics/threadstart/thread23.cs       |  4 +++-
 .../threading/generics/threadstart/thread24.cs       |  4 +++-
 .../threading/generics/threadstart/thread25.cs       |  4 +++-
 .../threading/generics/threadstart/thread26.cs       |  4 +++-
 .../threading/generics/threadstart/thread27.cs       |  4 +++-
 .../threading/generics/threadstart/thread28.cs       |  4 +++-
 .../threading/generics/threadstart/thread29.cs       |  4 +++-
 .../threading/generics/threadstart/thread30.cs       |  4 +++-
 .../threading/regressions/13662/13662-a.cs           |  4 +++-
 .../threading/regressions/13662/13662-a.csproj       |  3 ++-
 .../threading/regressions/13662/13662-b.cs           |  4 +++-
 .../threading/regressions/13662/13662-b.csproj       |  3 ++-
 .../threading/regressions/13662/13662-simple.csproj  |  3 ++-
 .../threading/regressions/13662/simple.cs            |  4 +++-
 .../regressions/2164/foreground-shutdown.cs          |  4 +++-
 .../regressions/2164/foreground-shutdown.csproj      |  3 ++-
 .../threading/regressions/269336/objmonhelper.cs     |  6 ++++--
 .../threading/regressions/269336/objmonhelper.csproj |  3 ++-
 .../threading/regressions/30032/30032.cs             |  4 +++-
 .../threading/regressions/30032/30032.csproj         |  1 -
 .../threading/regressions/576463/576463.cs           | 11 ++++++++---
 .../threading/regressions/576463/576463.csproj       |  3 ++-
 .../threading/regressions/6906/6906.csproj           |  1 -
 .../baseservices/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 ++-
 .../threading/regressions/devdiv489437/test489437.cs |  6 ++++--
 .../regressions/devdiv489437/test489437.csproj       |  1 -
 .../threading/regressions/whidbey_m3/200176.cs       |  4 +++-
 .../threading/regressions/whidbey_m3/200176.csproj   |  3 ++-
 .../baseservices/threading/threading_group1.csproj   | 16 ++++++++++++++++
 .../baseservices/threading/threading_group2.csproj   | 17 +++++++++++++++++
 .../threading/threadpool/bindhandle/bindhandle1.cs   |  6 ++++--
 .../threadpool/bindhandle/bindhandle1.csproj         |  3 ++-
 .../threadpool/bindhandle/bindhandleinvalid.cs       |  6 ++++--
 .../threadpool/bindhandle/bindhandleinvalid.csproj   |  3 ++-
 .../threadpool/bindhandle/bindhandleinvalid3.cs      |  6 ++++--
 .../threadpool/bindhandle/bindhandleinvalid3.csproj  |  3 ++-
 .../threadpool/bindhandle/bindhandleinvalid4.cs      |  6 ++++--
 .../threadpool/bindhandle/bindhandleinvalid4.csproj  |  3 ++-
 .../threadpool/bindhandle/bindhandleinvalid5.cs      |  6 ++++--
 .../threadpool/bindhandle/bindhandleinvalid5.csproj  |  3 ++-
 .../threadpool/bindhandle/bindhandleinvalid6.cs      |  6 ++++--
 .../threadpool/bindhandle/bindhandleinvalid6.csproj  |  3 ++-
 .../threadpool/bindhandle/bindhandlenull.cs          |  6 ++++--
 .../threadpool/bindhandle/bindhandlenull.csproj      |  3 ++-
 .../threadpool/unregister/regression_749068.cs       |  6 ++++--
 .../threadpool/unregister/regression_749068.csproj   |  1 -
 .../threading/threadstatic/ThreadStatic01.csproj     |  1 -
 .../threading/threadstatic/ThreadStatic02.csproj     |  1 -
 .../threading/threadstatic/ThreadStatic03.csproj     |  1 -
 .../threading/threadstatic/ThreadStatic05.csproj     |  1 -
 .../threading/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 +++-
 .../threading/threadstatic/threadstatic07.csproj     |  1 -
 .../threading/threadstatic/threadstatic08.cs         |  4 +++-
 .../threading/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 816b567..ae1d12d 100644
--- a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
+++ b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
@@ -305,10 +305,15 @@ public sealed class XUnitWrapperGenerator : IIncrementalGenerator
         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 3971a78..01064d2 100644
--- a/src/tests/Loader/classloader/Casting/punning.cs
+++ b/src/tests/Loader/classloader/Casting/punning.cs
@@ -9,7 +9,7 @@ using Xunit;
 partial class Program
 {
     [Fact]
-    static void Via_GetFunctionPointer()
+    internal static void Via_GetFunctionPointer()
     {
         Console.WriteLine($"Running {nameof(Via_GetFunctionPointer)}...");
 
@@ -24,7 +24,7 @@ partial class Program
     }
 
     [Fact]
-    static void Via_GetFunctionPointer_Generics()
+    internal static void Via_GetFunctionPointer_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_GetFunctionPointer_Generics)}...");
 
@@ -39,7 +39,7 @@ partial class Program
     }
 
     [Fact]
-    static void Via_Ldftn()
+    internal static void Via_Ldftn()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn)}...");
 
@@ -54,7 +54,7 @@ partial class Program
     }
 
     [Fact]
-    static void Via_Ldftn_Generics()
+    internal static void Via_Ldftn_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics)}...");
 
@@ -69,7 +69,7 @@ partial class Program
     }
 
     [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 @@ partial class Program
     }
 
     [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 @@ partial class Program
     }
 
     [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 @@ partial class Program
     }
 
     [Fact]
-    static void Via_Ldvirtftn()
+    internal static void Via_Ldvirtftn()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn)}...");
 
@@ -132,7 +132,7 @@ partial class Program
     }
 
     [Fact]
-    static void Via_Ldvirtftn_Generics()
+    internal static void Via_Ldvirtftn_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics)}...");
 
@@ -148,7 +148,7 @@ partial class Program
     }
 
     [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 9a3b9e9..dc3c30f 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 @@ public class DeadThreads
         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 5951072..230a32d 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 0000000..118a645
--- /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 fbd68c3..fe5daee 100644
--- a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
+++ b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
@@ -6,12 +6,14 @@ using System.Linq;
 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 3524984..82f065f 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 f99957d..f078a6f 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 23dca2e..f08305e 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 71a02b3..e187d0c 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 0127599..427ee54 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 678d5e1..8c5dad7 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 df78acb..d6abd3d 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 a715432..8a7365d 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 b9390fb..729e8bd 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 25fd930..f5e7057 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;
 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 740ba2b..0ec4488 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 62c699e..1998075 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 bda0279..090372d 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 46c5f1d..3e6c5d1 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 c200e8c..e08c848 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 e11717e..3cdd7ff 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 4ce8802..d36d906 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 822bf16..540e9d1 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;
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading;
+using Xunit;
 
 namespace Threading.Tests
 {
@@ -12,7 +13,8 @@ namespace Threading.Tests
         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 817c675..63068c8 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 78143a5..621f3de 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 @@ namespace DelegateTest
         }
     }
 
-    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 c2cc2cb..606943b 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 311959e..e88276b 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 class Test_EnterExit01
 		}
 	}
 	
-	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 acfabb3..6f34323 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 261e61f..41d92a2 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 class Test_EnterExit02
 	
 	}
 	
-	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 647cbfe..224b12b 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 3ded903..f538caf 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 class Test_EnterExit03
 	
 	}
 	
-	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 a3d953b..0533d1a 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 dea58d7..f948957 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 class Test_EnterExit04
 	
 	}
 	
-	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 7207cd5..0049ea7 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 f498530..d58350f 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 class Test_EnterExit05
 	
 	}
 	
-	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 9ce8fdf..2b581d6 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 9da0e3a..2e386ae 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 class Test_EnterExit06
 	
 	}
 	
-	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 829499b..7ace62c 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 133ee56..f0dfe97 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 class Test_EnterExit07
 	
 	}
 	
-	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 73e20e2..87095f9 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 5190177..0abe250 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 class Test_EnterExit08
 	
 	}
 	
-	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 1920b4f..04c89f6 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 c551a86..e0a4b8b 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 class Test_EnterExit09
 	
 	}
 	
-	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 b20970d..b2937b2 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 9dbacbc..ca99f66 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 class Test_EnterExit10
 	
 	}
 	
-	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 d918c43..627d3bf 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 9c60099..77fa6d3 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 class Test_EnterExit11
 	
 	}
 	
-	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 ed9cc81..7ecc230 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 6ffbcee..2768677 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 class Test_EnterExit12
 	
 	}
 	
-	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 222d17c..e2bfbec 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 30e249b..d2ec36c 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 class Test_EnterExit13
 	
 	}
 	
-	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 939abd4..93f7eb6 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 9fd7e47..dc2cd3d 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 class Test_EnterExit14
 	
 	}
 	
-	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 85402de..133ea26 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 77c7b4c..68cc238 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 class Test_TryEnter01
 	
 	}
 	
-	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 68727fa..480a89b 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 ee4173c..5adde65 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 class Test_TryEnter03
 	
 	}
 	
-	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 4cbbc02..52b3798 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 5d6ecbd..a8f7a93 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 class Test_TryEnter04
 	
 	}
 	
-	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 55f73e2..b516e43 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 3b7003d..af08ccd 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 class Test_TryEnter05
 	
 	}
 	
-	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 4557dfb..caf7d50 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 2922f74..85b54d9 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 class Test_TryEnter06
 	
 	}
 	
-	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 3c829b3..0358293 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 cdccb8c..0ae15a9 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 class Test_thread01
 	
 	}
 	
-	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 e4f858a..10b6b39 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 5c27e79..f78de58 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 class Test_thread02
 	
 	}
 	
-	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 430250b..23f16bf 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 f51e660..fe09831 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 class Test_thread03
 	
 	}
 	
-	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 d98eb26..b187d37 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 eb3818e..4784adf 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 class Test_thread04
 	
 	}
 	
-	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 453633a..f2096a4 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 c585711..423b29e 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 class Test_thread05
 	
 	}
 	
-	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 c5fee6a..a05d0f9 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 aa289ee..9ae4c19 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 class Test_thread06
 	
 	}
 	
-	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 10eb2b2..cb053f5 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 d87b457..77fb276 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 class Test_thread07
 	
 	}
 	
-	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 450d6df..1f50acc 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 df92b20..c4d9fe2 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 class Test_thread08
 	
 	}
 	
-	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 5f82b86..1d1b003 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 5b47dcb..0a031c2 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 class Test_thread09
 	
 	}
 	
-	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 15757e6..bb56217 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 ed180b2..3fe085b 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 class Test_thread10
 	
 	}
 	
-	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 50c9f8b..7beeeef 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 3af2a7a..3c6bbcb 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 class Test_thread11
 	
 	}
 	
-	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 ba2c41a..8e0e7d5 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 a359021..9becce6 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 class Test_thread12
 	
 	}
 	
-	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 34ad355..49cd594 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 f9df296..729188c 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 class Test_thread13
 	
 	}
 	
-	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 9733eb9..de3ea8b 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 7b8047e..b0dbd4c 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 class Test_thread14
 	
 	}
 	
-	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 64f08c0..f2f3aef 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 9b9bad5..de800f7 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 class Test_thread15
 	
 	}
 	
-	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 046dddf..8e4fd42 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 c47df05..559645f 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 class Test_thread16
 	
 	}
 	
-	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 3153426..b5f0f49 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 a0850a6..e9ca3ea 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 class Test_thread17
 	
 	}
 	
-	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 e96370c..04d2777 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 0e16981..a958a0f 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 class Test_thread18
 	
 	}
 	
-	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 bf32e09..b4ccb87 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 03c148e..de5d8ec 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 class Test_thread19
 	
 	}
 	
-	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 bfd9fc3..d7de30c 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 0e1ad88..4fedb62 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 class Test_thread20
 	
 	}
 	
-	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 78af0fa..d804dc9 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 7b4cd64..ae67c74 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 class Test_thread21
 	
 	}
 	
-	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 a82f9e1..69773fa 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 130d9a3..312bb5a 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 class Test_thread22
 	
 	}
 	
-	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 0fa4c6c..a050afe 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 8275435..12caebd 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 class Test_thread23
 	
 	}
 	
-	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 9590107..2e859a9 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 62edd7f..2875c27 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 class Test_thread24
 	
 	}
 	
-	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 16e4591..382efde 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 85ea674..458964c 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 class Test_thread25
 	
 	}
 	
-	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 3d8dcb8..20ef63e 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 a5741d6..2cd92a2 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 class Test_thread26
 	
 	}
 	
-	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 044a653..05e934b 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 20ea033..5a479c9c 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 class Test_thread27
 	
 	}
 	
-	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 fa0d5d4..7fcfdd5 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 40c2dc5..a851ea4 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 class Test_thread28
 	
 	}
 	
-	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 92d827a..38ccf9f 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 1af5611..ba2ccee 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 class Test_thread29
 	
 	}
 	
-	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 03cd034..f20026f 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 5b88af4..64f694c 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 class Test_thread30
 	
 	}
 	
-	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 4f36d73..5c20d5b 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 5657841..2d7edd2 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 282237c..15d567f 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 c23a74a..d0885c6 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 class Test_thread01
 	
 	}
 	
-	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 e4f858a..10b6b39 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 cfb0f03..2773fb4 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 class Test_thread02
 	
 	}
 	
-	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 430250b..23f16bf 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 bdc0faa..6864b52 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 class Test_thread03
 	
 	}
 	
-	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 d98eb26..b187d37 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 33c0f71..ea669ad 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 class Test_thread04
 	
 	}
 	
-	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 453633a..f2096a4 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 dc8110c..f6ecc93 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 class Test_thread05
 	
 	}
 	
-	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 c5fee6a..a05d0f9 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 1d21f8f..71936de 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 class Test_thread06
 	
 	}
 	
-	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 10eb2b2..cb053f5 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 c26b2ab..0ace693 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 class Test_thread07
 	
 	}
 	
-	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 450d6df..1f50acc 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 d649bce..76cd091 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 class Test_thread08
 	
 	}
 	
-	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 5f82b86..1d1b003 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 07a8a9c..5e414e1 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 class Test_thread09
 	
 	}
 	
-	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 15757e6..bb56217 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 3a42ad0..6924798 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 class Test_thread10
 	
 	}
 	
-	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 50c9f8b..7beeeef 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 5e4e7d5..96b0a04 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 class Test_thread11
 	
 	}
 	
-	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 ba2c41a..8e0e7d5 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 51dfec0..e9a3d7d 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 class Test_thread12
 	
 	}
 	
-	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 34ad355..49cd594 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 a639d0a..d0d9c80 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 class Test_thread13
 	
 	}
 	
-	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 9733eb9..de3ea8b 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 0ac4660..7ed7d37 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 class Test_thread14
 	
 	}
 	
-	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 64f08c0..f2f3aef 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 8ba040b..c2f26ac 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 class Test_thread15
 	
 	}
 	
-	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 046dddf..8e4fd42 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 d10f8a4..0ea0d25 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 class Test_thread16
 	
 	}
 	
-	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 3153426..b5f0f49 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 754c9ff..78be943 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 class Test_thread17
 	
 	}
 	
-	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 e96370c..04d2777 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 882579b..19d6606 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 class Test_thread18
 	
 	}
 	
-	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 bf32e09..b4ccb87 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 42feab5..a7f9c16 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 class Test_thread19
 	
 	}
 	
-	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 bfd9fc3..d7de30c 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 96d5301..e4c7d2d 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 class Test_thread20
 	
 	}
 	
-	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 78af0fa..d804dc9 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 fb3e4d9..e5d5bfd 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 class Test_thread21
 	
 	}
 	
-	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 a82f9e1..69773fa 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 b0e0dd8..57be953 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 class Test_thread22
 	
 	}
 	
-	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 0fa4c6c..a050afe 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 1420d50..f2b26a0 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 class Test_thread23
 	
 	}
 	
-	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 9590107..2e859a9 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 9c73e17..1bd7d9f 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 class Test_thread24
 	
 	}
 	
-	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 16e4591..382efde 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 f1de191..53e9aef 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 class Test_thread25
 	
 	}
 	
-	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 3d8dcb8..20ef63e 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 744fea9..b383e63 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 class Test_thread26
 	
 	}
 	
-	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 044a653..05e934b 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 de80e4b..5d716eb 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 class Test_thread27
 	
 	}
 	
-	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 fa0d5d4..7fcfdd5 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 52d0712..3850bec 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 class Test_thread28
 	
 	}
 	
-	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 92d827a..38ccf9f 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 4b1dccc..c60e3b5 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 class Test_thread29
 	
 	}
 	
-	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 03cd034..f20026f 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 9ec8d7e..a3663bd 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 class Test_thread30
 	
 	}
 	
-	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 4f36d73..5c20d5b 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 e4f858a..10b6b39 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 430250b..23f16bf 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 d98eb26..b187d37 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 453633a..f2096a4 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 c5fee6a..a05d0f9 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 10eb2b2..cb053f5 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 450d6df..1f50acc 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 5f82b86..1d1b003 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 15757e6..bb56217 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 50c9f8b..7beeeef 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 ba2c41a..8e0e7d5 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 34ad355..49cd594 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 9733eb9..de3ea8b 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 64f08c0..f2f3aef 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 046dddf..8e4fd42 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 3153426..b5f0f49 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 e96370c..04d2777 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 bf32e09..b4ccb87 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 bfd9fc3..d7de30c 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 78af0fa..d804dc9 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 a82f9e1..69773fa 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 0fa4c6c..a050afe 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 9590107..2e859a9 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 16e4591..382efde 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 3d8dcb8..20ef63e 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 044a653..05e934b 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 fa0d5d4..7fcfdd5 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 92d827a..38ccf9f 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 03cd034..f20026f 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 4f36d73..5c20d5b 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 371c8ef..179bcef 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 class Test_thread01
 	
 	}
 	
-	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 39951b6..2cc5e78 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 class Test_thread02
 	
 	}
 	
-	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 5775c07..eca17b5 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 class Test_thread03
 	
 	}
 	
-	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 806ed64..8337a6f 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 class Test_thread04
 	
 	}
 	
-	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 8bd7cc0..c8fba0f 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 class Test_thread05
 	
 	}
 	
-	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 be2ae5a..8879ce3 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 class Test_thread06
 	
 	}
 	
-	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 251ef78..d429ffa 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 class Test_thread07
 	
 	}
 	
-	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 150a1c7..e4e17e3 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 class Test_thread08
 	
 	}
 	
-	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 6a1751b..074a8ef 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 class Test_thread09
 	
 	}
 	
-	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 ad4c25c..d4f8da6 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 class Test_thread10
 	
 	}
 	
-	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 114e967..70934a6 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 class Test_thread11
 	
 	}
 	
-	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 276abe6..01cf35b 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 class Test_thread12
 	
 	}
 	
-	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 0d60ace..130198a 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 class Test_thread13
 	
 	}
 	
-	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 5f40616..8d49266 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 class Test_thread14
 	
 	}
 	
-	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 cd499e9..ee644d4 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 class Test_thread15
 	
 	}
 	
-	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 32868ba..4ee8a37 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 class Test_thread16
 	
 	}
 	
-	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 1d1227d..56c3906 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 class Test_thread17
 	
 	}
 	
-	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 2604743..535ea9d 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 class Test_thread18
 	
 	}
 	
-	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 3e4d05c..1fcdef5 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 class Test_thread19
 	
 	}
 	
-	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 bf19e72..f6187ca 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 class Test_thread20
 	
 	}
 	
-	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 c92947e..1a7317d 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 class Test_thread21
 	
 	}
 	
-	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 08923b2..fd0adf2 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 class Test_thread22
 	
 	}
 	
-	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 40bfd136..c022795 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 class Test_thread23
 	
 	}
 	
-	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 e58d0f7..bb8f330 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 class Test_thread24
 	
 	}
 	
-	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 542b9dd..ae007e1 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 class Test_thread25
 	
 	}
 	
-	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 e2b1427..ba16b63 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 class Test_thread26
 	
 	}
 	
-	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 832186b..378127f 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 class Test_thread27
 	
 	}
 	
-	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 7b4b987..98424a7 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 class Test_thread28
 	
 	}
 	
-	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 acee10d..7094afb 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 class Test_thread29
 	
 	}
 	
-	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 6bcc91d..471be15 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 class Test_thread30
 	
 	}
 	
-	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 e4f858a..10b6b39 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 430250b..23f16bf 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 d98eb26..b187d37 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 453633a..f2096a4 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 c5fee6a..a05d0f9 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 10eb2b2..cb053f5 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 450d6df..1f50acc 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 5f82b86..1d1b003 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 15757e6..bb56217 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 50c9f8b..7beeeef 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 ba2c41a..8e0e7d5 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 34ad355..49cd594 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 9733eb9..de3ea8b 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 64f08c0..f2f3aef 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 046dddf..8e4fd42 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 3153426..b5f0f49 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 e96370c..04d2777 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 bf32e09..b4ccb87 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 bfd9fc3..d7de30c 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 78af0fa..d804dc9 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 a82f9e1..69773fa 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 0fa4c6c..a050afe 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 9590107..2e859a9 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 16e4591..382efde 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 3d8dcb8..20ef63e 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 044a653..05e934b 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 fa0d5d4..7fcfdd5 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 92d827a..38ccf9f 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 03cd034..f20026f 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 4f36d73..5c20d5b 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 4d7a867..cbf1b63 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 class Test_thread01
 	
 	}
 	
-	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 488f736..201c7a8 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 class Test_thread02
 	
 	}
 	
-	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 f9b1038..c29cd49 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 class Test_thread03
 	
 	}
 	
-	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 4c710dc..e05e3a5 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 class Test_thread04
 	
 	}
 	
-	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 57a2820..9e93990 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 class Test_thread05
 	
 	}
 	
-	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 b2e593c..38cba89 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 class Test_thread06
 	
 	}
 	
-	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 9097b6c..c1c6421 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 class Test_thread07
 	
 	}
 	
-	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 232b1ba..36ca9fbe 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 class Test_thread08
 	
 	}
 	
-	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 9b71df6..b1f9e3c 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 class Test_thread09
 	
 	}
 	
-	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 c101ad9..ef87b81 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 class Test_thread10
 	
 	}
 	
-	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 5200ea5..4fb3d55 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 class Test_thread11
 	
 	}
 	
-	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 5d5865c..ea88a36 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 class Test_thread12
 	
 	}
 	
-	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 dd7c2c4..e53d18a 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 class Test_thread13
 	
 	}
 	
-	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 cb3259a..e015e5e 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 class Test_thread14
 	
 	}
 	
-	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 f683392..456bb7f 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 class Test_thread15
 	
 	}
 	
-	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 8e6f93f8..bfcb942 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 class Test_thread16
 	
 	}
 	
-	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 42bf6b6..493cc2b 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 class Test_thread17
 	
 	}
 	
-	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 d92ac92..149b461 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 class Test_thread18
 	
 	}
 	
-	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 131ff18..5922497 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 class Test_thread19
 	
 	}
 	
-	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 a461eaf..9936a3c 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 class Test_thread20
 	
 	}
 	
-	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 2ced39d..a6f4b97 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 class Test_thread21
 	
 	}
 	
-	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 c66066d..00b4ecd 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 class Test_thread22
 	
 	}
 	
-	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 173f842..f880ed4 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 class Test_thread23
 	
 	}
 	
-	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 e5c9f61..a14d243 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 class Test_thread24
 	
 	}
 	
-	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 96c1843..d180917 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 class Test_thread25
 	
 	}
 	
-	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 268fe6b..5b41ecd 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 class Test_thread26
 	
 	}
 	
-	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 be320cd..c294a11 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 class Test_thread27
 	
 	}
 	
-	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 3e06325..bcffc2e 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 class Test_thread28
 	
 	}
 	
-	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 784c989..6c367ce 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 class Test_thread29
 	
 	}
 	
-	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 65a1c07..c4380a9 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 class Test_thread30
 	
 	}
 	
-	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 5cd7b9f..c6a93c6 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 bef0738..4c1fe32 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 4cbb993..9f0ced2 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 b96e491..ec5587a 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 e172ab2..9cbd449 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 5b342ea..463c8ef 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 3e1670d..2352f20 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;
 using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Threading;
+using Xunit;
 
 /*
  * Issue description:
@@ -14,7 +15,8 @@ using System.Threading;
 
 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 b217844..6adb4a4 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 51989ae..ed5f97e 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 9f562d8..304a800 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 8c72b4a..ebd4c85 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 20447c6..1e74cf1 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 2bcb36a..bbf8222 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 @@ class Test
     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 239163d..af99318 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 469daad..62e4cdd 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 b077fba..f740bd0 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 74bb5b6..165a13f 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 c351bcc..bc9be00 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 c279bff..09c7ffd 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 716b572..493f8de 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 98abd96..daaaac7 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 8c1c050..11e4aec 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 7f9b83d..3434de6 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 @@ Change description:
   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 dda86d3..7500eca 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 0ee848e..44030bf 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 6ee702a..02279f3 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 0000000..a099f2d
--- /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 0000000..bb54688
--- /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 0f28d3a..35b81d3 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.Threading;
 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 f799530..3eb68cc 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 65866a6..aabbaf7 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 e58a53f..5e8bb1c 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 5015773..120ea64 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.Threading;
 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 949f202..766f769 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 953efb5..6aaede0 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.Threading;
 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 bd85b46..6229100 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 b67a37f..59d9ce9 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.Threading;
 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 751974a..f372f74 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 49ce255..5a8000d 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.Threading;
 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 6f41f91..2aa0668 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 1d4c283..8a050df 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 b76ee45..f47c695 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 eb5f7b6..54f7060 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.Linq;
 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 @@ namespace Prog
         }
     }
 
-    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 f639a63..b831c85 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 8d462f6..c9d90e5 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 e8f1bb7..8a21ed8 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 a47c73c..f0609a0 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 df59233..4ec77f7 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 f49099a..cab7558 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 f663c21..478fe4e 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 184d58c..dfe1f31 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 f6d31af..4d49e4d 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 4d161f5..063b4c2 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 ecabcc6..1b86ab2 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 b366fa2..bbc741a 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 0414055..1e33078 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 6c5da65..074fa9b 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 551495b..8af1838 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>
-- 
2.7.4