Remove NetFx support libs

Now that we've shipped the NETStandard support package we will no longer build its content
from `master`.

It will be serviced from the `release/2.0.0` branch and the only netfx builds in `master` will
correspond to package content.

4 files changed, 72 insertions, 125 deletions

diff --git a/external/netfx-conflicts/Configurations.props b/external/netfx-conflicts/Configurations.props
deleted file mode 100644
index 064de9fd71..0000000000
--- a/external/netfx-conflicts/Configurations.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <BuildConfigurations>
-      netfx;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/external/netfx-conflicts/netfx-conflicts.depproj b/external/netfx-conflicts/netfx-conflicts.depproj
deleted file mode 100644
index 51fc85b5d1..0000000000
--- a/external/netfx-conflicts/netfx-conflicts.depproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build" TreatAsLocalProperty="TargetFramework">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <!-- netstandard 1.0 had the lowest version, we'll fallback to 1.1, 1.2, then 1.3 to pick up the lowest version of contracts
-         that only supported a later netstandard version -->
-    <TargetFramework>netstandard1.0</TargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
-    <PackageTargetFallback>netstandard1.1;netstandard1.2;netstandard1.3</PackageTargetFallback>
-    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <EnableBinPlacing>false</EnableBinPlacing>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <_contract Include="Microsoft.CSharp"/>
-    <_contract Include="System.Collections.Concurrent"/>
-    <_contract Include="System.Collections"/>
-    <_contract Include="System.ComponentModel.Annotations"/>
-    <_contract Include="System.ComponentModel"/>
-    <_contract Include="System.ComponentModel.EventBasedAsync"/>
-    <_contract Include="System.Diagnostics.Contracts"/>
-    <_contract Include="System.Diagnostics.Debug"/>
-    <_contract Include="System.Diagnostics.Tools"/>
-    <_contract Include="System.Diagnostics.Tracing"/>
-    <_contract Include="System.Dynamic.Runtime"/>
-    <_contract Include="System.Globalization"/>
-    <_contract Include="System.IO"/>
-    <_contract Include="System.IO.Compression"/>
-    <_contract Include="System.Linq"/>
-    <_contract Include="System.Linq.Expressions"/>
-    <_contract Include="System.Linq.Parallel"/>
-    <_contract Include="System.Linq.Queryable"/>
-    <_contract Include="System.Net.Http"/>
-    <_contract Include="System.Net.NetworkInformation"/>
-    <_contract Include="System.Net.Primitives"/>
-    <_contract Include="System.Net.Requests"/>
-    <_contract Include="System.Net.WebHeaderCollection"/>
-    <_contract Include="System.ObjectModel"/>
-    <_contract Include="System.Reflection"/>
-    <_contract Include="System.Reflection.Context"/>
-    <_contract Include="System.Reflection.Emit"/>
-    <_contract Include="System.Reflection.Emit.ILGeneration"/>
-    <_contract Include="System.Reflection.Emit.Lightweight"/>
-    <_contract Include="System.Reflection.Extensions"/>
-    <_contract Include="System.Reflection.Primitives"/>
-    <_contract Include="System.Resources.ResourceManager"/>
-    <_contract Include="System.Runtime"/>
-    <_contract Include="System.Runtime.Extensions"/>
-    <_contract Include="System.Runtime.Handles"/>
-    <_contract Include="System.Runtime.InteropServices"/>
-    <_contract Include="System.Runtime.InteropServices.WindowsRuntime"/>
-    <_contract Include="System.Runtime.Numerics"/>
-    <_contract Include="System.Runtime.Serialization.Json"/>
-    <_contract Include="System.Runtime.Serialization.Primitives"/>
-    <_contract Include="System.Runtime.Serialization.Xml"/>
-    <_contract Include="System.Security.Principal"/>
-    <_contract Include="System.ServiceModel.Duplex"/>
-    <_contract Include="System.ServiceModel.Http"/>
-    <_contract Include="System.ServiceModel.NetTcp"/>
-    <_contract Include="System.ServiceModel.Primitives"/>
-    <_contract Include="System.ServiceModel.Security"/>
-    <_contract Include="System.Text.Encoding"/>
-    <_contract Include="System.Text.Encoding.Extensions"/>
-    <_contract Include="System.Text.RegularExpressions"/>
-    <_contract Include="System.Threading"/>
-    <_contract Include="System.Threading.Tasks"/>
-    <_contract Include="System.Threading.Tasks.Parallel"/>
-    <_contract Include="System.Threading.Timer"/>
-    <_contract Include="System.Xml.ReaderWriter"/>
-    <_contract Include="System.Xml.XDocument"/>
-    <_contract Include="System.Xml.XmlSerializer"/>
-    <PackageReference Include="@(_contract)">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualBasic">
-      <Version>10.1.0</Version>
-    </PackageReference>
-  </ItemGroup>
-
-  <Target Name="DumpVersions" DependsOnTargets="ResolveReferences">
-    <Message Text="%(ReferencePath.FusionName)" />
-  </Target>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
diff --git a/external/netfx/Configurations.props b/external/netfx/Configurations.props
index 47bdffcb28..93e6478e90 100644
--- a/external/netfx/Configurations.props
+++ b/external/netfx/Configurations.props
@@ -8,8 +8,8 @@
       net46;
       net461;
       net462;
