From 97c211cb9d9aa1c53d9cdda83e19de1f9df58ef9 Mon Sep 17 00:00:00 2001
From: Egor Chesakov <Egor.Chesakov@microsoft.com>
Date: Thu, 14 Feb 2019 17:26:18 -0800
Subject: [PATCH] Remove unnecessary ProjectReferences to CoreCLRTestLibrary
 (dotnet/coreclr#22539)

Remove the ProjectReferences to CoreCLRTestLibrary.csproj in the project files where CoreCLRTestLibrary is not actually being used.

Each ProjectReference item is ended up in PrepareProjectReferences target that creates unnecessary items.

Commit migrated from https://github.com/dotnet/coreclr/commit/7fa6f45c29eb9f602a70ca0106014591e191dc55
---
 .../compilerservices/dynamicobjectproperties/Dev10_535767.csproj      | 3 ---
 .../compilerservices/dynamicobjectproperties/TestAPIs.csproj          | 3 ---
 .../compilerservices/dynamicobjectproperties/TestGC.csproj            | 3 ---
 .../compilerservices/dynamicobjectproperties/TestOverrides.csproj     | 3 ---
 .../compilerservices/dynamicobjectproperties/test448035.csproj        | 3 ---
 .../exceptions/AccessViolationException/AVException01.csproj          | 3 ---
 .../exceptions/AccessViolationException/AVException02.csproj          | 3 ---
 .../exceptions/AccessViolationException/AVException03.csproj          | 3 ---
 .../exceptions/StackTracePreserve/StackTracePreserveTests.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions.csproj     | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions01.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions02.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions03.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions04.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions05.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions06.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions07.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/GenericExceptions08.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter001.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter002.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter003.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter004.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter005.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter006.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter007.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter008.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter009.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter010.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter011.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter012.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter013.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter014.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter015.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter016.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter017.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/TypeParameter018.csproj      | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch01.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch02.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch03.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch04.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch05.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch06.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch07.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch08.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch09.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/nested-try-catch10.csproj    | 3 ---
 .../exceptions/generics/try-catch-finally-struct01.csproj             | 3 ---
 .../exceptions/generics/try-catch-finally-struct02.csproj             | 3 ---
 .../exceptions/generics/try-catch-finally-struct03.csproj             | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-finally01.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-finally02.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-finally03.csproj   | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct01.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct02.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct03.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct04.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct05.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct06.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct07.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct08.csproj    | 3 ---
 .../src/baseservices/exceptions/generics/try-catch-struct09.csproj    | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch01.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch02.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch03.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch04.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch05.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch06.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch07.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch08.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-catch09.csproj     | 3 ---
 .../src/baseservices/exceptions/generics/try-finally-struct01.csproj  | 3 ---
 .../src/baseservices/exceptions/generics/try-finally-struct02.csproj  | 3 ---
 .../src/baseservices/exceptions/generics/try-finally-struct03.csproj  | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-finally01.csproj   | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-finally02.csproj   | 3 ---
 .../tests/src/baseservices/exceptions/generics/try-finally03.csproj   | 3 ---
 .../exceptions/regressions/Dev11/147911/test147911.csproj             | 3 ---
 .../exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj  | 3 ---
 .../baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj    | 3 ---
 .../baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj    | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/ExternalException.csproj         | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/HandlerException.csproj          | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/MultipleException.csproj         | 3 ---
 .../baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj    | 3 ---
 .../baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj    | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/NestedException.csproj           | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/NormalException.csproj           | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj        | 3 ---
 .../src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj           | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj        | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/UserException.csproj             | 3 ---
 .../exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj       | 3 ---
 .../exceptions/regressions/V1/SEH/coverage/Exceptions.csproj          | 3 ---
 .../tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj   | 3 ---
 .../src/baseservices/exceptions/regressions/v4.0/640474/other.csproj  | 3 ---
 .../baseservices/exceptions/regressions/v4.0/640474/test640474.csproj | 1 -
 .../src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj | 3 ---
 .../exceptions/regressions/whidbeybeta2/349379/349379.csproj          | 3 ---
 .../exceptions/regressions/whidbeybeta2/366085/366085.csproj          | 3 ---
 .../exceptions/regressions/whidbeym3.3/106011/106011.csproj           | 3 ---
 .../exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj     | 3 ---
 .../exceptions/regressions/whidbeym3.3/302680/data.csproj             | 3 ---
 .../exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj | 3 ---
 src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj | 4 ++--
 .../tests/src/baseservices/exceptions/simple/HardwareEh.csproj        | 2 +-
 src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj   | 2 +-
 .../tests/src/baseservices/exceptions/unittests/Baadbaad.csproj       | 3 ---
 .../tests/src/baseservices/exceptions/unittests/BaseClass.csproj      | 3 ---
 .../tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj | 3 ---
 .../tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj | 3 ---
 .../src/baseservices/exceptions/unittests/GoryManagedPresent.csproj   | 3 ---
 .../tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj | 3 ---
 .../tests/src/baseservices/exceptions/unittests/InnerFinally.csproj   | 3 ---
 .../src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj | 3 ---
 .../tests/src/baseservices/exceptions/unittests/Pending.csproj        | 3 ---
 .../tests/src/baseservices/exceptions/unittests/Recurse.csproj        | 3 ---
 .../src/baseservices/exceptions/unittests/RecursiveRethrow.csproj     | 3 ---
 .../src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj    | 3 ---
 .../src/baseservices/exceptions/unittests/RethrowAndFinally.csproj    | 3 ---
 .../src/baseservices/exceptions/unittests/ReturnFromCatch.csproj      | 3 ---
 .../src/baseservices/exceptions/unittests/StrSwitchFinally.csproj     | 3 ---
 .../tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj   | 3 ---
 .../tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj | 3 ---
 .../exceptions/unittests/ThrowInFinallyNestedInTry.csproj             | 3 ---
 .../src/baseservices/exceptions/unittests/TryCatchInFinally.csproj    | 3 ---
 src/coreclr/tests/src/baseservices/exceptions/unittests/trace.cs      | 1 -
 src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj      | 3 ---
 .../tests/src/baseservices/finalization/FinalizerSigned.csproj        | 3 ---
 .../src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj     | 3 ---
 .../ilasm_ildasm/regression/vswhidbey267905/267905.csproj             | 3 ---
 .../ilasm_ildasm/regression/vswhidbey305155/305155.csproj             | 3 ---
 .../ilasm_ildasm/regression/vswhidbey395914/395914.csproj             | 3 ---
 src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj         | 2 +-
 .../threading/currentculture/CultureChangeSecurity.csproj             | 3 ---
 .../threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj  | 3 ---
 .../threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj  | 3 ---
 .../threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj  | 3 ---
 .../threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj  | 3 ---
 .../events/EventWaitHandle/ManualReset/ManualResetCast1.csproj        | 3 ---
 .../events/EventWaitHandle/ManualReset/ManualResetCast2.csproj        | 3 ---
 .../events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj        | 3 ---
 .../events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj        | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread01.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread02.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread03.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread04.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread05.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread06.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread07.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread08.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread09.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread10.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread11.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread12.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread13.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread14.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread15.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread16.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread17.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread18.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread19.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread20.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread21.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread22.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread23.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread24.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread25.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread26.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread27.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread28.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread29.csproj | 3 ---
 .../src/baseservices/threading/generics/syncdelegate/GThread30.csproj | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread01.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread02.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread03.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread04.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread05.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread06.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread07.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread08.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread09.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread10.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread11.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread12.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread13.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread14.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread15.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread16.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread17.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread18.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread19.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread20.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread21.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread22.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread23.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread24.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread25.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread26.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread27.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread28.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread29.csproj  | 3 ---
 .../src/baseservices/threading/generics/threadstart/GThread30.csproj  | 3 ---
 .../src/baseservices/threading/interlocked/add/CheckAddInt.csproj     | 3 ---
 .../src/baseservices/threading/interlocked/add/CheckAddLong.csproj    | 3 ---
 .../baseservices/threading/interlocked/add/InterlockedAddInt.csproj   | 3 ---
 .../baseservices/threading/interlocked/add/InterlockedAddLong.csproj  | 3 ---
 .../threading/interlocked/add/InterlockedAddLongWithSubtract.csproj   | 3 ---
 .../threading/interlocked/compareexchange/CompareExchangeLong.csproj  | 3 ---
 .../interlocked/compareexchange/CompareExchangeTClass.csproj          | 3 ---
 .../interlocked/compareexchange/CompareExchangeTString.csproj         | 3 ---
 .../baseservices/threading/interlocked/exchange/ExchangeInt.csproj    | 3 ---
 .../baseservices/threading/interlocked/exchange/ExchangeLong.csproj   | 3 ---
 .../baseservices/threading/interlocked/exchange/ExchangeTClass.csproj | 3 ---
 .../threading/interlocked/exchange/ExchangeTString.csproj             | 3 ---
 .../tests/src/baseservices/threading/monitor/enter/EnterNull.csproj   | 3 ---
 .../tests/src/baseservices/threading/monitor/exit/ExitNull.csproj     | 3 ---
 .../tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj   | 3 ---
 .../src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj   | 3 ---
 .../baseservices/threading/monitor/unownedlock/EnterExitExit.csproj   | 3 ---
 .../threading/monitor/unownedlock/NoEnterNewObject.csproj             | 3 ---
 .../baseservices/threading/monitor/unownedlock/NoEnterObject.csproj   | 3 ---
 .../baseservices/threading/monitor/unownedlock/NoEnterValType.csproj  | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartBool.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartByte.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartCast.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartChar.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj | 3 ---
 .../threading/paramthreadstart/ThreadStartDelegate.csproj             | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartDouble.csproj  | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartFloat.csproj   | 3 ---
 .../threading/paramthreadstart/ThreadStartGenerics.csproj             | 3 ---
 .../src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartLong.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartNull.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartNull2.csproj   | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartObject.csproj  | 3 ---
 .../threading/paramthreadstart/ThreadStartOperations.csproj           | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartSByte.csproj   | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartShort.csproj   | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartString.csproj  | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartUInt.csproj    | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartULong.csproj   | 3 ---
 .../baseservices/threading/paramthreadstart/ThreadStartUShort.csproj  | 3 ---
 .../src/baseservices/threading/regressions/17360/AVHelper.csproj      | 3 ---
 .../tests/src/baseservices/threading/regressions/576463/576463.csproj | 3 ---
 .../tests/src/baseservices/threading/regressions/6906/6906.csproj     | 3 ---
 .../tests/src/baseservices/threading/stress/sudoku/Stack.csproj       | 3 ---
 .../src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj  | 3 ---
 .../src/baseservices/threading/threadstatic/ThreadStatic01.csproj     | 3 ---
 .../src/baseservices/threading/threadstatic/ThreadStatic02.csproj     | 3 ---
 .../src/baseservices/threading/threadstatic/ThreadStatic03.csproj     | 3 ---
 .../baseservices/threading/threadstatic/ThreadStatic04Helper.csproj   | 3 ---
 .../src/baseservices/threading/threadstatic/ThreadStatic05.csproj     | 3 ---
 .../src/baseservices/threading/threadstatic/ThreadStatic06.csproj     | 3 ---
 src/coreclr/tests/src/baseservices/visibility/Target.csproj           | 3 ---
 259 files changed, 5 insertions(+), 766 deletions(-)

diff --git a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/Dev10_535767.csproj b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/Dev10_535767.csproj
index cc221a0..cb838e5 100644
--- a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/Dev10_535767.csproj
+++ b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/Dev10_535767.csproj
@@ -32,9 +32,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <NoWarn Include="42016,42020,42025,42024" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestAPIs.csproj b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestAPIs.csproj
index e4d74de..2e4149b 100644
--- a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestAPIs.csproj
+++ b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestAPIs.csproj
@@ -32,9 +32,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <NoWarn Include="42016,42020,42025,42024" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestGC.csproj b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestGC.csproj
index 3b1a5f0..2f4edb9 100644
--- a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestGC.csproj
+++ b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestGC.csproj
@@ -32,9 +32,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <NoWarn Include="42016,42020,42025,42024" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestOverrides.csproj b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestOverrides.csproj
index 2ac88d6..da98709 100644
--- a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestOverrides.csproj
+++ b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestOverrides.csproj
@@ -32,9 +32,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <NoWarn Include="42016,42020,42025,42024" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/test448035.csproj b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/test448035.csproj
index 92d9ba8..d70ecf1 100644
--- a/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/test448035.csproj
+++ b/src/coreclr/tests/src/baseservices/compilerservices/dynamicobjectproperties/test448035.csproj
@@ -32,9 +32,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <NoWarn Include="42016,42020,42025,42024" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException01.csproj b/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException01.csproj
index f2fde61..3347402 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException02.csproj b/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException02.csproj
index f2fde61..3347402 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException03.csproj b/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException03.csproj
index d6ea8fa..809da2b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/AccessViolationException/AVException03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests.csproj b/src/coreclr/tests/src/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests.csproj
index 33b019b..fc29ee0 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
index eb84b22..b40e52c 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions01.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions01.csproj
index be9c33e..9779959 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions02.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions02.csproj
index 110cae6..dd9ce48 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions03.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions03.csproj
index 8b92387..ca50d9b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions04.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions04.csproj
index 8a34bc26..2a01715 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions04.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions04.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions05.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions05.csproj
index dddcf84..77c2be2 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions05.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions05.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions06.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions06.csproj
index e0c50c8..157c8c2 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions06.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions06.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions07.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions07.csproj
index ec81392..43cc322 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions07.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions07.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions08.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions08.csproj
index 8fd59e7..30acc8b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions08.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/GenericExceptions08.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter001.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter001.csproj
index 7bec888..46d0fc9 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter001.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter001.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter002.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter002.csproj
index 7a95f6a..ced412b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter002.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter002.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter003.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter003.csproj
index f01cd07..2d82f51 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter003.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter003.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter004.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter004.csproj
index 4ad1943..85261f0 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter004.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter004.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter005.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter005.csproj
index 925ff4f..efe559e 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter005.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter005.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter006.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter006.csproj
index e796fbe..7f1707c 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter006.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter006.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter007.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter007.csproj
index 4a74c4b..4c7ebac 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter007.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter007.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter008.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter008.csproj
index 98e336a..87924d6 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter008.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter008.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter009.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter009.csproj
index e3f78c1..08a0685 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter009.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter009.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter010.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter010.csproj
index 6ee702f..bf7b89b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter010.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter010.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter011.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter011.csproj
index 9e3d290..a2a6b8d 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter011.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter011.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter012.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter012.csproj
index 2845889..aae5e23 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter012.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter012.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter013.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter013.csproj
index 8d85a43..4d4b385 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter013.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter013.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter014.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter014.csproj
index 260a53f..c5e5b05 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter014.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter014.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter015.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter015.csproj
index c927f7d..ed857fb 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter015.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter015.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter016.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter016.csproj
index aff9728..d1cb0bb 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter016.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter016.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter017.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter017.csproj
index f59bdc6..f71086b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter017.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter017.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter018.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter018.csproj
index 09dff0e..f735111 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter018.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/TypeParameter018.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch01.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch01.csproj
index 656de81..e75f7fa 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch02.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch02.csproj
index 9969043..4fa23c4 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch03.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch03.csproj
index cc7de5a..dbeb970 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch04.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch04.csproj
index f48e378..c54b737 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch04.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch04.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch05.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch05.csproj
index 8d1e736..a10dad1 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch05.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch05.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch06.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch06.csproj
index 7ffb234..4657da9 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch06.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch06.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch07.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch07.csproj
index c029549..e1a0dfa 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch07.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch07.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch08.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch08.csproj
index 763613d..51f7690 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch08.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch08.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch09.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch09.csproj
index 46745b3..72af2f5 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch09.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch09.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch10.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch10.csproj
index 795a2e7..9131a5d 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch10.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/nested-try-catch10.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct01.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct01.csproj
index 1213a93..29ae23d 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct02.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct02.csproj
index eb7fd05..3cfcd0d 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct03.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct03.csproj
index 80a3630..13feaff 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally-struct03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally01.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally01.csproj
index 750b34a..903e32b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally02.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally02.csproj
index 221f2ce..83e9615 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally03.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally03.csproj
index ec152be..ef4aa32 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-finally03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct01.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct01.csproj
index cc11b42..b94a653 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct02.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct02.csproj
index 456dae8..6ae5e33 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct03.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct03.csproj
index 05630a6..53bcbf6 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct04.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct04.csproj
index f3a5ad0..b1dca83 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct04.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct04.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct05.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct05.csproj
index 1bc9f72..b443a9d 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct05.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct05.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct06.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct06.csproj
index fb8099f..1141e07 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct06.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct06.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct07.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct07.csproj
index b54e469..f63a670 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct07.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct07.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct08.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct08.csproj
index d35a2aa..8074cf6 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct08.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct08.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct09.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct09.csproj
index 7766afe..cac92ae 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct09.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch-struct09.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch01.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch01.csproj
index 8c47fda..64844c7 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch02.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch02.csproj
index 0c1ee18..4c445b1 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch03.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch03.csproj
index 0dc24be..079917a 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch04.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch04.csproj
index bce1bfe..bc53a04 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch04.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch04.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch05.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch05.csproj
index 60a94d2..3f0ee2f 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch05.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch05.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch06.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch06.csproj
index fd082be..188ebac 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch06.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch06.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch07.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch07.csproj
index 2a1b577..debe4f6 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch07.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch07.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch08.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch08.csproj
index e9feb78..ac0ba11 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch08.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch08.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch09.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch09.csproj
index 1f44529..ede0d42 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch09.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-catch09.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct01.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct01.csproj
index e81d35f..d06c6a3 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct02.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct02.csproj
index 7ff5b1e..c6f545e 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct03.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct03.csproj
index 8b80e8e..1bfbdf0 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally-struct03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally01.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally01.csproj
index 94fffa3..98ce988 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally02.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally02.csproj
index c7956dc..6257bc3 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally02.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally03.csproj b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally03.csproj
index d45b82e..7ecca29 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally03.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/generics/try-finally03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
index 4feae8c..32601ab 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
@@ -36,9 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
index 68f6abf..2c305ee 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj
index 1d594c5..ac6fbf9 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj
index 980ace2..6473677 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/ExternalException.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/ExternalException.csproj
index 6691689..d83da2e 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/ExternalException.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/ExternalException.csproj
@@ -33,9 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.csproj
index 1eb85b3..96e6642 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.csproj
index ebcb18a..b12a5be 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.csproj
@@ -32,9 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj
index d30985a..e281947 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj
index 0dba45c..d4b482c 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.csproj
index 2bc3326..5f52ad7 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NormalException.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NormalException.csproj
index 410b55d..8fcbbd0 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NormalException.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NormalException.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj
index ae52563..6163210 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj
@@ -32,9 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj
index c34cf1a..03ddf99 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj
index 43efc46..2bfb3ec 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
index 882764f..ab5530e 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
@@ -36,9 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserException.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserException.csproj
index aad6e4b..277501f 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserException.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserException.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj
index b901f61..9ae185c 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj
@@ -32,9 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
index 19a7ca5..c2647cb 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj
index 4256e16..89363a7 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/v4.0/640474/other.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/v4.0/640474/other.csproj
index 190f243..c88225c 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/v4.0/640474/other.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/v4.0/640474/other.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/v4.0/640474/test640474.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/v4.0/640474/test640474.csproj
index a632cc5..2a4d7e5 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/v4.0/640474/test640474.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/v4.0/640474/test640474.csproj
@@ -31,7 +31,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="other.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj
index 69cd040..d6b3f70 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeybeta2/349379/349379.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeybeta2/349379/349379.csproj
index d2f1776..43f69ae 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeybeta2/349379/349379.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeybeta2/349379/349379.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeybeta2/366085/366085.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeybeta2/366085/366085.csproj
index b8cbbeb..91dd208 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeybeta2/366085/366085.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeybeta2/366085/366085.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/106011/106011.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/106011/106011.csproj
index fb5675a..7e92212 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/106011/106011.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/106011/106011.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj
index a26d4f1..bc87357 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/data.csproj b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/data.csproj
index 4e1f3ce..35ba4c7 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/data.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/data.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj b/src/coreclr/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj
index 64b0e4d..64b9d58 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj b/src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
index 41ec023..5a69dda 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
@@ -32,9 +32,9 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="VT.ilproj" />
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/simple/HardwareEh.csproj b/src/coreclr/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
index ced4f2b..64e8a1b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
@@ -31,7 +31,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="ILHelper.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj b/src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj
index 2e89695..1d594c5 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj
@@ -31,7 +31,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
index 5dd95f3..23ce763 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/BaseClass.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/BaseClass.csproj
index ba88857..ec6051a 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/BaseClass.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/BaseClass.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj
index 332e040..7120351 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj
index e268f61..554fe51 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/GoryManagedPresent.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/GoryManagedPresent.csproj
index 5d9b0c0..8807b97 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/GoryManagedPresent.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/GoryManagedPresent.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj
index ec8a42e..aefbdbb 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/InnerFinally.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/InnerFinally.csproj
index 7a8a636..3b27102 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/InnerFinally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/InnerFinally.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj
index 93b4b98..cb8d54d 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/Pending.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/Pending.csproj
index 40f3f6a..ffa52cd 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/Pending.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/Pending.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/Recurse.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/Recurse.csproj
index 7bde1ed..33ce909 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/Recurse.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/Recurse.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/RecursiveRethrow.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/RecursiveRethrow.csproj
index 4f65989..83ab5f7 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/RecursiveRethrow.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/RecursiveRethrow.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj
index e4a3150..b2466ee 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/RethrowAndFinally.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/RethrowAndFinally.csproj
index 6862403..cb2afb9 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/RethrowAndFinally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/RethrowAndFinally.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/ReturnFromCatch.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/ReturnFromCatch.csproj
index b798f7b..ee9b1a8 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/ReturnFromCatch.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/ReturnFromCatch.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/StrSwitchFinally.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/StrSwitchFinally.csproj
index 5e33504..d15eb95 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/StrSwitchFinally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/StrSwitchFinally.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj
index 8c39141..e170b93 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj
index 957b5ca..f08fa65 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInFinallyNestedInTry.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInFinallyNestedInTry.csproj
index 1d93f48..7a61f1b 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInFinallyNestedInTry.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/ThrowInFinallyNestedInTry.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/TryCatchInFinally.csproj b/src/coreclr/tests/src/baseservices/exceptions/unittests/TryCatchInFinally.csproj
index 9d49c9d..5b5581a 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/TryCatchInFinally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/TryCatchInFinally.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/exceptions/unittests/trace.cs b/src/coreclr/tests/src/baseservices/exceptions/unittests/trace.cs
index 1f16402..5c6e83e 100644
--- a/src/coreclr/tests/src/baseservices/exceptions/unittests/trace.cs
+++ b/src/coreclr/tests/src/baseservices/exceptions/unittests/trace.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 using System;
 using System.IO;
-using TestLibrary;
 
 //
 // infrastructure
diff --git a/src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj b/src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj
index 91c20ae..0187686 100644
--- a/src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj
+++ b/src/coreclr/tests/src/baseservices/finalization/Finalizer.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/finalization/FinalizerSigned.csproj b/src/coreclr/tests/src/baseservices/finalization/FinalizerSigned.csproj
index 91c20ae..0187686 100644
--- a/src/coreclr/tests/src/baseservices/finalization/FinalizerSigned.csproj
+++ b/src/coreclr/tests/src/baseservices/finalization/FinalizerSigned.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj b/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj
index 8de828b..5923c9d 100644
--- a/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj
+++ b/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj
@@ -31,9 +31,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <NoWarn Include="42016,42020,42025,42024" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey267905/267905.csproj b/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey267905/267905.csproj
index 4c26b05..4a37c74 100644
--- a/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey267905/267905.csproj
+++ b/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey267905/267905.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey305155/305155.csproj b/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey305155/305155.csproj
index 3fb8982..b3ffc78 100644
--- a/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey305155/305155.csproj
+++ b/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey305155/305155.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey395914/395914.csproj b/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey395914/395914.csproj
index 6172f23..5a81ede 100644
--- a/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey395914/395914.csproj
+++ b/src/coreclr/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey395914/395914.csproj
@@ -31,9 +31,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <NoWarn Include="42016,42020,42025,42024" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj b/src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj
index 1402a58..f82f237 100644
--- a/src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj
+++ b/src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj
@@ -31,7 +31,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/src/coreclr/tests/src/baseservices/threading/currentculture/CultureChangeSecurity.csproj b/src/coreclr/tests/src/baseservices/threading/currentculture/CultureChangeSecurity.csproj
index fa69a71..6f8902e 100644
--- a/src/coreclr/tests/src/baseservices/threading/currentculture/CultureChangeSecurity.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/currentculture/CultureChangeSecurity.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj
index 74b8c66..ed4fff0 100644
--- a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj
index 29e46d5..6c8c78e 100644
--- a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj
index 374e9d7..1d29063 100644
--- a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj
index e129091..9783c95 100644
--- a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast1.csproj b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast1.csproj
index 8bdc989..7fbb31b 100644
--- a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast1.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast1.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast2.csproj b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast2.csproj
index df91e9d..315e80e 100644
--- a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast2.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj
index 261d21b..1d46d13 100644
--- a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj
index 4c4c3a5..d70bf90 100644
--- a/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread01.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread01.csproj
index 8ec7b63..f703215 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread01.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread02.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread02.csproj
index 42db040..46f63ca 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread02.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread03.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread03.csproj
index 91d6cf3..eda06d3 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread03.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread04.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread04.csproj
index bdfd98c..ef03037 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread04.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread04.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread05.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread05.csproj
index 4715fdc..e71499a 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread05.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread05.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread06.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread06.csproj
index 52040f6..fac17c2 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread06.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread06.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread07.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread07.csproj
index cb6d163..f1681536 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread07.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread07.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread08.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread08.csproj
index bd1bab7..c25eb1b 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread08.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread08.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread09.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread09.csproj
index 3d2a605..d0d7323 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread09.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread09.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread10.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread10.csproj
index 7c48ea6..68d0137 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread10.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread10.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread11.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread11.csproj
index c3720f4..222759b 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread11.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread11.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread12.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread12.csproj
index bc94c57..59694cb 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread12.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread12.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread13.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread13.csproj
index 1edb34c..a672a20 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread13.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread13.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread14.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread14.csproj
index ca14901..197f297 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread14.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread14.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread15.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread15.csproj
index 040e0ed..81126e2 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread15.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread15.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread16.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread16.csproj
index 349bf37..053f72b 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread16.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread16.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread17.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread17.csproj
index 0270612..08967dc 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread17.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread17.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread18.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread18.csproj
index 00121f7..4d46c45 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread18.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread18.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread19.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread19.csproj
index cebdced..1f56b47 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread19.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread19.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread20.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread20.csproj
index 5794f9d..8062461 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread20.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread20.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread21.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread21.csproj
index 8971224..7e617b2 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread21.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread21.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread22.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread22.csproj
index 2cfc8f1..e0fd15e 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread22.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread22.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread23.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread23.csproj
index 10028eb..8867961 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread23.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread23.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread24.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread24.csproj
index c629e96..8f07268 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread24.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread24.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread25.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread25.csproj
index 1add003..e1dc232 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread25.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread25.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread26.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread26.csproj
index 789a6c2..01480ce 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread26.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread26.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread27.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread27.csproj
index 1dc1515..3c56af0 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread27.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread27.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread28.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread28.csproj
index efa8a61..3393f96 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread28.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread28.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread29.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread29.csproj
index 94ef48d..bcc4b17 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread29.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread29.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread30.csproj b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread30.csproj
index 0b0d77c..f059429 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread30.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/syncdelegate/GThread30.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread01.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread01.csproj
index 8ec7b63..f703215 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread01.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread02.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread02.csproj
index 42db040..46f63ca 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread02.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread03.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread03.csproj
index 91d6cf3..eda06d3 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread03.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread04.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread04.csproj
index bdfd98c..ef03037 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread04.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread04.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread05.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread05.csproj
index 4715fdc..e71499a 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread05.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread05.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread06.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread06.csproj
index 52040f6..fac17c2 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread06.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread06.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread07.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread07.csproj
index cb6d163..f1681536 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread07.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread07.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread08.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread08.csproj
index bd1bab7..c25eb1b 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread08.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread08.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread09.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread09.csproj
index 3d2a605..d0d7323 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread09.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread09.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread10.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread10.csproj
index 7c48ea6..68d0137 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread10.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread10.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread11.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread11.csproj
index c3720f4..222759b 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread11.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread11.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread12.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread12.csproj
index bc94c57..59694cb 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread12.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread12.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread13.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread13.csproj
index 1edb34c..a672a20 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread13.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread13.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread14.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread14.csproj
index ca14901..197f297 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread14.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread14.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread15.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread15.csproj
index 040e0ed..81126e2 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread15.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread15.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread16.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread16.csproj
index 349bf37..053f72b 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread16.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread16.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread17.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread17.csproj
index 0270612..08967dc 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread17.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread17.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread18.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread18.csproj
index 00121f7..4d46c45 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread18.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread18.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread19.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread19.csproj
index cebdced..1f56b47 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread19.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread19.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread20.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread20.csproj
index 5794f9d..8062461 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread20.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread20.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread21.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread21.csproj
index 8971224..7e617b2 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread21.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread21.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread22.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread22.csproj
index 2cfc8f1..e0fd15e 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread22.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread22.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread23.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread23.csproj
index 10028eb..8867961 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread23.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread23.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread24.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread24.csproj
index c629e96..8f07268 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread24.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread24.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread25.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread25.csproj
index 1add003..e1dc232 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread25.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread25.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread26.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread26.csproj
index 789a6c2..01480ce 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread26.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread26.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread27.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread27.csproj
index 1dc1515..3c56af0 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread27.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread27.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread28.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread28.csproj
index efa8a61..3393f96 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread28.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread28.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread29.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread29.csproj
index 94ef48d..bcc4b17 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread29.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread29.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread30.csproj b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread30.csproj
index 0b0d77c..f059429 100644
--- a/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread30.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/generics/threadstart/GThread30.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/add/CheckAddInt.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/add/CheckAddInt.csproj
index 8fc44fa..d9028a8 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/add/CheckAddInt.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/add/CheckAddInt.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/add/CheckAddLong.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/add/CheckAddLong.csproj
index fd5501b..7268113 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/add/CheckAddLong.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/add/CheckAddLong.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt.csproj
index 8b75524..991891e 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong.csproj
index 14c2f1b..3100c6e 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddLongWithSubtract.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddLongWithSubtract.csproj
index 49fe484..7d096c1 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddLongWithSubtract.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/add/InterlockedAddLongWithSubtract.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong.csproj
index 945da86..b6b970e 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass.csproj
index 798bf6f..a3db344 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTString.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTString.csproj
index 8771770..2e34b48 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTString.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTString.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeInt.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeInt.csproj
index 7f027c1..a07c9fe 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeInt.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeInt.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeLong.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeLong.csproj
index 1601bb7..e2c1a57 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeLong.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeLong.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeTClass.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeTClass.csproj
index e4b12d4..32ac313 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeTClass.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeTClass.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString.csproj
index 4445ef8..f40d779 100644
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/monitor/enter/EnterNull.csproj b/src/coreclr/tests/src/baseservices/threading/monitor/enter/EnterNull.csproj
index 33ad294..1fb052b 100644
--- a/src/coreclr/tests/src/baseservices/threading/monitor/enter/EnterNull.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/monitor/enter/EnterNull.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/monitor/exit/ExitNull.csproj b/src/coreclr/tests/src/baseservices/threading/monitor/exit/ExitNull.csproj
index ccaa37b..47f6b56 100644
--- a/src/coreclr/tests/src/baseservices/threading/monitor/exit/ExitNull.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/monitor/exit/ExitNull.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj b/src/coreclr/tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj
index b21ecc2..f021504 100644
--- a/src/coreclr/tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj b/src/coreclr/tests/src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj
index e8d47dc..07916dd 100644
--- a/src/coreclr/tests/src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/EnterExitExit.csproj b/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/EnterExitExit.csproj
index c15e1c3..5415673 100644
--- a/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/EnterExitExit.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/EnterExitExit.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterNewObject.csproj b/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterNewObject.csproj
index e3f6254..05eed02 100644
--- a/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterNewObject.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterNewObject.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterObject.csproj b/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterObject.csproj
index 4adfe12..60f7cb3 100644
--- a/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterObject.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterObject.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterValType.csproj b/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterValType.csproj
index 52410e9..3c740ff 100644
--- a/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterValType.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/monitor/unownedlock/NoEnterValType.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool.csproj
index 98ff352..b903279 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool.csproj
@@ -29,9 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte.csproj
index 4675f79..29a2b8d 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast.csproj
index a4698a1..6f5f88d 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar.csproj
index e3416d0..9618185 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj
index 9a35395..427949f 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate.csproj
index 2928bf8d..ba081fb 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble.csproj
index f565cab..1d5b734 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat.csproj
index 91020a8..aa53e85 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics.csproj
index e6dbfdd..0a8d836 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj
index 79466a6..73340d7 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong.csproj
index 99a29f9..8cdb143 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj
index 66d086a..8b55713 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj
index a72d540..6c3d346 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj
index ec8ba90..7292393 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull.csproj
index 32d06eb..31433a3 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull2.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull2.csproj
index 60059f4..8f65334 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull2.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject.csproj
index ab4e21e..b68d003 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations.csproj
index bfee386..7b6a0a5 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte.csproj
index 7b9f1f0..f9373a2 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort.csproj
index 05a93f8..bbf3cc9 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartString.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartString.csproj
index 32fe403..2223807 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartString.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartString.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt.csproj
index 2de2e97..ae9025c 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong.csproj
index 00d3775..427cc37 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort.csproj b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort.csproj
index 3417f6d..18fc6ce 100644
--- a/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/regressions/17360/AVHelper.csproj b/src/coreclr/tests/src/baseservices/threading/regressions/17360/AVHelper.csproj
index beaf7cd..6d67b4f 100644
--- a/src/coreclr/tests/src/baseservices/threading/regressions/17360/AVHelper.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/regressions/17360/AVHelper.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/regressions/576463/576463.csproj b/src/coreclr/tests/src/baseservices/threading/regressions/576463/576463.csproj
index 9206b0e..1539a0b 100644
--- a/src/coreclr/tests/src/baseservices/threading/regressions/576463/576463.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/regressions/576463/576463.csproj
@@ -31,9 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/regressions/6906/6906.csproj b/src/coreclr/tests/src/baseservices/threading/regressions/6906/6906.csproj
index e5ff250..092e205 100644
--- a/src/coreclr/tests/src/baseservices/threading/regressions/6906/6906.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/regressions/6906/6906.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/stress/sudoku/Stack.csproj b/src/coreclr/tests/src/baseservices/threading/stress/sudoku/Stack.csproj
index d7cfa47..1de5c20 100644
--- a/src/coreclr/tests/src/baseservices/threading/stress/sudoku/Stack.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/stress/sudoku/Stack.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj b/src/coreclr/tests/src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj
index 7115ab9..ed33148 100644
--- a/src/coreclr/tests/src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj
@@ -32,9 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic01.csproj b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic01.csproj
index 73bf99c..e5ea00c 100644
--- a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic01.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic01.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic02.csproj b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic02.csproj
index 428170b..47048f3 100644
--- a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic02.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic02.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic03.csproj b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic03.csproj
index 82f9502..cd03d64 100644
--- a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic03.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic03.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic04Helper.csproj b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic04Helper.csproj
index a2fe1ea..ace9694 100644
--- a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic04Helper.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic04Helper.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic05.csproj b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic05.csproj
index 4bf4168..ef6a804 100644
--- a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic05.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic05.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic06.csproj b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic06.csproj
index e5cd5a8..bb193a5 100644
--- a/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic06.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/threadstatic/ThreadStatic06.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/visibility/Target.csproj b/src/coreclr/tests/src/baseservices/visibility/Target.csproj
index aacfcff..2267bee 100644
--- a/src/coreclr/tests/src/baseservices/visibility/Target.csproj
+++ b/src/coreclr/tests/src/baseservices/visibility/Target.csproj
@@ -30,9 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
-- 
2.7.4