Fix sequencing of MakeCommonResourcesPriFile (dotnet/corefx#38707)

* Fix sequencing of MakeCommonResourcesPriFile

* Disable pri file generation on allconfigs

* Disable testhost binplacing on allconfigurations

* Disable uap tool restore without testhost

* Manual darc update from build '20190421.1'

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

diff --git a/eng/restore/uap-tools.targets b/eng/restore/uap-tools.targets
index 2956bd1..5dbccee 100644 (file)
--- a/eng/restore/uap-tools.targets
+++ b/eng/restore/uap-tools.targets
@@ -2,7 +2,7 @@
 
    <!-- Retrieve the UAP Tools to the TestHost folder -->
   <Target Name="CopyUAPToolsToTestHost"
-          Condition="'$(TargetGroup)' == 'uap' and '$(DotNetBuildFromSource)' != 'true'"
+          Condition="'$(TargetGroup)' == 'uap' and '$(BuildAllConfigurations)' != 'true' and '$(DotNetBuildFromSource)' != 'true'"
           AfterTargets="Restore">
 
     <PropertyGroup>

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index fd32c37..2184f94 100644 (file)
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -8,6 +8,7 @@
     <CoverageReportDir>$(ArtifactsDir)coverage</CoverageReportDir>
     <!-- For UAP we are using an APPX that is registered with a unique ID. Because of that we need to run tests sequentially -->
     <SerializeProjects Condition="'$(BuildingUAPVertical)' == 'true' or '$(Coverage)' == 'true'">true</SerializeProjects>
+    <TraversalBuildDependsOn Condition="'$(BuildingUAPVertical)' == 'true' and '$(BuildAllConfigurations)' != 'true'">MakeCommonResourcesPriFile;$(TraversalBuildDependsOn)</TraversalBuildDependsOn>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(BuildAllConfigurations)' != 'true'">
@@ -28,7 +29,7 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
   <Target Name="Build" DependsOnTargets="BuildAllProjects" />
-  <Target Name="BuildAllProjects" DependsOnTargets="FilterProjects">
+  <Target Name="BuildAllProjects" DependsOnTargets="$(TraversalBuildDependsOn);FilterProjects">
     <MSBuild Targets="Build"
              Projects="@(Project)"
              Properties="BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration);%(Project.AdditionalProperties)"