From ca90ee945f92f3a70abcdbd917ce7cf755d0bc13 Mon Sep 17 00:00:00 2001
From: Vitek Karas <vitek.karas@microsoft.com>
Date: Fri, 14 Sep 2018 21:18:21 -0700
Subject: [PATCH] Fix build break in P1 tests (dotnet/coreclr#19975)

Commit migrated from https://github.com/dotnet/coreclr/commit/799508eb77045482d1e2bf13c6696c6b248de0b6
---
 src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.cs      | 2 +-
 src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj  | 2 +-
 .../src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.cs      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.cs b/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.cs
index 5e18a39..49b670f 100644
--- a/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.cs
+++ b/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.cs
@@ -9,7 +9,7 @@ using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.InteropServices;
 using System.Threading;
-using CoreFXTestLibrary;
+using TestLibrary;
 
 using Console = Internal.Console;
 
diff --git a/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj b/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
index fd5c9db..689e124 100644
--- a/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
+++ b/src/coreclr/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Interop.settings.targets))\Interop.settings.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -31,7 +32,6 @@
   <ItemGroup>
     <!-- This is needed to make sure native binary gets installed in the right location -->
     <ProjectReference Include="CMakeLists.txt" />
-    <ProjectReference Include="..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.cs b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.cs
index 431ba14..184334b 100644
--- a/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.cs
+++ b/src/coreclr/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 using System;
 using System.Reflection;
 using System.Text;
-using CoreFXTestLibrary;
+using TestLibrary;
 
 class Test
 {
-- 
2.7.4