-      net463;
       net47;
+      net471;
       netfx;
       netcoreapp;
       uap;
diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj
index a860b41ed9..4f35754e7b 100644
--- a/external/netfx/netfx.depproj
+++ b/external/netfx/netfx.depproj
@@ -4,58 +4,98 @@
   <Import Project="$(SourceDir)\shims\netfxreference.props" />
   <PropertyGroup>
     <BinPlaceRef>true</BinPlaceRef>
+    <BinPlaceRuntime>true</BinPlaceRuntime>
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <RefOutputPath>$(RefPath)</RefOutputPath>
+    <NETStandardSupportPackageId>NETStandard.Library.NETFramework</NETStandardSupportPackageId>
+    <NETStandardSupportPackageVersion>2.0.0-preview2-25405-01</NETStandardSupportPackageVersion>
+    <NETStandardSupportRoot>$(PackagesDir)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build</NETStandardSupportRoot>
+    <AddNetStandardSupportPackage Condition="'$(TargetGroup)' == 'netfx' OR '$(TargetGroup)' == 'net461' OR '$(TargetGroup)' == 'net462' OR '$(TargetGroup)' == 'net47'">true</AddNetStandardSupportPackage>
+    <!-- temporary until we can get an updated 4.7.1 targeting pack -->
+    <AddNetStandardSupportPackage Condition="'$(TargetGroup)' == '471' ">true</AddNetStandardSupportPackage>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(NuGetTargetMoniker)' == '.NETFramework,Version=v4.6.3'">
-    <!-- Missing 4.6.3 targeting pack, use 462 for now -->
-    <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.2</TargetingPackNugetPackageId>
-  </PropertyGroup>
-  <PropertyGroup Condition="!$(NuGetTargetMoniker.StartsWith('.NETFramework'))">
+  <PropertyGroup Condition="'$(TargetsNetFx)' != 'true'">
     <!-- For things not .NETFramework we need the net461 targeting pack to generate facades -->
     <NuGetTargetMoniker>.NETFramework,Version=v4.6.1</NuGetTargetMoniker>
     <NuGetTargetMonikerShort>net461</NuGetTargetMonikerShort>
     <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.6.1</TargetingPackNugetPackageId>
-    <RefOutputPath>$(NetFxRefPath)</RefOutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.1'">
+    <!-- Missing 4.7.1 targeting pack, use 4.7 for now -->
+    <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.7</TargetingPackNugetPackageId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- For things not .NETFramework binplace to the NETFX ref path -->
+    <BinPlaceConfiguration  Condition="'$(TargetsNetFx)' != 'true'" Include="$(Configuration)">
+      <RefPath>$(NetFxRefPath)</RefPath>
+    </BinPlaceConfiguration>
+
+    <!-- For things .NETFramework binplace to refpath -->
+    <BinPlaceConfiguration  Condition="'$(TargetsNetFx)' == 'true'" Include="$(Configuration)">
+      <RefPath>$(RefPath)</RefPath>
+    </BinPlaceConfiguration>
+
+    <!-- For the netfx targetgroup, binplace NetStandardSupportLibs to runtime / test-runtime-->
+    <BinPlaceConfiguration  Condition="'$(TargetGroup)' == 'netfx'" Include="$(Configuration)">
+      <ItemName>NetStandardSupportLib</ItemName>
+      <RuntimePath>$(TestHostRootPath)</RuntimePath>
+    </BinPlaceConfiguration>
+    <BinPlaceConfiguration  Condition="'$(TargetGroup)' == 'netfx'" Include="$(Configuration)">
+      <ItemName>NetStandardSupportLib</ItemName>
+      <RuntimePath>$(RuntimePath)</RuntimePath>
+    </BinPlaceConfiguration>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="$(TargetingPackNugetPackageId)">
       <Version>1.0.1</Version>
     </PackageReference>
