Refactor pre-test targets (dotnet/corefx#34973)

* Refactor pre-test targets

Moves pre-testing targets to their own project that builds after others, rather than as targets in dirs.proj.

Use the GenerateTestSharedFrameworkDepsFile from the CoreFxTesting package rather than from buildtools.

* Manually update Arcade to latest

Commit migrated from https://github.com/dotnet/corefx/commit/f1336fa043309e587dee5e3d59ee04249ddff97b

diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index 976d975..cf1d17e 100644 (file)
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -13,63 +13,12 @@
     <Project Include="src.builds" />
     <Project Include="shims\manual\*.csproj" />
     <Project Include="shims\ApiCompat.proj" />
+    <Project Include="pretest.builds" />
   </ItemGroup>
   
-  <PropertyGroup>
-    <GenerateDepsJsonTaskDll>$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll</GenerateDepsJsonTaskDll>
-  </PropertyGroup>
-
-  <UsingTask TaskName="GenerateDepsJson" AssemblyFile="$(GenerateDepsJsonTaskDll)"/>
-  <!-- After we build all the source libraries we need to generate a deps.json file for the shared test framework -->
-  <Target Name="GenerateTestSharedFrameworkDepsFile" AfterTargets="BuildAllProjects" Condition="'$(BinplaceTestSharedFramework)' == 'true'">
-
-    <ItemGroup>
-      <!-- This is for HostPolicy, CoreCLR and Jit dependencies to continue to remain inside of the dep.json -->
-      <ExceptionForDepsJson Include="microsoft.netcore.app" />
-
-      <!-- TODO: We should see about generating this from scratch instead of relying on a previous deps file as a template -->
-      <_sharedFrameworkDepsJson Include="$(DotNetRoot)shared\Microsoft.NETCore.App\*\Microsoft.NETCore.App.deps.json" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <_OriginalDepsJsonPath>%(_sharedFrameworkDepsJson.FullPath)</_OriginalDepsJsonPath>
-      <_OutputTestSharedFrameworkDepsPath>$(NETCoreAppTestSharedFrameworkPath)\Microsoft.NETCore.App.deps.json</_OutputTestSharedFrameworkDepsPath>
-    </PropertyGroup>
-
-    <GenerateDepsJson DepsJsonPath="$(_OriginalDepsJsonPath)"
-                      GenerateNewDepsJson="true"
-                      RuntimeDirectory="$(NETCoreAppTestSharedFrameworkPath)"
-                      DepsExceptions="@(ExceptionForDepsJson)"
-                      OutputPath="$(_OutputTestSharedFrameworkDepsPath)"/>
-  </Target>
-
   <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
     <Project Include="$(DirectoryToBuild)/**/*.csproj" />
   </ItemGroup>
 
   <Import Project="..\dir.traversal.targets" />
-
-  <!-- Generate the shared library for running ILC tests for configuration Release-x64 -->
-  <Target Name="GenerateSharedLibraryForILC" AfterTargets="BuildAllProjects" Condition="'$(EnableMultiFileILCTests)' == 'true'">
-    <Message Importance="High" Text="Generating shared library for running ILC tests." Condition="Exists('$(InternalTestILCFolder)\ilc.exe')" />
-    <Exec Command="$(InternalTestILCFolder)\ilc.exe -buildSharedAssemblies -buildType ret -frameworkPath &quot;$(ILCFXInputFolder)&quot;" StandardOutputImportance="Low" Condition="Exists('$(TestHostRootPath)\TestILC\ilc.exe')" />
-  </Target>
-
-    <!-- Generate launch settings support files to enable VS debugging. -->
-  <Target Name="GenerateLaunchSettingsFiles" BeforeTargets="BuildAllProjects" Condition="'$(EnableLaunchSettings)' == 'true'">
-    <PropertyGroup>
-      <_TestProjectRootDir>$(SourceDir)</_TestProjectRootDir>
-      <_TestProjectRootDir Condition="'$(DirectoryToBuild)'!=''">$(DirectoryToBuild)</_TestProjectRootDir>
-    </PropertyGroup>
-    <ItemGroup>
-      <!-- Keep in sync with pattern for test projects in tests.builds -->
-      <TestProjects Include="$(_TestProjectRootDir)*\tests\**\*Tests.csproj" />
-      <TestProjects Include="$(_TestProjectRootDir)*\tests\**\*Tests.vbproj" />
-    </ItemGroup>
-
-    <MSBuild Projects="@(TestProjects)"
-             Targets="GenerateLaunchSettingsFile"
-             ContinueOnError="ErrorAndContinue" />
-  </Target>
-
 </Project>

diff --git a/src/libraries/pretest.builds b/src/libraries/pretest.builds
new file mode 100644 (file)
index 0000000..b494642
--- /dev/null
+++ b/src/libraries/pretest.builds
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Directory.Build.props" />
+
+  <PropertyGroup>
+    <!-- Enable GenerateTestSharedFrameworkDepsFile from CoreFxTesting package -->
+    <GenerateTestSharedFrameworkDepsFile Condition="'$(BinplaceTestSharedFramework)' == 'true'">true</GenerateTestSharedFrameworkDepsFile>
+  </PropertyGroup>
+
+  <Target Name="Build" DependsOnTargets="GenerateTestSharedFrameworkDepsFile;GenerateSharedLibraryForILC;GenerateLaunchSettingsFiles" />
+
+  <!-- Generate the shared library for running ILC tests for configuration Release-x64 -->
+  <Target Name="GenerateSharedLibraryForILC" Condition="'$(EnableMultiFileILCTests)' == 'true'">
+    <Message Importance="High" Text="Generating shared library for running ILC tests." Condition="Exists('$(InternalTestILCFolder)\ilc.exe')" />
+    <Exec Command="$(InternalTestILCFolder)\ilc.exe -buildSharedAssemblies -buildType ret -frameworkPath &quot;$(ILCFXInputFolder)&quot;" StandardOutputImportance="Low" Condition="Exists('$(TestHostRootPath)\TestILC\ilc.exe')" />
+  </Target>
+
+  <!-- Generate launch settings support files to enable VS debugging. -->
+  <Target Name="GenerateLaunchSettingsFiles" Condition="'$(EnableLaunchSettings)' == 'true'">
+    <PropertyGroup>
+      <_TestProjectRootDir>$(SourceDir)</_TestProjectRootDir>
+      <_TestProjectRootDir Condition="'$(DirectoryToBuild)'!=''">$(DirectoryToBuild)</_TestProjectRootDir>
+    </PropertyGroup>
+    <ItemGroup>
+      <!-- Keep in sync with pattern for test projects in tests.builds -->
+      <TestProjects Include="$(_TestProjectRootDir)*\tests\**\*Tests.csproj" />
+      <TestProjects Include="$(_TestProjectRootDir)*\tests\**\*Tests.vbproj" />
+    </ItemGroup>
+
+    <MSBuild Projects="@(TestProjects)"
+             Targets="GenerateLaunchSettingsFile"
+             ContinueOnError="ErrorAndContinue" />
+  </Target>
+
+  <Import Project="Directory.Build.targets" />
+</Project>