Use static configurations for building a vertical (#14489)

* Build each configuration of corefx tools

* Fully qualify path to props files for import

* Build using static configurations

* Package build, ignore references to System.Threading.Overlapped and
System.Runtime.Serialization.Formatters which aren't being built at the
moment.

* Rename target

* Remove unintentional add of baseline file

* Configuration fixes, fix typo in netci.groovy, re-enable specifying
OSGroup property

* Interim build, overbuilds reference assemblies

* Reduce to passing Configurations

* Fix traversal, undefine configuration for contract projects, remove
trimunconverted (not used)

* lower message importance

* Minor fixes, changing messages, fixing comment

* system.runtime.extensions contract causes binclash because it requires a
configuration.  temporarily disable configuration

* Fix trimming of projects

* Eliminate circular dependency in package build

* Fix OSX build

* Cleanup, less msbuild invocations

1 files changed, 11 insertions, 25 deletions

diff --git a/dir.traversal.targets b/dir.traversal.targets
index 1bfd6f6a67..606a3e6867 100644
--- a/dir.traversal.targets
+++ b/dir.traversal.targets
@@ -28,27 +28,27 @@
   </Target>
 
   <!-- build vertical requires the FindBestConfiguration task which is currently in CoreFx.Tools.dll -->
-  <Import Project="buildvertical.targets" Condition="Exists('$(CoreFxToolsTaskDir)CoreFx.Tools.dll')" />
+  <Import Project="buildvertical.targets" Condition="'$(ImportedBuildVerticalTargets)' != 'true' and Exists('$(CoreFxToolsTaskDir)CoreFx.Tools.dll')" />
 
   <Target Name="BuildAllProjects">
     <PropertyGroup>
       <DefaultBuildAllTarget Condition="'$(DefaultBuildAllTarget)'==''">$(MSBuildProjectDefaultTargets)</DefaultBuildAllTarget>
     </PropertyGroup>
 
-    <MSBuild Targets="AnnotateProjectsWithConfiguration"
-             Projects="@(Project)">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="ProjectWithConfiguration" />
-    </MSBuild>
-
-    <Message Text="%(ProjectWithConfiguration.Identity) - %(ProjectWithConfiguration.AdditionalProperties)" Importance="High" />
+   <!-- Clear ProjectWithConfiguration to prevent circular dependency -->
+   <ItemGroup><ProjectWithConfiguration Remove="@(ProjectWithConfiguration)" /></ItemGroup>
+   <MSBuild Targets="AnnotateProjectsWithConfiguration" 
+            Projects="@(Project)"> 
+     <Output TaskParameter="TargetOutputs" 
+             ItemName="ProjectWithConfiguration" /> 
+   </MSBuild> 
 
     <!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity
          however since the project names are unique it will essentially force each to run in its own batch -->
     <MSBuild Targets="$(DefaultBuildAllTarget)"
              Projects="@(ProjectWithConfiguration)"
              Condition="'$(SerializeProjects)'=='true' AND '%(Identity)' != ''"
-             Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration);%(ProjectWithConfiguration.AdditionalProperties)"
+             Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration)"
              ContinueOnError="ErrorAndContinue" />
 
     <MSBuild Targets="$(DefaultBuildAllTarget)"
@@ -218,7 +218,7 @@
 
   <PropertyGroup>
     <TraversalBuildDependsOn>
-      BuildAllProjects
+      BuildAllProjects;
       $(TraversalBuildDependsOn);
     </TraversalBuildDependsOn>
 
@@ -256,19 +256,5 @@
 
   <!-- Target will be overridden if buildagainstpackages.targets is imported. -->
   <Target Name="GenerateTestProjectJson" />
-
-  <!-- Target will be overriden if buildvertical.targets is imported -->
-  <Target Name="GetBuildConfigurations" />
-  <Target Name="FindBestConfiguration" />
-  <Target Name="AnnotateProjectsWithConfiguration"
-          Returns="@(ProjectWithConfiguration)" >
-    <Message Text="%(Project.Identity) - (%(Project.TargetGroup) - %(Project.OSGroup))" Importance="High" />
-    <ItemGroup>
-      <ProjectWithConfiguration Include="%(Project.Identity)">
-        <AdditionalProperties Condition="'%(Project.TargetGroup)' != ''">TargetGroup=%(Project.TargetGroup);OSGroup=%(Project.OSGroup)</AdditionalProperties>
-      </ProjectWithConfiguration>
-    </ItemGroup>
-  </Target>
-
-  <Import Condition="'$(_BuildAgainstPackages)' == 'true'" Project="$(ToolsDir)/buildagainstpackages.targets" />
+ <Import Condition="'$(_BuildAgainstPackages)' == 'true'" Project="$(ToolsDir)/buildagainstpackages.targets" />
 </Project>