Fix incremental build restore: move generated test_runtime project.json to bin (...

* Move generated test_runtime project.json to bin.

* Update helix tasks to point to moved test_runtime files.

* Remove unnecessary TestRuntimeDependenciesJson property.

diff --git a/tests/dir.props b/tests/dir.props
index 088d510..c456700 100644 (file)
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -109,9 +109,7 @@
 
   <!-- Create a collection of all project.json files for dependency updates. -->
   <ItemGroup>
-    <!-- Skip validation of the test_runtime project created by the test build. -->
-    <ProjectJsonFiles Include="$(SourceDir)**\project.json"
-                      Exclude="$(SourceDir)Common\test_runtime\project.json" />
+    <ProjectJsonFiles Include="$(SourceDir)**\project.json" />
   </ItemGroup>
 
   <!-- Which tests shall we build? Default: Priority 0 tests.

diff --git a/tests/helix.targets b/tests/helix.targets
index 187ba94..36b1431 100644 (file)
--- a/tests/helix.targets
+++ b/tests/helix.targets
@@ -25,6 +25,7 @@
     </PropertyGroup>
     <ItemGroup>
       <TestNugetProjectLockFile Include="$(SourceDir)$(Category)\**\project.lock.json"/>
+      <TestNugetProjectLockFile Include="$(TestRuntimeProjectLockJson)"/>
     </ItemGroup>
   </Target>
 

diff --git a/tests/helixperftasks.targets b/tests/helixperftasks.targets
index c28cc13..73046cf 100644 (file)
--- a/tests/helixperftasks.targets
+++ b/tests/helixperftasks.targets
@@ -14,17 +14,12 @@
       <Output TaskParameter="PerfTestAssemblies" ItemName="CoreCLRPerfTest" />
     </GetPerfTestAssemblies>
 
-    <PropertyGroup>
-      <TestRuntimeDependenciesJson>$(SourceDir)Common\test_runtime\project.json</TestRuntimeDependenciesJson>
-      <TestRuntimeProjectLockJson>$(SourceDir)Common\test_runtime\project.lock.json</TestRuntimeProjectLockJson>
-    </PropertyGroup>
-
     <ItemGroup>
      <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
     </ItemGroup>
 
     <!-- Restore the runtime dependencies -->
-    <Exec Command="$(DnuRestoreCommand) &quot;$(TestRuntimeDependenciesJson)&quot;"
+    <Exec Command="$(DnuRestoreCommand) &quot;$(TestRuntimeProjectJson)&quot;"
            StandardOutputImportance="Low"
            CustomErrorRegularExpression="^Unable to resolve .*"
            IgnoreExitCode="true"

diff --git a/tests/runtest.proj b/tests/runtest.proj
index 7bace14..01f7fb1 100644 (file)
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -382,9 +382,11 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
       </TestRuntimeJsonContents>
     </PropertyGroup>
 
+    <MakeDir Directories="$(TestRuntimeProjectJsonDir)" Condition="!Exists('$(TestRuntimeProjectJsonDir)')" />
+
     <!-- Write the file -->
     <WriteLinesToFile
-      File="src\Common\test_runtime\project.json"
+      File="$(TestRuntimeProjectJson)"
       Lines="$(TestRuntimeJsonContents)"
       Overwrite="true" />
 

diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj
index 9374e36..0416083 100644 (file)
--- a/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/tests/src/Common/test_runtime/test_runtime.csproj
@@ -12,7 +12,7 @@
      <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" /> 
   </ItemGroup>
   <ItemGroup>
-    <None Include="project.json" />
+    <None Include="$(TestRuntimeProjectJson)" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <Target Name="Build" /> 

diff --git a/tests/src/dir.common.props b/tests/src/dir.common.props
index 4cc833b..f1700f5 100644 (file)
--- a/tests/src/dir.common.props
+++ b/tests/src/dir.common.props
@@ -51,6 +51,13 @@
     <TestPath Condition="'$(TestPath)'==''">$(TestWorkingDir)$(OSPlatformConfig)\$(MSBuildProjectName)/</TestPath>
   </PropertyGroup>
 
+  <!-- Setup the output location for the project.json generated for the local CoreCLR build. -->
+  <PropertyGroup>
+    <TestRuntimeProjectJsonDir>$(BaseOutputPath)\test_runtime</TestRuntimeProjectJsonDir>
+    <TestRuntimeProjectJson>$(TestRuntimeProjectJsonDir)\project.json</TestRuntimeProjectJson>
+    <TestRuntimeProjectLockJson>$(TestRuntimeProjectJsonDir)\project.lock.json</TestRuntimeProjectLockJson>
+  </PropertyGroup>
+
   <!-- Default priority building values. -->
   <PropertyGroup>
     <CLRTestKind Condition="'$(CLRTestKind)' == ' '">BuildAndRun</CLRTestKind>