-    <PackageReference Include="NETStandard.Library" Condition="'$(TargetGroup)' == 'netfx'">
-      <Version>$(NETStandardPackageVersion)</Version>
+    <PackageReference Include="$(NETStandardSupportPackageId)" Condition="'$(AddNetStandardSupportPackage)' == 'true'">
+      <Version>$(NETStandardSupportPackageVersion)</Version>
     </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <BinPlaceConfiguration Include="$(Configuration)">
-      <RefPath>$(RefOutputPath)</RefPath>
-    </BinPlaceConfiguration>
 
     <FileToExclude Include="System.EnterpriseServices" />
     <FileToExclude Include="System.EnterpriseServices.Thunk" />
     <FileToExclude Include="System.EnterpriseServices.Wrapper" />
   </ItemGroup>
 
-  <Target Name="FilterNETStandardShims" BeforeTargets="FilterNugetPackages"
-          Condition="'$(RefOutputPath)' == '$(NetFxRefPath)'">
-    <PropertyGroup>
-      <_NETStandardRefFolder>$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\netstandard2.0\ref</_NETStandardRefFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <_excludeForNetFx Include="@(NetFxReference);netstandard" />
-      <_netstandardShimAssemblies Include="$(_NETStandardRefFolder)\*.dll" Exclude="@(_excludeForNetFx->'$(_NETStandardRefFolder)\%(Identity).dll')" />
-      <FileToExclude Include="@(_netstandardShimAssemblies->'%(FileName)')" />
-    </ItemGroup>
-  </Target>
-
   <Target Name="AddNETStandardShims" AfterTargets="FilterNugetPackages"
-          Condition="'$(RefOutputPath)' == '$(NetFxRefPath)'">
+          Condition="'$(AddNetStandardSupportPackage)' == 'true'">
     <ItemGroup>
-      <Reference Include="@(_netstandardShimAssemblies)">
+      <_netStandardReference Condition="'$(TargetGroup)' != 'net461' AND '$(TargetGroup)' != 'net462'"
+                             Include="$(NETStandardSupportRoot)\net47\ref\*.dll" 
+                             Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net47\ref\%(FileName).dll')" />
+      <_netStandardReference Condition="'$(TargetGroup)' != 'net461'"
+                             Include="$(NETStandardSupportRoot)\net462\ref\*.dll" 
+                             Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net462\ref\%(FileName).dll')" />
+      <_netStandardReference Include="$(NETStandardSupportRoot)\net461\ref\*.dll" 
+                             Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net461\ref\%(FileName).dll')" />
+
+      <NetStandardSupportLib Condition="'$(TargetGroup)' != 'net461' AND '$(TargetGroup)' != 'net462'"
+                             Include="$(NETStandardSupportRoot)\net47\lib\*.dll" 
+                             Exclude="@(NetStandardSupportLib->'$(NETStandardSupportRoot)\net47\lib\%(FileName).dll')" />
+      <NetStandardSupportLib Condition="'$(TargetGroup)' != 'net461'"
+                             Include="$(NETStandardSupportRoot)\net462\lib\*.dll" 
+                             Exclude="@(NetStandardSupportLib->'$(NETStandardSupportRoot)\net462\lib\%(FileName).dll')" />
+      <NetStandardSupportLib Include="$(NETStandardSupportRoot)\net461\lib\*.dll" 
+                             Exclude="@(NetStandardSupportLib->'$(NETStandardSupportRoot)\net461\lib\%(FileName).dll')" />
+
+      <_netStandardReference>
         <Private>False</Private>
-        <NuGetPackageId>$(NETStandardPackageId)</NuGetPackageId>
-        <NuGetPackageVersion>$(NETStandardPackageVersion)</NuGetPackageVersion>
-      </Reference>
+        <NuGetPackageId>$(NETStandardSupportPackageId)</NuGetPackageId>
+        <NuGetPackageVersion>$(NETStandardSupportPackageVersion)</NuGetPackageVersion>
+      </_netStandardReference>
+
+      <_referenceByFileName Include="@(Reference->'%(FileName)%(Extension)')">
+        <OriginalIdentity>%(Identity)</OriginalIdentity>
+      </_referenceByFileName>
+      <_netStandardReferenceByFileName Include="@(_netStandardReference->'%(FileName)%(Extension)')" />
+
+      <_remainingReferenceByFileName Include="@(_referenceByFileName)" Exclude="@(_netStandardReferenceByFileName)" />
+      <_remainingReference Include="@(_remainingReferenceByFileName->'%(OriginalIdentity)')" />
+
+      <Reference Remove="@(Reference)" />
+      <Reference Include="@(_remainingReference);@(_netStandardReference)" />
     </ItemGroup>
   </Target>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />