adding outerBuild\InnerBuild structure for generate reference source (d…

…otnet#31892) * Using new custom target from arcade * removing the outerbuild directory
gugavaro · Feb 12, 2020 · 3cd83d8 · 3cd83d8
1 parent bd98efe
commit 3cd83d8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/eng/outerBuild.targets b/eng/outerBuild.targets
@@ -0,0 +1,8 @@
+<Project>
+  <Target Name="GenerateReferenceSource" DependsOnTargets="GetProjectWithBestTargetFrameworks">
+    <MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
+             Targets="GenerateReferenceSource"
+             BuildInParallel="$(BuildInParallel)">
+    </MSBuild>
+  </Target>
+</Project>
diff --git a/eng/testing/outerBuild.targets b/eng/testing/outerBuild.targets
@@ -1,17 +1,6 @@
 <Project>
-  <Target Name="Test">
-    <ChooseBestTargetFrameworksTask BuildTargetFrameworks="$(BuildTargetFramework)-$(OSGroup)"
-                                    SupportedTargetFrameworks="$(TargetFrameworks)"
-                                    RuntimeGraph="$(RuntimeGraph)" >
-      <Output TaskParameter="BestTargetFrameworks" ItemName="_BestTargetFramework" />
-    </ChooseBestTargetFrameworksTask>
-
-    <AddTargetFrameworksToProjectTask ProjectName="$(MSBuildProjectFile)"
-                                      BestTargetFrameworks="@(_BestTargetFramework)" >
-      <Output TaskParameter="InnerBuildProjects" ItemName="TestProject" />
-    </AddTargetFrameworksToProjectTask>
-
-    <MSBuild Projects="@(TestProject)"
+  <Target Name="Test" DependsOnTargets="GetProjectWithBestTargetFrameworks">    
+    <MSBuild Projects="@(InnerBuildProjectsWithBestTargetFramework)"
              Targets="Test"
              BuildInParallel="$(BuildInParallel)">
     </MSBuild>

diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
@@ -144,6 +144,8 @@
     <Message Text="Generated reference assembly source code: $(_RefSourceFileOutputPath)" />
   </Target>
 
+  <Import Project="$(RepositoryEngineeringDir)outerBuild.targets" Condition="'$(IsCrossTargetingBuild)' == 'true'" />
+
   <!-- Import Packaging targets -->
   <Import Project="$(RepositoryEngineeringDir)packaging.targets" />