Stop groveling for project.json files when building every test.

This information is only needed by build.proj. Do not compute it in dir.props,
which is included by every test project.

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

diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj
index 6d5e456..0dfd84d 100644 (file)
--- a/src/coreclr/tests/build.proj
+++ b/src/coreclr/tests/build.proj
@@ -35,6 +35,11 @@
   <!-- Tasks from buildtools for easy project.json dependency updates -->
   <UsingTask TaskName="UpdatePackageDependencyVersion" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" />
 
+  <!-- Create a collection of all project.json files for dependency updates. -->
+  <ItemGroup>
+    <ProjectJsonFiles Include="$(SourceDir)**\project.json" />
+  </ItemGroup>
+
   <Target Name="UpdatePackageDependencyVersion">
     <UpdatePackageDependencyVersion ProjectJsons="@(ProjectJsonFiles)"
                                     PackageId="$(PackageId)"

diff --git a/src/coreclr/tests/dir.props b/src/coreclr/tests/dir.props
index 8d7c8b8..9d93e93 100644 (file)
--- a/src/coreclr/tests/dir.props
+++ b/src/coreclr/tests/dir.props
@@ -82,11 +82,6 @@
     <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand>
   </PropertyGroup>
 
-  <!-- Create a collection of all project.json files for dependency updates. -->
-  <ItemGroup>
-    <ProjectJsonFiles Include="$(SourceDir)**\project.json" />
-  </ItemGroup>
-
   <!-- Which tests shall we build? Default: Priority 0 tests.
     At the command-line, the user can specify /p:CLRTestPriorityToBuild=666 (for example), and
     all tests with CLRTestPriority 666,..., 1 AND 0 will build.