diff options
-rw-r--r-- | eng/outerBuild.targets | 8 | ||||
-rw-r--r-- | eng/testing/outerBuild.targets | 15 | ||||
-rw-r--r-- | src/libraries/Directory.Build.targets | 2 |
3 files changed, 12 insertions, 13 deletions
diff --git a/eng/outerBuild.targets b/eng/outerBuild.targets new file mode 100644 index 00000000000..dd546d6bd6f --- /dev/null +++ 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 index ece58160db3..4623b0e54d2 100644 --- 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 index 3a551791047..231bc922ea2 100644 --- 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" /> |