Fix dependencies.props import (#833)

* Fix dependencies.props import

* Fix props by sanitizing variables

* Don't use ProjectDir variable in script

diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props
index 0eb2d72..90ecca2 100644 (file)
--- a/src/coreclr/dir.common.props
+++ b/src/coreclr/dir.common.props
@@ -37,28 +37,19 @@
 
   <!-- Common properties -->
   <PropertyGroup>
-
-    <__ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</__ProjectDir>
-    <ProjectDir>$(__ProjectDir)\</ProjectDir>
-    <RootRepoDir>$(ProjectDir)\..\..\</RootRepoDir>
-    <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</ProjectDir>
+    <RootRepoDir>$(MSBuildThisFileDirectory)..\..\</RootRepoDir>
+    <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
 
     <BaseIntermediateOutputPath>$(RootRepoDir)artifacts\obj\coreclr\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
 
-    <SourceDir>$(__SourceDir)\</SourceDir>
-    <SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)src\</SourceDir>
-
-    <RootBinDir>$(__RootBinDir)\</RootBinDir>
-    <RootBinDir Condition="'$(__RootBinDir)'==''">$(RootRepoDir)artifacts\</RootBinDir>
-
-    <BinDir>$(__BinDir)\</BinDir>
-    <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)bin\coreclr\$(PlatformConfigPathPart)\</BinDir>
+    <SourceDir>$(ProjectDir)src\</SourceDir>
+    <RootBinDir>$(RootRepoDir)artifacts\</RootBinDir>
+    <BinDir>$(RootBinDir)bin\coreclr\$(PlatformConfigPathPart)\</BinDir>
 
     <!-- We don't append back slash because this path is used by nuget.exe as output directory and it
          fails to write packages to it if the path contains the forward slash.
     -->
-    <PackagesBinDir>$(__PackagesBinDir)</PackagesBinDir>
-    <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir>
+    <PackagesBinDir>$(BinDir).nuget\</PackagesBinDir>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -122,5 +113,5 @@
   </PropertyGroup>
 
   <!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. -->
-  <Import Project="$(ProjectDir)dependencies.props" />
+  <Import Project="$(MSBuildThisFileDirectory)dependencies.props" />
 </Project>

diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props
index 532dacb..691df71 100644 (file)
--- a/src/coreclr/tests/Directory.Build.props
+++ b/src/coreclr/tests/Directory.Build.props
@@ -14,20 +14,17 @@
 
   <!-- Common repo directories -->
   <PropertyGroup>
-    <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
-    <SourceDir>$(ProjectDir)src\</SourceDir>
+    <TestProjectDir>$(MSBuildThisFileDirectory)</TestProjectDir>
+    <TestSourceDir>$(MSBuildThisFileDirectory)src\</TestSourceDir>
   </PropertyGroup>
 
   <!-- Common properties -->
   <PropertyGroup>
-    <RootBinDir>$(__RootBinDir)\</RootBinDir>
-    <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)..\..\..\artifacts\</RootBinDir>
-
-    <BinDir>$(__BinDir)\</BinDir>
-    <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
+    <RootBinDir>$(MSBuildThisFileDirectory)..\..\..\artifacts\</RootBinDir>
+    <BinDir>$(RootBinDir)bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir>
 
     <TestWorkingDir>$(__TestWorkingDir)\</TestWorkingDir>
