Merge pull request dotnet/corefx#15335 from ericstj/useConfigurationI…

…nExternal

Use BuildConfigurations for external

Commit migrated from dotnet/corefx@8252e11

src/libraries/Tools/GenerateProps/targetgroups.props

@@ -107,7 +107,7 @@
       <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.3</TargetingPackNugetPackageId>
       <NuGetTargetMoniker>.NETFramework,Version=v4.6.3</NuGetTargetMoniker>
       <Imports>net463</Imports>
-      <CompatibleWith>netstandard2.0</CompatibleWith>
+      <CompatibleWith>netstandard</CompatibleWith>
     </TargetGroups>
     <TargetGroups Include="win8">
       <NuGetTargetMoniker>Windows,Version=v8.0</NuGetTargetMoniker>

src/libraries/buildvertical.targets

@@ -10,8 +10,7 @@
 
   <!-- Runs during traversal to select which projects and configurations of those projects to build -->
   <Target Name="AnnotateAndFilterProjects"
-          BeforeTargets="BuildAllProjects;TestAllProjects"
-          Condition="!$(MSBuildProjectFullPath.EndsWith('.proj'))">
+          BeforeTargets="BuildAllProjects;TestAllProjects">
 
     <!-- find the best configuration for each project, projects that shouldn't build for this configuration
          return an empty item.  -->

src/libraries/external/coreclr/Configurations.props

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <BuildConfigurations>
+      netcoreapp;
+    </BuildConfigurations>
+  </PropertyGroup>
+</Project>

src/libraries/external/coreclr/coreclr.depproj

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <BuildConfigurations>
-      netcoreapp;
-    </BuildConfigurations>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <OutputPath>$(RuntimePath)</OutputPath>

src/libraries/external/dir.proj

@@ -4,8 +4,8 @@
   <!-- Build for all configurations -->
   <ItemGroup>
     <Project Include="coreclr/coreclr.depproj" />
-    <Project Include="netstandard20/netstandard20.depproj" />
-    <Project Include="net461/net461.depproj" />
+    <Project Include="netstandard/netstandard.depproj" />
+    <Project Include="netfx/netfx.depproj" />
     <Project Include="test-runtime/XUnit.Runtime.depproj" />
   </ItemGroup>
 

src/libraries/external/netfx/Configurations.props

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- Include netcoreapp since we need to generate facades between desktop and netcoreapp -->
+    <BuildConfigurations>
+      net461;
+      netcoreapp;
+    </BuildConfigurations>
+  </PropertyGroup>
+</Project>

src/libraries/external/net461/net461.depproj → src/libraries/external/netfx/netfx.depproj

@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <BuildConfigurations>
-      netcoreapp;
-      netfx;
-    </BuildConfigurations>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NuGetTargetMoniker>.NETFramework,Version=v4.6.1</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == 'netcoreapp'">.NETFramework,Version=v4.6.1</NuGetTargetMoniker>
     <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
     <OutputPath>$(NetFxRefPath)</OutputPath>
   </PropertyGroup>

src/libraries/external/netstandard/Configurations.props

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <BuildConfigurations>
+      netstandard;
+    </BuildConfigurations>
+  </PropertyGroup>
+</Project>

src/libraries/external/netstandard20/netstandard20.depproj → src/libraries/external/netstandard/netstandard.depproj

@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <BuildConfigurations>
-      netstandard;
-    </BuildConfigurations>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NuGetTargetMoniker>.NETStandard,Version=v2.0</NuGetTargetMoniker>
     <NugetRuntimeIdentifier>None</NugetRuntimeIdentifier>
     <OutputPath>$(NetStandardRefPath)</OutputPath>
   </PropertyGroup>