diff options
21 files changed, 22 insertions, 1 deletions
diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index ca742f725a5..5ce3bc2a617 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -67,10 +67,11 @@ <PropertyGroup> <!-- Since bug in Roslyn for Linux empty DebugType property leads to build failure. See issue Roslyn@20343 --> <DebugType Condition=" '$(DebugType)' == '' and '$(RunningOnUnix)' == 'true' ">None</DebugType> + <TestLibraryProjectPath>$(RepoRoot)\src\tests\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj</TestLibraryProjectPath> </PropertyGroup> <ItemGroup> - <ProjectReference Include="$(RepoRoot)\src\tests\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj" /> + <ProjectReference Include="$(TestLibraryProjectPath)" Condition="'$(IsMergedTestRunnerAssembly)' == 'true'" /> </ItemGroup> <!-- diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj index 531ce07aeac..4c766a96d21 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_d.ilproj @@ -8,5 +8,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="i_array_merge_Target_32BIT.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj index 84186e675a8..7352778f4ed 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_32BIT_il_r.ilproj @@ -8,5 +8,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="i_array_merge_Target_32BIT.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj index e8c868f8bb4..1dfb8b43421 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_d.ilproj @@ -8,5 +8,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="i_array_merge_Target_64BIT.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj index 607ff707ff6..98279148a24 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/i_array_merge_Target_64BIT_il_r.ilproj @@ -8,5 +8,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="i_array_merge_Target_64BIT.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj index c2fb76183ba..04e6f391ad0 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_d.ilproj @@ -8,5 +8,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="u_array_merge_Target_32BIT.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj index 8586617b20b..8a1f959bfda 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_32BIT_il_r.ilproj @@ -8,5 +8,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="u_array_merge_Target_32BIT.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj index e4ee642624a..7130e786e08 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_d.ilproj @@ -8,5 +8,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="u_array_merge_Target_64BIT.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj index a659ec66de1..a4c81e4c46c 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_array_merge_Target_64BIT_il_r.ilproj @@ -8,5 +8,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="u_array_merge_Target_64BIT.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj index e28723ec720..9bb4a8f94fd 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_d.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof32_Target_32Bit_x86.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj index c768ac7341f..0022853cbbf 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_32Bit_x86_il_r.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof32_Target_32Bit_x86.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj index a9135247c47..36668b38117 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_d.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof32_Target_64Bit_and_arm.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj index 6fbcd8d829d..b5d17bd7920 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof32_Target_64Bit_and_arm_il_r.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof32_Target_64Bit_and_arm.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj index bcaabf8519f..c4f863d5688 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_d.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof64_Target_32Bit_x86.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj index 010eac66a3b..a5999939913 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_32Bit_x86_il_r.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof64_Target_32Bit_x86.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj index 277bf9df822..6fa99bd603e 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_d.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof64_Target_64Bit_and_arm.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj index aaa631637e8..b2fac6028c5 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof64_Target_64Bit_and_arm_il_r.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof64_Target_64Bit_and_arm.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj index 645a4c5264c..1167472c5e6 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_d.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof_Target_32Bit_x86.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj index 2ecc39a51ab..5b95d060f63 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_32Bit_x86_il_r.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof_Target_32Bit_x86.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj index dbc328adc06..8545651000d 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_d.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof_Target_64Bit_and_arm.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> diff --git a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj index 5fe7c26bf9d..a52d4b5b111 100644 --- a/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj +++ b/src/tests/JIT/Methodical/xxobj/sizeof/sizeof_Target_64Bit_and_arm_il_r.ilproj @@ -9,5 +9,6 @@ </PropertyGroup> <ItemGroup> <Compile Include="sizeof_Target_64Bit_and_arm.il" /> + <ProjectReference Include="$(TestLibraryProjectPath)" /> </ItemGroup> </Project> |