-    <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\</TestWorkingDir>
+    <TestWorkingDir>$(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\</TestWorkingDir>
 
     <AltJitArch>$(__AltJitArch)</AltJitArch>
   </PropertyGroup>

diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets
index 0d46dfb..2df245c 100644 (file)
--- a/src/coreclr/tests/publishdependency.targets
+++ b/src/coreclr/tests/publishdependency.targets
@@ -17,7 +17,7 @@
     <!-- These projects are individually restored in order. Each
          subsequent restore only copies files that don't already exist
          in CORE_ROOT, so assets from the first project file win. -->
-    <CoreRootProjectFiles Include="$(SourceDir)Common\test_dependencies\test_dependencies.csproj" />
+    <CoreRootProjectFiles Include="$(TestSourceDir)Common\test_dependencies\test_dependencies.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/coreclr/tests/runtest.cmd b/src/coreclr/tests/runtest.cmd
index facd9e2..dfafcc1 100644 (file)
--- a/src/coreclr/tests/runtest.cmd
+++ b/src/coreclr/tests/runtest.cmd
@@ -16,7 +16,7 @@ set "__ProjectDir=%~dp0"
 :: remove trailing slash
 if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
 set "__ProjectFilesDir=%__ProjectDir%"
-set "__RootBinDir=%__ProjectDir%\..\artifacts"
+set "__RootBinDir=%~dp0..\..\..\artifacts"
 set "__LogsDir=%__RootBinDir%\log"
 set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs"
 set __ToolsDir=%__ProjectDir%\..\Tools
@@ -185,8 +185,7 @@ if defined RunInUnloadableContext (
     set __RuntestPyArgs=%__RuntestPyArgs% --run_in_context
 )
 
-REM __ProjectDir is poorly named, it is actually <projectDir>/tests
-set NEXTCMD=python "%__ProjectDir%\runtest.py" %__RuntestPyArgs%
+set NEXTCMD=python "%~dp0runtest.py" %__RuntestPyArgs%
 echo !NEXTCMD!
 !NEXTCMD!
 

diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
index 453a5c3..6df9659 100644 (file)
--- a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
+++ b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
@@ -8,7 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateRunScript>false</GenerateRunScript>
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
-    <ProjectAssetsFile>$(SourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(TestSourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -28,6 +28,6 @@
   <!-- This project depends on properties pulled in by Directory.Build.targets in the test/src directory,
        which isn't usually imported for the tests/src/Common
        projects. -->
-  <Import Project="$(SourceDir)\Directory.Build.targets" />
+  <Import Project="$(TestSourceDir)\Directory.Build.targets" />
 
 </Project>

diff --git a/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
index 45cb39f..22a4b52 100644 (file)
--- a/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
+++ b/src/coreclr/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ProjectAssetsFile>$(SourceDir)Common\Coreclr.TestWrapper\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(TestSourceDir)Common\Coreclr.TestWrapper\obj\project.assets.json</ProjectAssetsFile>
     <NuGetTargetMoniker>$(NetCoreAppCurrentTargetFrameworkMoniker)</NuGetTargetMoniker>
     <NuGetTargetMonikerShort>$(NetCoreAppCurrent)</NuGetTargetMonikerShort>
   </PropertyGroup>

diff --git a/src/coreclr/tests/src/Common/ilasm/ilasm.ilproj b/src/coreclr/tests/src/Common/ilasm/ilasm.ilproj
index 187119c..6c76895 100644 (file)
--- a/src/coreclr/tests/src/Common/ilasm/ilasm.ilproj
+++ b/src/coreclr/tests/src/Common/ilasm/ilasm.ilproj
@@ -5,7 +5,7 @@
 
   <PropertyGroup>
     <RuntimeIdentifier>$(TargetRid)</RuntimeIdentifier>
-    <ProjectAssetsFile>$(SourceDir)Common\ilasm\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(TestSourceDir)Common\ilasm\obj\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 
 </Project>

diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
index 667b32b..8d668cf 100644 (file)
--- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -16,7 +16,7 @@
   <Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />
 
   <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(TestSourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 
   <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />

diff --git a/src/coreclr/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj b/src/coreclr/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj
index 07a4bc8..36809a8 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj
@@ -9,6 +9,6 @@
     <Compile Include="asurt_99893.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombine1.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombine1.csproj
index 2db5232..7725354 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombine1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombine1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="delegatecombine1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombineImpl.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombineImpl.csproj
index d30b37f..2c01c2b 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombineImpl.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateCombineImpl.csproj
@@ -9,6 +9,6 @@
     <Compile Include="delegatecombineimpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateEquals1.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateEquals1.csproj
index 81764ef..2c53a9e 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateEquals1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateEquals1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="delegateequals1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetHashCode1.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetHashCode1.csproj
index 6959a4d..8d66d7e 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetHashCode1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetHashCode1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="delegategethashcode1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetInvocationList1.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetInvocationList1.csproj
index 54d4b21..1ac5e77 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetInvocationList1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateGetInvocationList1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="delegategetinvocationlist1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateRemove.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateRemove.csproj
index fdbe692..5f60ac5 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateRemove.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/DelegateRemove.csproj
@@ -9,6 +9,6 @@
     <Compile Include="delegateremove.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/delegateRemoveImpl.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/delegateRemoveImpl.csproj
index 7c3c6ab..4768b9b 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/delegateRemoveImpl.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/delegate/delegateRemoveImpl.csproj
@@ -9,6 +9,6 @@
     <Compile Include="delegateremoveimpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj
index fe53d8a..e8539f0 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj
@@ -10,6 +10,6 @@
     <Compile Include="ng_standard.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj
index 148e9bc..b0843f6 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj
@@ -9,6 +9,6 @@
     <Compile Include="negativegenerics.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj
index 8498756..a33928e 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj
@@ -9,6 +9,6 @@
     <Compile Include="nullabletypes.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj
index 7d8cfed..0482a51 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj
@@ -9,6 +9,6 @@
     <Compile Include="central.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj
index ef83415..739c45f 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj
@@ -9,7 +9,7 @@
     <Compile Include="co6010delegateequalstwo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <ItemGroup>
     <WarningLevel Include="1" />

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj
index edd8588..9e9b711 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj
@@ -9,7 +9,7 @@
     <Compile Include="co6031gethashcode.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <ItemGroup>
     <WarningLevel Include="1" />

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/regressions/Github_13160/Github_13160.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/regressions/Github_13160/Github_13160.csproj
index 1554702..7fa052d 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/regressions/Github_13160/Github_13160.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/regressions/Github_13160/Github_13160.csproj
@@ -9,6 +9,6 @@
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj
index a684278..3788cf7 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj
@@ -9,6 +9,6 @@
     <Compile Include="ddb113347.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToInt64.csproj b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToInt64.csproj
index bffeb57..9ff91a1 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToInt64.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToInt64.csproj
@@ -9,6 +9,6 @@
     <Compile Include="enumiconvertibletoint64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToSingle.csproj b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToSingle.csproj
index 28f820c..7e7617d 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToSingle.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToSingle.csproj
@@ -9,6 +9,6 @@
     <Compile Include="enumiconvertibletosingle.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToType.csproj b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToType.csproj
index 2e40fec..9420966 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToType.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToType.csproj
@@ -9,6 +9,6 @@
     <Compile Include="enumiconvertibletotype.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint16.csproj b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint16.csproj
index 9659d9f..f507036 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint16.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint16.csproj
@@ -9,6 +9,6 @@
     <Compile Include="enumiconvertibletouint16.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint32.csproj b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint32.csproj
index 889716f..d11ff27 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint32.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint32.csproj
@@ -9,6 +9,6 @@
     <Compile Include="enumiconvertibletouint32.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint64.csproj b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint64.csproj
index 4234d70..0f4faec 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint64.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/enum/EnumIConvertibleToUint64.csproj
@@ -9,6 +9,6 @@
     <Compile Include="enumiconvertibletouint64.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateCombineImpl.csproj b/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateCombineImpl.csproj
index 286b2b7..d4ce782 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateCombineImpl.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateCombineImpl.csproj
@@ -11,6 +11,6 @@
     <Compile Include="verificationagent.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateEquals.csproj b/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateEquals.csproj
index 52bc868..348bd24 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateEquals.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateEquals.csproj
@@ -11,6 +11,6 @@
     <Compile Include="verificationagent.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetHashCode.csproj b/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetHashCode.csproj
index b3839d4..9665cbf 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetHashCode.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetHashCode.csproj
@@ -11,6 +11,6 @@
     <Compile Include="verificationagent.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj b/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj
index a76d7fc..e7df131 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj
@@ -11,6 +11,6 @@
     <Compile Include="verificationagent.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj
index 1048294..f528979 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="marshalsizeof1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj
index 5de5c39..c15212a 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="marshalsizeof2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj
index 6f33f4f..69f15dd 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandlector_cti.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj
index 99ef534..c5f5c99 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandledangerousaddref.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj
index 6f0eb4c..da254fe 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandledangerousgethandle.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj
index 0c43967..95b1546 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandledangerousrelease.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDispose1_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDispose1_PSC.csproj
index 2d26df4..a325de8 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDispose1_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDispose1_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandledispose1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDispose2_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDispose2_PSC.csproj
index 9e2332e..56f459c 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDispose2_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleDispose2_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandledispose2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleHandle_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleHandle_PSC.csproj
index bb32be8..def6eba 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleHandle_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleHandle_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandlehandle.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleIsClosed_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleIsClosed_PSC.csproj
index 9aca4b8..23a8a92 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleIsClosed_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleIsClosed_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandleisclosed.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleIsInvalid_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleIsInvalid_PSC.csproj
index 00f4927..cfe82d8 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleIsInvalid_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleIsInvalid_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandleisinvalid.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleSetHandleAsInvalid_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleSetHandleAsInvalid_PSC.csproj
index 9b66aca..b4149a5 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleSetHandleAsInvalid_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleSetHandleAsInvalid_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandlesethandleasinvalid.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleSetHandle_PSC.csproj b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleSetHandle_PSC.csproj
index d5ab721..970d768 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleSetHandle_PSC.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/runtime/interopservices/safehandle/SafeHandleSetHandle_PSC.csproj
@@ -9,6 +9,6 @@
     <Compile Include="safehandlesethandle.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedAdd1.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedAdd1.csproj
index a7f03fe..0965dc1 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedAdd1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedAdd1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedadd1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedAdd2.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedAdd2.csproj
index d72c94a..cba0af4 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedAdd2.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedAdd2.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedadd2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange1.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange1.csproj
index 1cb6f5c..4d70f03 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedcompareexchange1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange5.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange5.csproj
index 5969fe9..ba3b987 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange5.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange5.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedcompareexchange5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange6.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange6.csproj
index c806d24..25d1ccd 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange6.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange6.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedcompareexchange6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange7.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange7.csproj
index dee4709..a575a03 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange7.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedCompareExchange7.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedcompareexchange7.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedDecrement1.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedDecrement1.csproj
index fae59c6..05b0344 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedDecrement1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedDecrement1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockeddecrement1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedDecrement2.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedDecrement2.csproj
index d6eff11..8256858 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedDecrement2.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedDecrement2.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockeddecrement2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange1.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange1.csproj
index 85c4eae..e802af2 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedexchange1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange5.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange5.csproj
index e1b8618..71f8956 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange5.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange5.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedexchange5.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange6.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange6.csproj
index 2f0d696..b557d8a 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange6.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange6.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedexchange6.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange7.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange7.csproj
index d697941..8e63ca5 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange7.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedExchange7.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedexchange7.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedIncrement1.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedIncrement1.csproj
index 655986f..e09b36e 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedIncrement1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedIncrement1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedincrement1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedIncrement2.csproj b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedIncrement2.csproj
index ae8435a..bf6d025 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedIncrement2.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/threading/interlocked/InterlockedIncrement2.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockedincrement2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeEquals1.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeEquals1.csproj
index 3451fe3..849f611 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeEquals1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeEquals1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typeequals1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeEquals2.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeEquals2.csproj
index adcb18b..b1f647e 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeEquals2.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeEquals2.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typeequals2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetArrayRank.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetArrayRank.csproj
index 3ef2539..10004f1 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetArrayRank.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetArrayRank.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typegetarrayrank.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetElementType.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetElementType.csproj
index 7ac0ad4..9f95260 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetElementType.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetElementType.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typegetelementtype.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetGenericTypeDefinition.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetGenericTypeDefinition.csproj
index 9d956f3..e0bafc9 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetGenericTypeDefinition.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetGenericTypeDefinition.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typegetgenerictypedefinition.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetHashCode.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetHashCode.csproj
index 59cf48e..d1a05ab 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetHashCode.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetHashCode.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typegethashcode.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetType1.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetType1.csproj
index 7205139..7412af2 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetType1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetType1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typegettype1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetType2.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetType2.csproj
index 785a834..e5dd769 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetType2.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetType2.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typegettype2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetTypeFromHandle.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetTypeFromHandle.csproj
index 686211e..db6001c 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetTypeFromHandle.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeGetTypeFromHandle.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typegettypefromhandle.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeHasElementTypeImpl.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeHasElementTypeImpl.csproj
index 85c18e6..9a01d61 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeHasElementTypeImpl.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeHasElementTypeImpl.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typehaselementtypeimpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeIsByRefImpl.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeIsByRefImpl.csproj
index 97425db..739b412 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeIsByRefImpl.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeIsByRefImpl.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typeisbyrefimpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeIsPointerImpl.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeIsPointerImpl.csproj
index b25ef0e..1524477 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeIsPointerImpl.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeIsPointerImpl.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typeispointerimpl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeArrayType1.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeArrayType1.csproj
index 5012e5c..de53648 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeArrayType1.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeArrayType1.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typemakearraytype1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeArrayType2.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeArrayType2.csproj
index 452b36a..86bc83c 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeArrayType2.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeArrayType2.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typemakearraytype2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeByRefType.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeByRefType.csproj
index cd76082..1bddcb9 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeByRefType.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakeByRefType.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typemakebyreftype.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakePointerType.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakePointerType.csproj
index c8bd504..daf22f1 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakePointerType.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeMakePointerType.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typemakepointertype.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/CoreMangLib/system/type/TypeToString.csproj b/src/coreclr/tests/src/CoreMangLib/system/type/TypeToString.csproj
index c0faef9..fece143 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/type/TypeToString.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/type/TypeToString.csproj
@@ -9,6 +9,6 @@
     <Compile Include="typetostring.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props
index 0a07508..4d63321 100644 (file)
--- a/src/coreclr/tests/src/Directory.Build.props
+++ b/src/coreclr/tests/src/Directory.Build.props
@@ -32,7 +32,7 @@
     <BaseIntermediateOutputPath Condition="'$(__ManagedTestIntermediatesDir)' != ''">$(__ManagedTestIntermediatesDir)\</BaseIntermediateOutputPath>
     <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(BuildOS).$(Platform).$(Configuration)\Native\))</__NativeTestIntermediatesDir>
     <BuildProjectRelativeDir>$(MSBuildProjectName)\</BuildProjectRelativeDir>
-    <BuildProjectRelativeDir Condition="'$(MSBuildProjectDirectory.Contains($(SourceDir)))'">$([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(SourceDir),''))\$(MSBuildProjectName)</BuildProjectRelativeDir>
+    <BuildProjectRelativeDir Condition="'$(MSBuildProjectDirectory.Contains($(TestSourceDir)))'">$([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(TestSourceDir),''))\$(MSBuildProjectName)</BuildProjectRelativeDir>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)\</IntermediateOutputPath>
     <OutputPath>$(BaseOutputPathWithConfig)$(BuildProjectRelativeDir)\</OutputPath>
     <SkipXunitDependencyCopying>true</SkipXunitDependencyCopying>

diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets
index 920348b..49e5369 100644 (file)
--- a/src/coreclr/tests/src/Directory.Build.targets
+++ b/src/coreclr/tests/src/Directory.Build.targets
@@ -183,8 +183,8 @@
           Condition="'$(_CopyNativeProjectBinaries)' == 'true'"
           BeforeTargets="Build" >
      <ItemGroup Condition="'@(NativeProjectReferenceNormalized)' != ''">
-        <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))" Condition="'$(RunningOnUnix)' == 'true'" />
-        <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\" Condition="'$(RunningOnUnix)' != 'true'" />
+        <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(TestSourceDir),$(__NativeTestIntermediatesDir)\src\))" Condition="'$(RunningOnUnix)' == 'true'" />
+        <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(TestSourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\" Condition="'$(RunningOnUnix)' != 'true'" />
      </ItemGroup>
 
     <Message Text= "Full native project references are :%(NativeProjectReferenceNormalized.Identity)" />
@@ -227,7 +227,7 @@
   </Target>
 
   <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(TestSourceDir)Common\test_dependencies\obj\project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true' and '$(UsingMicrosoftNETSdk)' != 'true'">

diff --git a/src/coreclr/tests/src/GC/Features/HeapExpansion/Finalizer.csproj b/src/coreclr/tests/src/GC/Features/HeapExpansion/Finalizer.csproj
index 76fe1cc..888112d 100644 (file)
--- a/src/coreclr/tests/src/GC/Features/HeapExpansion/Finalizer.csproj
+++ b/src/coreclr/tests/src/GC/Features/HeapExpansion/Finalizer.csproj
@@ -8,7 +8,7 @@
     <Compile Include="Finalizer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="GCUtil_HeapExpansion.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Features/HeapExpansion/Handles.csproj b/src/coreclr/tests/src/GC/Features/HeapExpansion/Handles.csproj
index a8a8db9..2cfc59e 100644 (file)
--- a/src/coreclr/tests/src/GC/Features/HeapExpansion/Handles.csproj
+++ b/src/coreclr/tests/src/GC/Features/HeapExpansion/Handles.csproj
@@ -8,7 +8,7 @@
     <Compile Include="Handles.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="GCUtil_HeapExpansion.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Stress/Tests/DirectedGraph.csproj b/src/coreclr/tests/src/GC/Stress/Tests/DirectedGraph.csproj
index 42d3f74..1d1c44c 100644 (file)
--- a/src/coreclr/tests/src/GC/Stress/Tests/DirectedGraph.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/DirectedGraph.csproj
@@ -8,6 +8,6 @@
     <Compile Include="DirectedGraph.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc.csproj b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc.csproj
index 47b8c12..5295967 100644 (file)
--- a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc.csproj
@@ -8,6 +8,6 @@
     <Compile Include="LargeObjectAlloc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc1.csproj b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc1.csproj
index 74596d5..688e1b0 100644 (file)
--- a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc1.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc1.csproj
@@ -8,6 +8,6 @@
     <Compile Include="LargeObjectAlloc1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc2.csproj b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc2.csproj
index bb03ce0..614dfd0 100644 (file)
--- a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc2.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc2.csproj
@@ -8,6 +8,6 @@
     <Compile Include="LargeObjectAlloc2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc3.csproj b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc3.csproj
index ed994fa..316a3b6 100644 (file)
--- a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc3.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc3.csproj
@@ -8,6 +8,6 @@
     <Compile Include="LargeObjectAlloc3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc4.csproj b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc4.csproj
index 6a9622c..bc20c33 100644 (file)
--- a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc4.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAlloc4.csproj
@@ -8,6 +8,6 @@
     <Compile Include="LargeObjectAlloc4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAllocPinned.csproj b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAllocPinned.csproj
index c0ce96e..bbe9c9d 100644 (file)
--- a/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAllocPinned.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/LargeObjectAllocPinned.csproj
@@ -8,6 +8,6 @@
     <Compile Include="LargeObjectAllocPinned.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/GC/Stress/Tests/RedBlackTree.csproj b/src/coreclr/tests/src/GC/Stress/Tests/RedBlackTree.csproj
index 03c719c..c528cc3 100644 (file)
--- a/src/coreclr/tests/src/GC/Stress/Tests/RedBlackTree.csproj
+++ b/src/coreclr/tests/src/GC/Stress/Tests/RedBlackTree.csproj
@@ -8,6 +8,6 @@
     <Compile Include="RedBlackTree.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj b/src/coreclr/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
index bdbf7b9..feff7f9 100644 (file)
--- a/src/coreclr/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
@@ -8,7 +8,7 @@
     <Compile Include="MarshalBoolArrayTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj b/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
index ba1b552..63231a1 100644 (file)
--- a/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
+++ b/src/coreclr/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
@@ -7,7 +7,7 @@
     <Compile Include="MarshalArrayByValTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/coreclr/tests/src/Interop/ArrayMarshalling/SafeArray/SafeArrayTest.csproj b/src/coreclr/tests/src/Interop/ArrayMarshalling/SafeArray/SafeArrayTest.csproj
index 4072fd4..ac35c0f 100644 (file)
--- a/src/coreclr/tests/src/Interop/ArrayMarshalling/SafeArray/SafeArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/ArrayMarshalling/SafeArray/SafeArrayTest.csproj
@@ -10,7 +10,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/BestFitMapping/BestFitMapping.csproj b/src/coreclr/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
index 1fa1b16..0812221 100755 (executable)
--- a/src/coreclr/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
+++ b/src/coreclr/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
@@ -9,7 +9,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Aggregation/NETClientAggregation.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Aggregation/NETClientAggregation.csproj
index ed1e048..5c358c4 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NETClients/Aggregation/NETClientAggregation.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETClients/Aggregation/NETClientAggregation.csproj
@@ -18,6 +18,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/ConsumeNETServer/ConsumeNETServer.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/ConsumeNETServer/ConsumeNETServer.csproj
index 4dcd9c6..5c1447e 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NETClients/ConsumeNETServer/ConsumeNETServer.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETClients/ConsumeNETServer/ConsumeNETServer.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NETServer/NETServer.csproj" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="CoreShim.X.manifest">

diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Events/NETClientEvents.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Events/NETClientEvents.csproj
index b153bd2..b10cf70 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NETClients/Events/NETClientEvents.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETClients/Events/NETClientEvents.csproj
@@ -19,6 +19,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/IDispatch/NETClientIDispatch.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/IDispatch/NETClientIDispatch.csproj
index ed1e048..5c358c4 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NETClients/IDispatch/NETClientIDispatch.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETClients/IDispatch/NETClientIDispatch.csproj
@@ -18,6 +18,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Licensing/NETClientLicense.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Licensing/NETClientLicense.csproj
index ed1e048..5c358c4 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NETClients/Licensing/NETClientLicense.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETClients/Licensing/NETClientLicense.csproj
@@ -18,6 +18,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
index 0c7d448..f876bed 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj
@@ -23,6 +23,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitivesInALC.csproj b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitivesInALC.csproj
index b707990..5279d5f 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitivesInALC.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitivesInALC.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NativeServer/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="NetClientPrimitives.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/COM/NativeClients/DefaultInterfaces.csproj b/src/coreclr/tests/src/Interop/COM/NativeClients/DefaultInterfaces.csproj
index 71c54fb..f35e85d 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NativeClients/DefaultInterfaces.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NativeClients/DefaultInterfaces.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="DefaultInterfaces/CMakeLists.txt" />
     <ProjectReference Include="../NetServer/NetServer.DefaultInterfaces.ilproj" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />

diff --git a/src/coreclr/tests/src/Interop/COM/NativeClients/Dispatch.csproj b/src/coreclr/tests/src/Interop/COM/NativeClients/Dispatch.csproj
index 2ac1c83..7c9b191 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NativeClients/Dispatch.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NativeClients/Dispatch.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="Dispatch/CMakeLists.txt" />
     <ProjectReference Include="../NetServer/NetServer.csproj" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />

diff --git a/src/coreclr/tests/src/Interop/COM/NativeClients/Licensing.csproj b/src/coreclr/tests/src/Interop/COM/NativeClients/Licensing.csproj
index 300d599..1f39373 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NativeClients/Licensing.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NativeClients/Licensing.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="Licensing/CMakeLists.txt" />
     <ProjectReference Include="../NetServer/NetServer.csproj" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />

diff --git a/src/coreclr/tests/src/Interop/COM/NativeClients/Primitives.csproj b/src/coreclr/tests/src/Interop/COM/NativeClients/Primitives.csproj
index 44b33db..487747e 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/NativeClients/Primitives.csproj
+++ b/src/coreclr/tests/src/Interop/COM/NativeClients/Primitives.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="Primitives/CMakeLists.txt" />
     <ProjectReference Include="../NetServer/NetServer.csproj" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <ItemGroup>
     <TraitTags Include="OsSpecific" />

diff --git a/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj b/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj
index f273074..f822999 100644 (file)
--- a/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj
+++ b/src/coreclr/tests/src/Interop/COM/Reflection/Reflection.csproj
@@ -7,7 +7,7 @@
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="..\NETServer\NETServer.csproj">
       <Project>{C04AB564-CC61-499D-9F4C-AA1A9FDE42C9}</Project>
       <Name>NETServer</Name>

diff --git a/src/coreclr/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj b/src/coreclr/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
index 1fa1b16..0812221 100644 (file)
--- a/src/coreclr/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
+++ b/src/coreclr/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
@@ -9,7 +9,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj b/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj
index 8222de0..3a1e0c3 100644 (file)
--- a/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj
+++ b/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj
@@ -21,6 +21,6 @@
   <ItemGroup>
     <ProjectReference Include="../IjwNativeDll/CMakeLists.txt" />
     <ProjectReference Include="../ijwhostmock/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj b/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj
index 940c54e..7d289d2 100644 (file)
--- a/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj
+++ b/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj
@@ -21,6 +21,6 @@
   <ItemGroup>
     <ProjectReference Include="../IjwNativeCallingManagedDll/CMakeLists.txt" />
     <ProjectReference Include="../ijwhostmock/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/LayoutClass/LayoutClassTest.csproj b/src/coreclr/tests/src/Interop/LayoutClass/LayoutClassTest.csproj
index 5ec7099..71c8569 100644 (file)
--- a/src/coreclr/tests/src/Interop/LayoutClass/LayoutClassTest.csproj
+++ b/src/coreclr/tests/src/Interop/LayoutClass/LayoutClassTest.csproj
@@ -8,7 +8,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj b/src/coreclr/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
index ae8b628..499a624 100644 (file)
--- a/src/coreclr/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
+++ b/src/coreclr/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
@@ -7,7 +7,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj b/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
index 86cda48..3dd2b0b 100644 (file)
--- a/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
+++ b/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
@@ -10,7 +10,7 @@
     <Compile Include="IUnknownTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTestInALC.csproj b/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTestInALC.csproj
index c7865bd..f819455 100644 (file)
--- a/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTestInALC.csproj
+++ b/src/coreclr/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTestInALC.csproj
@@ -10,7 +10,7 @@
     <Compile Include="TestInALC.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="IUnknownTest.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>

diff --git a/src/coreclr/tests/src/Interop/NativeLibrary/NativeLibraryTests.csproj b/src/coreclr/tests/src/Interop/NativeLibrary/NativeLibraryTests.csproj
index 80241c1..08cbec7 100644 (file)
--- a/src/coreclr/tests/src/Interop/NativeLibrary/NativeLibraryTests.csproj
+++ b/src/coreclr/tests/src/Interop/NativeLibrary/NativeLibraryTests.csproj
@@ -12,7 +12,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/PInvoke/Varargs/VarargsTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Varargs/VarargsTest.csproj
index 12584c3..ed46d55 100644 (file)
--- a/src/coreclr/tests/src/Interop/PInvoke/Varargs/VarargsTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Varargs/VarargsTest.csproj
@@ -11,7 +11,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
index 1fa1b16..0812221 100644 (file)
--- a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
+++ b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
@@ -9,7 +9,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
index 1fa1b16..0812221 100644 (file)
--- a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
+++ b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
@@ -9,7 +9,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
index 2ed217f..30ea67b 100644 (file)
--- a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
+++ b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
@@ -9,7 +9,7 @@
     <Compile Include="PInvokeUIntPtrTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj b/src/coreclr/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
index 1fa1b16..0812221 100644 (file)
--- a/src/coreclr/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
+++ b/src/coreclr/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
@@ -9,7 +9,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/RefInt/RefIntTest.csproj b/src/coreclr/tests/src/Interop/RefInt/RefIntTest.csproj
index 1fa1b16..0812221 100644 (file)
--- a/src/coreclr/tests/src/Interop/RefInt/RefIntTest.csproj
+++ b/src/coreclr/tests/src/Interop/RefInt/RefIntTest.csproj
@@ -9,7 +9,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/SimpleStruct/SimpleStruct.csproj b/src/coreclr/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
index 1fa1b16..0812221 100644 (file)
--- a/src/coreclr/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
+++ b/src/coreclr/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
@@ -9,7 +9,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.csproj b/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.csproj
index 1493ec4..941aca5 100644 (file)
--- a/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.csproj
+++ b/src/coreclr/tests/src/Interop/SizeConst/SizeConstTest.csproj
@@ -11,7 +11,7 @@
     <Compile Include="SizeConstTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/AnsiBSTR/AnsiBStrTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/AnsiBSTR/AnsiBStrTest.csproj
index f7b5684..f2bc2c8 100644 (file)
--- a/src/coreclr/tests/src/Interop/StringMarshalling/AnsiBSTR/AnsiBStrTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/AnsiBSTR/AnsiBStrTest.csproj
@@ -10,7 +10,7 @@
     <Compile Include="../Native/StringMarshalingTestNative.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/BSTR/BSTRTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/BSTR/BSTRTest.csproj
index a97a453..fb38f70 100644 (file)
--- a/src/coreclr/tests/src/Interop/StringMarshalling/BSTR/BSTRTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/BSTR/BSTRTest.csproj
@@ -10,7 +10,7 @@
     <Compile Include="../Native/StringMarshalingTestNative.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
index 2c7f731..bd4f958 100644 (file)
--- a/src/coreclr/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
@@ -10,7 +10,7 @@
     <Compile Include="../Native/StringMarshalingTestNative.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
index abca3d9..c49f446 100644 (file)
--- a/src/coreclr/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
@@ -11,7 +11,7 @@
     <Compile Include="../Native/StringMarshalingTestNative.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj b/src/coreclr/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
index 1fa1b16..0812221 100644 (file)
--- a/src/coreclr/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
+++ b/src/coreclr/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
@@ -9,7 +9,7 @@
     <Compile Include="*.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
index a79083c..97e1181 100644 (file)
--- a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
@@ -11,7 +11,7 @@
     <Compile Include="Helper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
index 0679ceb..c2adbd3 100644 (file)
--- a/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
+++ b/src/coreclr/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
@@ -10,7 +10,7 @@
     <Compile Include="Helper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj b/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj
index 29fe8b0..d94f3ce 100644 (file)
--- a/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj
+++ b/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj
@@ -17,6 +17,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NativeComponent/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Interop/WinRT/NETClients/Primitives/NETClientPrimitives.csproj b/src/coreclr/tests/src/Interop/WinRT/NETClients/Primitives/NETClientPrimitives.csproj
index f2e61e1..1bd87b6 100644 (file)
--- a/src/coreclr/tests/src/Interop/WinRT/NETClients/Primitives/NETClientPrimitives.csproj
+++ b/src/coreclr/tests/src/Interop/WinRT/NETClients/Primitives/NETClientPrimitives.csproj
@@ -24,6 +24,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../NativeComponent/CMakeLists.txt" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/JIT/HardwareIntrinsics/Directory.Build.props b/src/coreclr/tests/src/JIT/HardwareIntrinsics/Directory.Build.props
index 8f84474..b00a9a2 100644 (file)
--- a/src/coreclr/tests/src/JIT/HardwareIntrinsics/Directory.Build.props
+++ b/src/coreclr/tests/src/JIT/HardwareIntrinsics/Directory.Build.props
@@ -2,6 +2,6 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_21625/GitHub_21625.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_21625/GitHub_21625.csproj
index 7e75678..602a09a 100644 (file)
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_21625/GitHub_21625.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_21625/GitHub_21625.csproj
@@ -10,6 +10,6 @@
     <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj b/src/coreclr/tests/src/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj
index 55d4805..cc8868e 100644 (file)
--- a/src/coreclr/tests/src/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj
+++ b/src/coreclr/tests/src/Loader/AssemblyDependencyResolver/AssemblyDependencyResolverTests/AssemblyDependencyResolverTests.csproj
@@ -11,6 +11,6 @@
     <Compile Include="TestBase.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.csproj b/src/coreclr/tests/src/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.csproj
index 3a0e1ae..e8d09c2 100644 (file)
--- a/src/coreclr/tests/src/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.csproj
+++ b/src/coreclr/tests/src/Loader/AssemblyDependencyResolver/MissingHostPolicyTests/MissingHostPolicyTests.csproj
@@ -8,6 +8,6 @@
     <Compile Include="InvalidHostingTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Loader/ContextualReflection/ContextualReflection.csproj b/src/coreclr/tests/src/Loader/ContextualReflection/ContextualReflection.csproj
index 710fb43..b92cd9e 100644 (file)
--- a/src/coreclr/tests/src/Loader/ContextualReflection/ContextualReflection.csproj
+++ b/src/coreclr/tests/src/Loader/ContextualReflection/ContextualReflection.csproj
@@ -10,6 +10,6 @@
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />
     <ProjectReference Include="ContextualReflectionDependency.csproj" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Loader/ContextualReflection/ContextualReflectionDependency.csproj b/src/coreclr/tests/src/Loader/ContextualReflection/ContextualReflectionDependency.csproj
index c679c5d..c0c41fa 100644 (file)
--- a/src/coreclr/tests/src/Loader/ContextualReflection/ContextualReflectionDependency.csproj
+++ b/src/coreclr/tests/src/Loader/ContextualReflection/ContextualReflectionDependency.csproj
@@ -5,6 +5,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="ContextualReflectionDependency.cs" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Loader/NativeLibs/FromNativePaths.csproj b/src/coreclr/tests/src/Loader/NativeLibs/FromNativePaths.csproj
index a3780b6..1778a4b 100644 (file)
--- a/src/coreclr/tests/src/Loader/NativeLibs/FromNativePaths.csproj
+++ b/src/coreclr/tests/src/Loader/NativeLibs/FromNativePaths.csproj
@@ -9,7 +9,7 @@
     <Compile Include="FromNativePaths.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/coreclr/tests/src/Loader/binding/tracing/BinderTracingTest.csproj b/src/coreclr/tests/src/Loader/binding/tracing/BinderTracingTest.csproj
index 74db0f4..1761bd0 100644 (file)
--- a/src/coreclr/tests/src/Loader/binding/tracing/BinderTracingTest.csproj
+++ b/src/coreclr/tests/src/Loader/binding/tracing/BinderTracingTest.csproj
@@ -11,7 +11,7 @@
     <Compile Include="Helpers.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="AssemblyToLoad.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/coreclr/tests/src/Regressions/common/AboveStackLimit.csproj b/src/coreclr/tests/src/Regressions/common/AboveStackLimit.csproj
index 4f07147..618327b 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/AboveStackLimit.csproj
+++ b/src/coreclr/tests/src/Regressions/common/AboveStackLimit.csproj
@@ -7,6 +7,6 @@
     <Compile Include="AboveStackLimit.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/ArrayCopy.csproj b/src/coreclr/tests/src/Regressions/common/ArrayCopy.csproj
index 805df41..09e10ff 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/ArrayCopy.csproj
+++ b/src/coreclr/tests/src/Regressions/common/ArrayCopy.csproj
@@ -8,6 +8,6 @@
     <Compile Include="ArrayCopy.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/CompEx.csproj b/src/coreclr/tests/src/Regressions/common/CompEx.csproj
index 50ab8b8..2f8050b 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/CompEx.csproj
+++ b/src/coreclr/tests/src/Regressions/common/CompEx.csproj
@@ -7,6 +7,6 @@
     <Compile Include="CompEx.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/DisableTransparencyEnforcement.csproj b/src/coreclr/tests/src/Regressions/common/DisableTransparencyEnforcement.csproj
index 12ad841..6e01cd7 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/DisableTransparencyEnforcement.csproj
+++ b/src/coreclr/tests/src/Regressions/common/DisableTransparencyEnforcement.csproj
@@ -8,6 +8,6 @@
     <Compile Include="DisableTransparencyEnforcement.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/Marshal.csproj b/src/coreclr/tests/src/Regressions/common/Marshal.csproj
index c3e36f7..f6049f4 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/Marshal.csproj
+++ b/src/coreclr/tests/src/Regressions/common/Marshal.csproj
@@ -8,6 +8,6 @@
     <Compile Include="Marshal.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/ThreadCulture.csproj b/src/coreclr/tests/src/Regressions/common/ThreadCulture.csproj
index cbe7622..1941297 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/ThreadCulture.csproj
+++ b/src/coreclr/tests/src/Regressions/common/ThreadCulture.csproj
@@ -8,6 +8,6 @@
     <Compile Include="ThreadCulture.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/ToLower.csproj b/src/coreclr/tests/src/Regressions/common/ToLower.csproj
index f06a889..bf7fc93 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/ToLower.csproj
+++ b/src/coreclr/tests/src/Regressions/common/ToLower.csproj
@@ -7,6 +7,6 @@
     <Compile Include="ToLower.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/Unsafe.csproj b/src/coreclr/tests/src/Regressions/common/Unsafe.csproj
index c3fe767..8b71348 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/Unsafe.csproj
+++ b/src/coreclr/tests/src/Regressions/common/Unsafe.csproj
@@ -8,6 +8,6 @@
     <Compile Include="unsafe.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/avtest.csproj b/src/coreclr/tests/src/Regressions/common/avtest.csproj
index 24eccc7..e5819f1 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/avtest.csproj
+++ b/src/coreclr/tests/src/Regressions/common/avtest.csproj
@@ -7,6 +7,6 @@
     <Compile Include="avtest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/interlock.csproj b/src/coreclr/tests/src/Regressions/common/interlock.csproj
index 0db5fe3..fcd2f15 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/interlock.csproj
+++ b/src/coreclr/tests/src/Regressions/common/interlock.csproj
@@ -8,6 +8,6 @@
     <Compile Include="interlock.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/pow3.csproj b/src/coreclr/tests/src/Regressions/common/pow3.csproj
index f9db91e..b3f9040 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/pow3.csproj
+++ b/src/coreclr/tests/src/Regressions/common/pow3.csproj
@@ -7,6 +7,6 @@
     <Compile Include="pow3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/test1307.csproj b/src/coreclr/tests/src/Regressions/common/test1307.csproj
index 2f3620d..65d8e44 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/test1307.csproj
+++ b/src/coreclr/tests/src/Regressions/common/test1307.csproj
@@ -8,6 +8,6 @@
     <Compile Include="test1307.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/testClass.csproj b/src/coreclr/tests/src/Regressions/common/testClass.csproj
index 95eadd9..26512cd 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/testClass.csproj
+++ b/src/coreclr/tests/src/Regressions/common/testClass.csproj
@@ -8,6 +8,6 @@
     <Compile Include="testClass.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/common/testInterface.csproj b/src/coreclr/tests/src/Regressions/common/testInterface.csproj
index 46b48e1..0b7e17f 100644 (file)
--- a/src/coreclr/tests/src/Regressions/common/testInterface.csproj
+++ b/src/coreclr/tests/src/Regressions/common/testInterface.csproj
@@ -8,6 +8,6 @@
     <Compile Include="testInterface.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0075/LargeArrayTest.csproj b/src/coreclr/tests/src/Regressions/coreclr/0075/LargeArrayTest.csproj
index ad8d8e1..c78266e 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0075/LargeArrayTest.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0075/LargeArrayTest.csproj
@@ -9,6 +9,6 @@
     <Compile Include="largearraytest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0099/AboveStackLimit.csproj b/src/coreclr/tests/src/Regressions/coreclr/0099/AboveStackLimit.csproj
index 46e3ab3..26836ac 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0099/AboveStackLimit.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0099/AboveStackLimit.csproj
@@ -9,6 +9,6 @@
     <Compile Include="abovestacklimit.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0138/pow3.csproj b/src/coreclr/tests/src/Regressions/coreclr/0138/pow3.csproj
index 04e0b8e..5ea20a4 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0138/pow3.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0138/pow3.csproj
@@ -9,6 +9,6 @@
     <Compile Include="pow3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0198/CompEx.csproj b/src/coreclr/tests/src/Regressions/coreclr/0198/CompEx.csproj
index f43ca1e..ad667df 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0198/CompEx.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0198/CompEx.csproj
@@ -9,6 +9,6 @@
     <Compile Include="compex.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0202/ThreadCulture.csproj b/src/coreclr/tests/src/Regressions/coreclr/0202/ThreadCulture.csproj
index c11f234..bb4d88d 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0202/ThreadCulture.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0202/ThreadCulture.csproj
@@ -9,6 +9,6 @@
     <Compile Include="threadculture.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0275/Marshal.csproj b/src/coreclr/tests/src/Regressions/coreclr/0275/Marshal.csproj
index 0980483..17f07c0 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0275/Marshal.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0275/Marshal.csproj
@@ -9,6 +9,6 @@
     <Compile Include="marshal.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0308/ToLower.csproj b/src/coreclr/tests/src/Regressions/coreclr/0308/ToLower.csproj
index 3603d5f..7b5ed87 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0308/ToLower.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0308/ToLower.csproj
@@ -9,6 +9,6 @@
     <Compile Include="tolower.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0341/PlatformCode.csproj b/src/coreclr/tests/src/Regressions/coreclr/0341/PlatformCode.csproj
index 4dfdc8e..ad66db1 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0341/PlatformCode.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0341/PlatformCode.csproj
@@ -9,6 +9,6 @@
     <Compile Include="platformcode.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0341/UserCode.csproj b/src/coreclr/tests/src/Regressions/coreclr/0341/UserCode.csproj
index f095856..f4750c7 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0341/UserCode.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0341/UserCode.csproj
@@ -9,6 +9,6 @@
     <Compile Include="usercode.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0342/unsafe.csproj b/src/coreclr/tests/src/Regressions/coreclr/0342/unsafe.csproj
index 238ae19..e082d1c 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0342/unsafe.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0342/unsafe.csproj
@@ -9,6 +9,6 @@
     <Compile Include="unsafe.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0570/Test570.csproj b/src/coreclr/tests/src/Regressions/coreclr/0570/Test570.csproj
index 01b26e2..80fe7cd 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0570/Test570.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0570/Test570.csproj
@@ -9,6 +9,6 @@
     <Compile Include="test570.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0584/Test584.csproj b/src/coreclr/tests/src/Regressions/coreclr/0584/Test584.csproj
index 746a5c7..2e1c3bc 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0584/Test584.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0584/Test584.csproj
@@ -12,6 +12,6 @@
     <Compile Include="test584.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0694/CriticalCode.csproj b/src/coreclr/tests/src/Regressions/coreclr/0694/CriticalCode.csproj
index bb5ae82..fb66440 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0694/CriticalCode.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0694/CriticalCode.csproj
@@ -9,6 +9,6 @@
     <Compile Include="criticalcode.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0939/test0939.csproj b/src/coreclr/tests/src/Regressions/coreclr/0939/test0939.csproj
index 3573cbd..4ec8b0f 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/0939/test0939.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/0939/test0939.csproj
@@ -9,6 +9,6 @@
     <Compile Include="test0939.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/1386/Co1727ctor_OO.csproj b/src/coreclr/tests/src/Regressions/coreclr/1386/Co1727ctor_OO.csproj
index 7733878..f02b431 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/1386/Co1727ctor_OO.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/1386/Co1727ctor_OO.csproj
@@ -9,6 +9,6 @@
     <Compile Include="co1727ctor_oo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/1514/InterlockExchange.csproj b/src/coreclr/tests/src/Regressions/coreclr/1514/InterlockExchange.csproj
index 5389595..8cd8ab2 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/1514/InterlockExchange.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/1514/InterlockExchange.csproj
@@ -9,6 +9,6 @@
     <Compile Include="interlockexchange.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/72162/Test72162.csproj b/src/coreclr/tests/src/Regressions/coreclr/72162/Test72162.csproj
index 5834292..013f775 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/72162/Test72162.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/72162/Test72162.csproj
@@ -9,6 +9,6 @@
     <Compile Include="test72162.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_11611/Test11611.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_11611/Test11611.csproj
index 658841d..ae8bf0f 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_11611/Test11611.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_11611/Test11611.csproj
@@ -9,6 +9,6 @@
     <Compile Include="test11611.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_12224/Test12224.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_12224/Test12224.csproj
index 4eff6b6..b11270a 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_12224/Test12224.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_12224/Test12224.csproj
@@ -10,6 +10,6 @@
     <Compile Include="test12224.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_16833/Test16833.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_16833/Test16833.csproj
index 4e45a37..50709a1 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_16833/Test16833.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_16833/Test16833.csproj
@@ -9,6 +9,6 @@
     <Compile Include="test16833.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_17398/test17398.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_17398/test17398.csproj
index 9d6aed3..87ad6a8 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_17398/test17398.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_17398/test17398.csproj
@@ -12,6 +12,6 @@
     <Compile Include="test17398.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_22348/Test22348.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_22348/Test22348.csproj
index c5cb1b6..85b489b 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_22348/Test22348.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_22348/Test22348.csproj
@@ -9,6 +9,6 @@
     <Compile Include="test22348.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_22888/test22888.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_22888/test22888.csproj
index 4388a9e..e9bf909 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_22888/test22888.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_22888/test22888.csproj
@@ -9,7 +9,7 @@
     <Compile Include="test22888.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="test22888resources.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_22888/test22888resources.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_22888/test22888resources.csproj
index 40a6c35..c627a59 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_22888/test22888resources.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_22888/test22888resources.csproj
@@ -14,6 +14,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_27937/Test27937.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_27937/Test27937.csproj
index c88ca1f..0e5a494 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_27937/Test27937.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_27937/Test27937.csproj
@@ -9,6 +9,6 @@
     <Compile Include="test27937.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/Regressions/coreclr/GitHub_7685/Test7685.csproj b/src/coreclr/tests/src/Regressions/coreclr/GitHub_7685/Test7685.csproj
index a2b253e..74c23cd 100644 (file)
--- a/src/coreclr/tests/src/Regressions/coreclr/GitHub_7685/Test7685.csproj
+++ b/src/coreclr/tests/src/Regressions/coreclr/GitHub_7685/Test7685.csproj
@@ -9,6 +9,6 @@
     <Compile Include="test7685.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj b/src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
index 547c95c..7634c27 100644 (file)
--- a/src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
@@ -10,6 +10,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="VT.ilproj" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/exceptions/simple/HardwareEh.csproj b/src/coreclr/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
index 82a611b..7fe88fa 100644 (file)
--- a/src/coreclr/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
@@ -9,7 +9,7 @@
     <Compile Include="HardwareEh.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
     <ProjectReference Include="ILHelper.ilproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj b/src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj
index 2c9c883..727a46c 100644 (file)
--- a/src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj
+++ b/src/coreclr/tests/src/baseservices/exceptions/simple/finally.csproj
@@ -9,6 +9,6 @@
     <Compile Include="finally.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj b/src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj
index 210291b..844b6a6 100644 (file)
--- a/src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj
+++ b/src/coreclr/tests/src/baseservices/multidimmarray/enum.csproj
@@ -9,6 +9,6 @@
     <Compile Include="enum.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
index ca3037e..941d86a 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
@@ -7,6 +7,6 @@
     <Compile Include="compareexchange1_cti.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
index fb945bc..c12d1c9 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
@@ -7,6 +7,6 @@
     <Compile Include="compareexchange2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
index 76a930e..bb63b97 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
@@ -7,6 +7,6 @@
     <Compile Include="compareexchange3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
index 11a85cc..b180ce4 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
@@ -7,6 +7,6 @@
     <Compile Include="compareexchange4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
index 833448a..b6c3b55 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
@@ -7,6 +7,6 @@
     <Compile Include="compareexchange5_cti.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
index 2567b0a..386ab3c 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
@@ -7,6 +7,6 @@
     <Compile Include="exchange1_cti.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
index c53bef3..ba05fbc 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
@@ -7,6 +7,6 @@
     <Compile Include="exchange2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
index 6574d26..f8252bb 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
@@ -7,6 +7,6 @@
     <Compile Include="exchange3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
index db6234a..54829e5 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
@@ -7,6 +7,6 @@
     <Compile Include="exchange4.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
index c4cfcda..9d727b4 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
@@ -7,6 +7,6 @@
     <Compile Include="exchange4_cti.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
index 1bac626..c9c8c35 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
@@ -7,6 +7,6 @@
     <Compile Include="exchange5_cti.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj b/src/coreclr/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
index d4da171..db50582 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
@@ -7,6 +7,6 @@
     <Compile Include="mutexctor1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj b/src/coreclr/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
index 19b214c..e9ffe2c 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
@@ -7,6 +7,6 @@
     <Compile Include="mutexctor2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/mutex/misc/waitone1.csproj b/src/coreclr/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
index 268fe2f..d23b621 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
@@ -7,6 +7,6 @@
     <Compile Include="waitone1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/mutex/misc/waitone2.csproj b/src/coreclr/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
index 2e982d5..00e87f3 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
@@ -8,6 +8,6 @@
     <Compile Include="waitone2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj b/src/coreclr/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
index 054faae..a29d83f 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
@@ -7,6 +7,6 @@
     <Compile Include="waithandledispose2.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj b/src/coreclr/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
index 8d71b0b..b8abb0e 100644 (file)
--- a/src/coreclr/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
+++ b/src/coreclr/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
@@ -8,6 +8,6 @@
     <Compile Include="waithandlewaitone1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
 </Project>

diff --git a/src/coreclr/tests/src/baseservices/typeequivalence/simple/Simple.csproj b/src/coreclr/tests/src/baseservices/typeequivalence/simple/Simple.csproj
index 0fb662a..13f0dbd 100644 (file)
--- a/src/coreclr/tests/src/baseservices/typeequivalence/simple/Simple.csproj
+++ b/src/coreclr/tests/src/baseservices/typeequivalence/simple/Simple.csproj
@@ -12,7 +12,7 @@
       <EmbedTypes>true</EmbedTypes>
     </ProjectReference>
     <ProjectReference Include="../impl/TypeImpl.csproj" />
-    <ProjectReference Include="$(SourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('TypeEquivalence.targets', '$(MSBuildThisFileDirectory)../'))" />
 </Project>

diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj
index 9488cc0..f313b4d 100644 (file)
--- a/src/coreclr/tests/src/runtest.proj
+++ b/src/coreclr/tests/src/runtest.proj
@@ -93,7 +93,7 @@ $(_XunitEpilog)
         <![CDATA[
 <Project>
 
-  <Import Project="$(ProjectDir)dir.sdkbuild.props" />
+  <Import Project="$(TestProjectDir)dir.sdkbuild.props" />
 
   <PropertyGroup>
     <OutputPath>$(XUnitTestBinBase)\$(CategoryWithSlash)</OutputPath>
@@ -107,7 +107,7 @@ $(_XunitEpilog)
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(SourceDir)Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" />
+    <ProjectReference Include="$(TestSourceDir)Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/coreclr/tests/src/sizeondisk/Directory.Build.props b/src/coreclr/tests/src/sizeondisk/Directory.Build.props
index 66826a2..6826b67 100644 (file)
--- a/src/coreclr/tests/src/sizeondisk/Directory.Build.props
+++ b/src/coreclr/tests/src/sizeondisk/Directory.Build.props
@@ -2,6 +2,6 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <ProjectAssetsFile>$(SourceDir)performance/obj/project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile>$(TestSourceDir)performance/obj/project.assets.json</ProjectAssetsFile>
   </PropertyGroup>
 </Project>