Linker Testing: Use a central target for copying reflection roots.

Copy the test.refect.xml file (if one exists) as part of the
AfterBuild job -- so that individual tests need not identify
the CopyReflectionRoots explicitly as a default target.

Commit migrated from https://github.com/dotnet/coreclr/commit/d532bfced676ac0e3051d2468ad01f793ab2fb84

diff --git a/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj b/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj
index 90f0e1e..6569ad3 100644 (file)
--- a/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj
+++ b/src/coreclr/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/coreclr/tests/src/GC/Scenarios/ReflectObj/reflectobj.csproj b/src/coreclr/tests/src/GC/Scenarios/ReflectObj/reflectobj.csproj
index fc7541e..ae02ffb 100644 (file)
--- a/src/coreclr/tests/src/GC/Scenarios/ReflectObj/reflectobj.csproj
+++ b/src/coreclr/tests/src/GC/Scenarios/ReflectObj/reflectobj.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
index a285fc1..0c880da 100644 (file)
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
index d873ebd..59e45d5 100644 (file)
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
index 15a6a4a..1bc8a3d 100644 (file)
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

diff --git a/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj b/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
index 61a1808..c87d2e3 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
+++ b/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>self_override1</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override2.ilproj b/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override2.ilproj
index 251cbe8..6993be5 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override2.ilproj
+++ b/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override2.ilproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>self_override2</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override3.ilproj b/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override3.ilproj
index def7ebc..f76db30 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override3.ilproj
+++ b/src/coreclr/tests/src/Loader/classloader/MethodImpl/self_override3.ilproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>self_override3</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.csproj
index 8598d3b..2414ec8 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>CastClass001</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.csproj
index a27cfc6..0012262 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>CastClass004</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.csproj
index a2768d4..ed458a1 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>IsInst001</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.csproj
index 10ae4c3..c500ea0 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>IsInst002</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.csproj
index 8736a20..6dd22dc 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>IsInst003</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.csproj
index 0aff56e..d8a2865 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>IsInst004</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.csproj
index 066ba8d..b41f2e2 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>IsInst005</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.csproj
index add8716..e07723c 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>IsInst006</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.csproj
index 8d41927..b88aab5 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>Unbox001</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.csproj
index b20d735..f83d730 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>Unbox002</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.csproj
index 09530a6..46e9cd8 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>Unbox003</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.csproj
index bb40a72..76485ad 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>Unbox004</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.csproj
index 7f2a49b..b64980f 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>Unbox005</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.csproj
index 69efc60..6b65e4c 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>Unbox006</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.csproj b/src/coreclr/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.csproj
index 83b7efb..1a987c5 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>TestObjectGetTypeVirtual</AssemblyName>

diff --git a/src/coreclr/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.csproj b/src/coreclr/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.csproj
index dee60aa..dd02707 100644 (file)
--- a/src/coreclr/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.csproj
+++ b/src/coreclr/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build;CopyReflectionRoots" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <AssemblyName>dev11_95728</AssemblyName>

diff --git a/src/coreclr/tests/src/dir.targets b/src/coreclr/tests/src/dir.targets
index 336a0b0..08c77df 100644 (file)
--- a/src/coreclr/tests/src/dir.targets
+++ b/src/coreclr/tests/src/dir.targets
@@ -184,9 +184,9 @@
 
   </Target>
 
-  <Target Name="CopyReflectionRoots">  
-    <Copy SourceFiles="$(AssemblyName).reflect.xml" 
-          DestinationFolder="$(OutputPath)"
-         Condition="Exists('$(AssemblyName).reflect.xml')"/>  
-  </Target>  
+  <Target Name="AfterBuild">
+     <Copy SourceFiles="$(AssemblyName).reflect.xml"
+           DestinationFolder="$(OutputPath)"
+       Condition="Exists('$(AssemblyName).reflect.xml')"/>
+  </Target>
 </Project>