From 6ba152bad6dc07b106a4806ba203db7cd62df119 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Tue, 30 Aug 2016 14:17:56 -0700
Subject: [PATCH 1/4] Make Interop API additions specific to netcoreapp

---
 .../packageIndex.json                                |  4 ++--
 src/System.Runtime.InteropServices/dir.props         |  2 +-
 .../pkg/System.Runtime.InteropServices.pkgproj       |  2 +-
 .../ref/System.Runtime.InteropServices.builds        | 12 ++++++++++++
 .../ref/System.Runtime.InteropServices.cs            |  8 +++++++-
 .../ref/System.Runtime.InteropServices.csproj        |  3 ++-
 src/ref.builds                                       |  2 +-
 7 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds

diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 160b5b7d7a2e..75d1b359b153 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -1687,8 +1687,8 @@
         "4.0.10.0": "4.0.10",
         "4.0.20.0": "4.0.20",
         "4.1.0.0": "4.1.0",
-        "4.2.0.0": "4.2.0",
-        "4.0.21.0": "4.0.21"
+        "4.0.21.0": "4.0.21",
+        "4.1.1.0": "4.3.0"
       }
     },
     "System.Runtime.InteropServices.RuntimeInformation": {
diff --git a/src/System.Runtime.InteropServices/dir.props b/src/System.Runtime.InteropServices/dir.props
index ec6b27deddb1..34b2edfd209d 100644
--- a/src/System.Runtime.InteropServices/dir.props
+++ b/src/System.Runtime.InteropServices/dir.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.0.0</AssemblyVersion>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
   </PropertyGroup>
 </Project>
 
diff --git a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
index 9649b51b6818..80edd62dd2f5 100644
--- a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
+++ b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
@@ -14,7 +14,7 @@
     <ProjectReference Include="..\ref\4.1\System.Runtime.InteropServices.depproj">
       <SupportedFramework>net462</SupportedFramework>
     </ProjectReference>
-    <ProjectReference Include="..\ref\System.Runtime.InteropServices.csproj">
+    <ProjectReference Include="..\ref\System.Runtime.InteropServices.builds">
       <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\redist\System.Runtime.InteropServices.depproj">
diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds
new file mode 100644
index 000000000000..c8556220dcaa
--- /dev/null
+++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <ItemGroup>
+    <Project Include="System.Runtime.InteropServices.csproj" />
+    <Project Include="System.Runtime.InteropServices.csproj">
+      <TargetGroup>netcoreapp1.0</TargetGroup>
+    </Project>
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs
index 0ccef4649327..34bdf488b401 100644
--- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs
+++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs
@@ -490,10 +490,12 @@ public static void GetNativeVariantForObject<T>(T obj, System.IntPtr pDstNativeV
         public static string PtrToStringUni(System.IntPtr ptr) { return default(string); }
         [System.Security.SecurityCriticalAttribute]
         public static string PtrToStringUni(System.IntPtr ptr, int len) { return default(string); }
+#if NETCOREAPP11
         [System.Security.SecurityCriticalAttribute]
         public static string PtrToStringUTF8(System.IntPtr ptr) { return default(string); }
         [System.Security.SecurityCriticalAttribute]
-        public static string PtrToStringUTF8(System.IntPtr ptr, int byteLen) { return default(string); }        
+        public static string PtrToStringUTF8(System.IntPtr ptr, int byteLen) { return default(string); }
+#endif
         [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))]
         [System.Security.SecurityCriticalAttribute]
         public static void PtrToStructure(System.IntPtr ptr, object structure) { }
@@ -566,8 +568,10 @@ public static void PtrToStructure<T>(System.IntPtr ptr, T structure) { }
         public static System.IntPtr StringToCoTaskMemAnsi(string s) { return default(System.IntPtr); }
         [System.Security.SecurityCriticalAttribute]
         public static System.IntPtr StringToCoTaskMemUni(string s) { return default(System.IntPtr); }
+#if NETCOREAPP11
         [System.Security.SecurityCriticalAttribute]
         public static System.IntPtr StringToCoTaskMemUTF8(string s) { return default(System.IntPtr); }
+#endif
         [System.Security.SecurityCriticalAttribute]
         public static System.IntPtr StringToHGlobalAnsi(string s) { return default(System.IntPtr); }
         [System.Security.SecurityCriticalAttribute]
@@ -644,8 +648,10 @@ public static void ZeroFreeCoTaskMemUnicode(System.IntPtr s) { }
         public static void ZeroFreeGlobalAllocAnsi(System.IntPtr s) { }
         [System.Security.SecurityCriticalAttribute]
         public static void ZeroFreeGlobalAllocUnicode(System.IntPtr s) { }
+#if NETCOREAPP11
         [System.Security.SecurityCriticalAttribute]
         public static void ZeroFreeCoTaskMemUTF8(System.IntPtr s) { }
+#endif
     }
     [System.AttributeUsageAttribute((System.AttributeTargets)(10496), Inherited = false)]
     public sealed partial class MarshalAsAttribute : System.Attribute
diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
index 0c1c7ce0a4d0..b69e2b490813 100644
--- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
+++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
@@ -7,9 +7,10 @@
     <NoWarn>618</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.6</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.6</PackageTargetFramework>
     <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
     <ProjectGuid>{B17014F1-D902-417F-89B0-271204695831}</ProjectGuid>
+    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">NETCOREAPP11</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.InteropServices.cs" />
diff --git a/src/ref.builds b/src/ref.builds
index eebac73aaae8..4bf366da8cd2 100644
--- a/src/ref.builds
+++ b/src/ref.builds
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <Project Include="*\ref\**\*.*proj">
+    <Project Include="*\ref\**\*.builds;*\ref\**\*.*proj">
       <UndefineProperties>OSGroup;TargetGroup</UndefineProperties>
     </Project>
   </ItemGroup>

From 487ecb513d4bb5cb260a99d8bc384677dec9bb90 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Tue, 30 Aug 2016 15:05:19 -0700
Subject: [PATCH 2/4] Remove redist builds for Interop

Remove all projects that are redistributing old content or building
unchanged content.

This includes all depproj's, the netstandard reference assembly since it
had no API changes over the last release, and the net4* configurations
since that was a full facade and had no change over the last release.
---
 .../System.Runtime.InteropServices.pkgproj    | 22 ++-----------------
 .../System.Runtime.InteropServices.pkgproj    |  9 --------
 .../System.Runtime.InteropServices.pkgproj    |  6 -----
 .../System.Runtime.InteropServices.depproj    | 14 ------------
 .../ref/4.0.0/project.json                    | 12 ----------
 .../System.Runtime.InteropServices.depproj    | 14 ------------
 .../ref/4.0.10/project.json                   | 12 ----------
 .../System.Runtime.InteropServices.depproj    | 14 ------------
 .../ref/4.0.20/project.json                   | 12 ----------
 .../System.Runtime.InteropServices.depproj    | 14 ------------
 .../ref/4.1/project.json                      | 12 ----------
 .../ref/System.Runtime.InteropServices.builds | 12 ----------
 .../ref/System.Runtime.InteropServices.cs     |  6 -----
 .../ref/System.Runtime.InteropServices.csproj |  3 +--
 .../src/ApiCompatBaseline.net463.txt          |  5 -----
 .../src/System.Runtime.InteropServices.builds | 12 ----------
 .../src/System.Runtime.InteropServices.csproj | 14 +-----------
 .../System.Runtime.InteropServices.depproj    | 19 ----------------
 .../src/redist/project.json                   | 14 ------------
 19 files changed, 4 insertions(+), 222 deletions(-)
 delete mode 100644 src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj
 delete mode 100644 src/System.Runtime.InteropServices/ref/4.0.0/project.json
 delete mode 100644 src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj
 delete mode 100644 src/System.Runtime.InteropServices/ref/4.0.10/project.json
 delete mode 100644 src/System.Runtime.InteropServices/ref/4.0.20/System.Runtime.InteropServices.depproj
 delete mode 100644 src/System.Runtime.InteropServices/ref/4.0.20/project.json
 delete mode 100644 src/System.Runtime.InteropServices/ref/4.1/System.Runtime.InteropServices.depproj
 delete mode 100644 src/System.Runtime.InteropServices/ref/4.1/project.json
 delete mode 100644 src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds
 delete mode 100644 src/System.Runtime.InteropServices/src/ApiCompatBaseline.net463.txt
 delete mode 100644 src/System.Runtime.InteropServices/src/redist/System.Runtime.InteropServices.depproj
 delete mode 100644 src/System.Runtime.InteropServices/src/redist/project.json

diff --git a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
index 80edd62dd2f5..5a01ce1054f3 100644
--- a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
+++ b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
@@ -2,26 +2,8 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <ProjectReference Include="..\ref\4.0.0\System.Runtime.InteropServices.depproj">
-      <SupportedFramework>net45;netcore45</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\ref\4.0.10\System.Runtime.InteropServices.depproj">
-      <SupportedFramework>net451;netcore451;wpa81</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\ref\4.0.20\System.Runtime.InteropServices.depproj">
-      <SupportedFramework>net46;netcore50</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\ref\4.1\System.Runtime.InteropServices.depproj">
-      <SupportedFramework>net462</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\ref\System.Runtime.InteropServices.builds">
-      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\src\redist\System.Runtime.InteropServices.depproj">
-      <TargetGroup>net462</TargetGroup>
-    </ProjectReference>
-    <ProjectReference Include="..\src\System.Runtime.InteropServices.csproj">
-      <TargetGroup>net463</TargetGroup>
+    <ProjectReference Include="..\ref\System.Runtime.InteropServices.csproj">
+      <SupportedFramework>netcoreapp1.1</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="any\System.Runtime.InteropServices.pkgproj" />
     <ProjectReference Include="aot\System.Runtime.InteropServices.pkgproj" />
diff --git a/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj
index 9a7c1ae134d1..d2d9d12cb82c 100644
--- a/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj
+++ b/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj
@@ -8,15 +8,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.Runtime.InteropServices.csproj" />
-    <ProjectReference Include="..\..\src\redist\System.Runtime.InteropServices.depproj">
-      <TargetGroup>netcore50</TargetGroup>
-    </ProjectReference>
-
-    <!-- AOT implementation comes from AOT package -->
-    <File Include="$(PlaceholderFile)">
-      <TargetPath>runtimes/aot/lib/netcore50</TargetPath>
-      <TargetFramework>aot</TargetFramework>
-    </File>
 
     <InboxOnTargetFramework Include="MonoAndroid10" />
     <InboxOnTargetFramework Include="MonoTouch10" />
diff --git a/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj
index 6b30cdf063e1..d9827ceb9202 100644
--- a/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj
+++ b/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj
@@ -7,11 +7,5 @@
     <PreventImplementationReference>true</PreventImplementationReference>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\redist\System.Runtime.InteropServices.depproj">
-      <TargetGroup>netcore50aot</TargetGroup>
-    </ProjectReference>
-  </ItemGroup>
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj
deleted file mode 100644
index 29f2b6abdae9..000000000000
--- a/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.1</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/ref/4.0.0/project.json b/src/System.Runtime.InteropServices/ref/4.0.0/project.json
deleted file mode 100644
index f78a316cbb2c..000000000000
--- a/src/System.Runtime.InteropServices/ref/4.0.0/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "System.Runtime.InteropServices": "4.0.0"
-  },
-  "frameworks": {
-    "netstandard1.1": {
-      "imports": [
-        "dotnet5.2"
-      ]
-    }
-  }
-}
diff --git a/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj
deleted file mode 100644
index 7aa0e70c3a3a..000000000000
--- a/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.10.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.2</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/ref/4.0.10/project.json b/src/System.Runtime.InteropServices/ref/4.0.10/project.json
deleted file mode 100644
index 2f51f34bfb20..000000000000
--- a/src/System.Runtime.InteropServices/ref/4.0.10/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "System.Runtime.InteropServices": "4.0.10"
-  },
-  "frameworks": {
-    "netstandard1.2": {
-      "imports": [
-        "dotnet5.3"
-      ]
-    }
-  }
-}
diff --git a/src/System.Runtime.InteropServices/ref/4.0.20/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.0.20/System.Runtime.InteropServices.depproj
deleted file mode 100644
index 2c8e3437c172..000000000000
--- a/src/System.Runtime.InteropServices/ref/4.0.20/System.Runtime.InteropServices.depproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.20.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/ref/4.0.20/project.json b/src/System.Runtime.InteropServices/ref/4.0.20/project.json
deleted file mode 100644
index 1c2e27c27d9b..000000000000
--- a/src/System.Runtime.InteropServices/ref/4.0.20/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "System.Runtime.InteropServices": "4.0.20"
-  },
-  "frameworks": {
-    "netstandard1.3": {
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
-  }
-}
diff --git a/src/System.Runtime.InteropServices/ref/4.1/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.1/System.Runtime.InteropServices.depproj
deleted file mode 100644
index 73aa35f607b0..000000000000
--- a/src/System.Runtime.InteropServices/ref/4.1/System.Runtime.InteropServices.depproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.0.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.5</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/ref/4.1/project.json b/src/System.Runtime.InteropServices/ref/4.1/project.json
deleted file mode 100644
index c8d08047db31..000000000000
--- a/src/System.Runtime.InteropServices/ref/4.1/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "System.Runtime.InteropServices": "4.0.20"
-  },
-  "frameworks": {
-    "netstandard1.5": {
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
-  }
-}
diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds
deleted file mode 100644
index c8556220dcaa..000000000000
--- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.builds
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <ItemGroup>
-    <Project Include="System.Runtime.InteropServices.csproj" />
-    <Project Include="System.Runtime.InteropServices.csproj">
-      <TargetGroup>netcoreapp1.0</TargetGroup>
-    </Project>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
-</Project>
-
diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs
index 34bdf488b401..c1e50db4ea03 100644
--- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs
+++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs
@@ -490,12 +490,10 @@ public static void GetNativeVariantForObject<T>(T obj, System.IntPtr pDstNativeV
         public static string PtrToStringUni(System.IntPtr ptr) { return default(string); }
         [System.Security.SecurityCriticalAttribute]
         public static string PtrToStringUni(System.IntPtr ptr, int len) { return default(string); }
-#if NETCOREAPP11
         [System.Security.SecurityCriticalAttribute]
         public static string PtrToStringUTF8(System.IntPtr ptr) { return default(string); }
         [System.Security.SecurityCriticalAttribute]
         public static string PtrToStringUTF8(System.IntPtr ptr, int byteLen) { return default(string); }
-#endif
         [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))]
         [System.Security.SecurityCriticalAttribute]
         public static void PtrToStructure(System.IntPtr ptr, object structure) { }
@@ -568,10 +566,8 @@ public static void PtrToStructure<T>(System.IntPtr ptr, T structure) { }
         public static System.IntPtr StringToCoTaskMemAnsi(string s) { return default(System.IntPtr); }
         [System.Security.SecurityCriticalAttribute]
         public static System.IntPtr StringToCoTaskMemUni(string s) { return default(System.IntPtr); }
-#if NETCOREAPP11
         [System.Security.SecurityCriticalAttribute]
         public static System.IntPtr StringToCoTaskMemUTF8(string s) { return default(System.IntPtr); }
-#endif
         [System.Security.SecurityCriticalAttribute]
         public static System.IntPtr StringToHGlobalAnsi(string s) { return default(System.IntPtr); }
         [System.Security.SecurityCriticalAttribute]
@@ -648,10 +644,8 @@ public static void ZeroFreeCoTaskMemUnicode(System.IntPtr s) { }
         public static void ZeroFreeGlobalAllocAnsi(System.IntPtr s) { }
         [System.Security.SecurityCriticalAttribute]
         public static void ZeroFreeGlobalAllocUnicode(System.IntPtr s) { }
-#if NETCOREAPP11
         [System.Security.SecurityCriticalAttribute]
         public static void ZeroFreeCoTaskMemUTF8(System.IntPtr s) { }
-#endif
     }
     [System.AttributeUsageAttribute((System.AttributeTargets)(10496), Inherited = false)]
     public sealed partial class MarshalAsAttribute : System.Attribute
diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
index b69e2b490813..5df34c2aa0f7 100644
--- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
+++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
@@ -7,10 +7,9 @@
     <NoWarn>618</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.6</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netcoreapp1.1</PackageTargetFramework>
     <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
     <ProjectGuid>{B17014F1-D902-417F-89B0-271204695831}</ProjectGuid>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp1.1'">NETCOREAPP11</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Runtime.InteropServices.cs" />
diff --git a/src/System.Runtime.InteropServices/src/ApiCompatBaseline.net463.txt b/src/System.Runtime.InteropServices/src/ApiCompatBaseline.net463.txt
deleted file mode 100644
index cea5e4e39d60..000000000000
--- a/src/System.Runtime.InteropServices/src/ApiCompatBaseline.net463.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.PtrToStringUTF8(System.IntPtr)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.PtrToStringUTF8(System.IntPtr, System.Int32)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.StringToCoTaskMemUTF8(System.String)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.ZeroFreeCoTaskMemUTF8(System.IntPtr)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Runtime.InteropServices.UnmanagedType System.Runtime.InteropServices.UnmanagedType.LPUTF8Str' does not exist in the implementation but it does exist in the contract.
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds
index e699ebf6c4ab..8fd85a2e3e47 100644
--- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds
+++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds
@@ -3,22 +3,10 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <Project Include="System.Runtime.InteropServices.csproj" />
-    <Project Include="System.Runtime.InteropServices.csproj">
-      <TargetGroup>net463</TargetGroup>
-    </Project>
     <!-- NETCore50 must redistribute binaries due to shared library
     <Project Include="System.Runtime.InteropServices.csproj">
       <TargetGroup>netcore50aot</TargetGroup>
     </Project> -->
-    <Project Include="redist\System.Runtime.InteropServices.depproj">
-      <TargetGroup>netcore50</TargetGroup>
-    </Project>
-    <Project Include="redist\System.Runtime.InteropServices.depproj">
-      <TargetGroup>netcore50aot</TargetGroup>
-    </Project>
-    <Project Include="redist\System.Runtime.InteropServices.depproj">
-      <TargetGroup>net462</TargetGroup>
-    </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>
diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
index b6499426670d..348da986d75f 100644
--- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
+++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj
@@ -14,10 +14,6 @@
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
   <ItemGroup Condition="'$(TargetGroup)' == ''">
     <Compile Include="System\Runtime\InteropServices\ComAwareEventInfo.cs" />
     <Compile Include="System\Runtime\InteropServices\HandleCollector.CoreCLR.cs" />
@@ -33,17 +29,9 @@
     <Compile Include="System\Runtime\InteropServices\ComTypes\stgmedium.cs" />
     <Compile Include="System\Runtime\InteropServices\ComTypes\tymed.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' != 'netcore50aot'">
+  <ItemGroup>
     <TargetingPackReference Include="mscorlib" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'net463'">
-    <TargetingPackReference Include="System.Core" />
-    <TargetingPackReference Include="System" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcore50aot'">
-    <TargetingPackReference Include="System.Private.CoreLib" />
-    <TargetingPackReference Include="System.Private.Interop" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />
   </ItemGroup>
diff --git a/src/System.Runtime.InteropServices/src/redist/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/src/redist/System.Runtime.InteropServices.depproj
deleted file mode 100644
index b9aeea6b494b..000000000000
--- a/src/System.Runtime.InteropServices/src/redist/System.Runtime.InteropServices.depproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <TargetGroup Condition="'$(TargetGroup)' == ''">netcore50</TargetGroup>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.1.0.0</AssemblyVersion>
-    <AssemblyVersion Condition="'$(TargetGroup)' == 'netcore50' OR '$(TargetGroup)' == 'netcore50aot'">4.0.20.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-    <NuGetRuntimeIdentifier Condition="'$(TargetGroup)' == 'net462'">win</NuGetRuntimeIdentifier>
-    <!-- this is a facade on desktop and must forward to mscorlib -->
-    <PackageAsRefAndLib Condition="'$(TargetGroup)' == 'net462'">true</PackageAsRefAndLib>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/src/redist/project.json b/src/System.Runtime.InteropServices/src/redist/project.json
deleted file mode 100644
index 53cc111138ea..000000000000
--- a/src/System.Runtime.InteropServices/src/redist/project.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "dependencies": {
-    "System.Runtime.InteropServices": "4.1.0"
-  },
-  "frameworks": {
-    "netcore50": {},
-    "net462": {}
-  },
-  "runtimes": {
-    "win": {},
-    "win8": {},
-    "win8-aot": {}
-  }
-}

From 59348d8bbb11bad37d1392593b9568c108948dff Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Tue, 30 Aug 2016 15:11:26 -0700
Subject: [PATCH 3/4] Remove redist builds for RegEx

Remove all projects that are redistributing old content or building
unchanged content.
---
 .../pkg/System.Text.RegularExpressions.pkgproj    |  6 ------
 .../4.0.0/System.Text.RegularExpressions.depproj  | 14 --------------
 .../ref/4.0.0/project.json                        | 12 ------------
 .../4.0.10/System.Text.RegularExpressions.depproj | 14 --------------
 .../ref/4.0.10/project.json                       | 12 ------------
 .../src/System.Text.RegularExpressions.builds     |  3 ---
 .../redist/System.Text.RegularExpressions.depproj | 15 ---------------
 .../src/redist/project.json                       | 12 ------------
 8 files changed, 88 deletions(-)
 delete mode 100644 src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj
 delete mode 100644 src/System.Text.RegularExpressions/ref/4.0.0/project.json
 delete mode 100644 src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj
 delete mode 100644 src/System.Text.RegularExpressions/ref/4.0.10/project.json
 delete mode 100644 src/System.Text.RegularExpressions/src/redist/System.Text.RegularExpressions.depproj
 delete mode 100644 src/System.Text.RegularExpressions/src/redist/project.json

diff --git a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
index 39dd35d071e0..eab1b059effb 100644
--- a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
+++ b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
@@ -2,12 +2,6 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
-    <ProjectReference Include="..\ref\4.0.0\System.Text.RegularExpressions.depproj">
-      <SupportedFramework>net45;netcore45;wp8;wpa81</SupportedFramework>
-    </ProjectReference>
-    <ProjectReference Include="..\ref\4.0.10\System.Text.RegularExpressions.depproj">
-      <SupportedFramework>net46;netcore50</SupportedFramework>
-    </ProjectReference>
     <ProjectReference Include="..\ref\System.Text.RegularExpressions.csproj">
       <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
diff --git a/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj b/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj
deleted file mode 100644
index f1c59486edbe..000000000000
--- a/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.0</NuGetTargetMoniker>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/System.Text.RegularExpressions/ref/4.0.0/project.json b/src/System.Text.RegularExpressions/ref/4.0.0/project.json
deleted file mode 100644
index 3e4f8df3665f..000000000000
--- a/src/System.Text.RegularExpressions/ref/4.0.0/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "System.Text.RegularExpressions": "4.0.0"
-  },
-  "frameworks": {
-    "netstandard1.0": {
-      "imports": [
-        "dotnet5.1"
-      ]
-    }
-  }
-}
diff --git a/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj b/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj
deleted file mode 100644
index f4a2240f0510..000000000000
--- a/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.10.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/System.Text.RegularExpressions/ref/4.0.10/project.json b/src/System.Text.RegularExpressions/ref/4.0.10/project.json
deleted file mode 100644
index 5e6c7972dcbf..000000000000
--- a/src/System.Text.RegularExpressions/ref/4.0.10/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "System.Text.RegularExpressions": "4.0.10"
-  },
-  "frameworks": {
-    "netstandard1.3": {
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
-  }
-}
diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
index 4b31babf72be..b0177b5074d5 100644
--- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
+++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
@@ -7,9 +7,6 @@
     <Project Include="System.Text.RegularExpressions.csproj">
       <TargetGroup>net463</TargetGroup>
     </Project>
-    <Project Include="redist\System.Text.RegularExpressions.depproj">
-      <TargetGroup>netcore50</TargetGroup>
-    </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>
diff --git a/src/System.Text.RegularExpressions/src/redist/System.Text.RegularExpressions.depproj b/src/System.Text.RegularExpressions/src/redist/System.Text.RegularExpressions.depproj
deleted file mode 100644
index 6e6e5c04ade5..000000000000
--- a/src/System.Text.RegularExpressions/src/redist/System.Text.RegularExpressions.depproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
-  <PropertyGroup>
-    <TargetGroup Condition="'$(TargetGroup)' == ''">netcore50</TargetGroup>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <AssemblyVersion>4.0.10.0</AssemblyVersion>
-    <OutputType>Library</OutputType>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/System.Text.RegularExpressions/src/redist/project.json b/src/System.Text.RegularExpressions/src/redist/project.json
deleted file mode 100644
index b20f9ffe0958..000000000000
--- a/src/System.Text.RegularExpressions/src/redist/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Targets": "1.0.0",
-    "System.Text.RegularExpressions": "4.0.10"
-  },
-  "frameworks": {
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {}
-  }
-}

From 58098d39538ae034f6f53a732f77cc8d6a716876 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Tue, 30 Aug 2016 15:21:56 -0700
Subject: [PATCH 4/4] Make RegEx API additions specific to netcoreapp

In doing so I was also able to remove the net463 build since there was
no API change over the last net4* build harvested from the package.
---
 .../packageIndex.json                                |  2 +-
 src/System.Text.RegularExpressions/dir.props         |  2 +-
 .../pkg/System.Text.RegularExpressions.pkgproj       |  2 +-
 .../ref/System.Text.RegularExpressions.csproj        |  2 +-
 .../src/ApiCompatBaseline.net463.txt                 |  5 -----
 .../src/System.Text.RegularExpressions.builds        |  4 ----
 .../src/System.Text.RegularExpressions.csproj        | 12 ++----------
 src/System.Text.RegularExpressions/src/project.json  |  5 -----
 8 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 src/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt

diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 75d1b359b153..1beb0f977d8d 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -2078,7 +2078,7 @@
         "4.0.0.0": "4.0.0",
         "4.0.10.0": "4.0.10",
         "4.1.0.0": "4.0.12",
-        "4.2.0.0": "4.2.0",
+        "4.1.1.0": "4.3.0",
         "4.0.11.0": "4.0.11",
         "4.0.12.0": "4.0.12"
       }
diff --git a/src/System.Text.RegularExpressions/dir.props b/src/System.Text.RegularExpressions/dir.props
index ec6b27deddb1..34b2edfd209d 100644
--- a/src/System.Text.RegularExpressions/dir.props
+++ b/src/System.Text.RegularExpressions/dir.props
@@ -1,7 +1,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.0.0</AssemblyVersion>
+    <AssemblyVersion>4.1.1.0</AssemblyVersion>
   </PropertyGroup>
 </Project>
 
diff --git a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
index eab1b059effb..0f05cfa1aac1 100644
--- a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
+++ b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Text.RegularExpressions.csproj">
-      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>netcoreapp1.1</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Text.RegularExpressions.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
index 876ca91696bd..60bf91af8a8a 100644
--- a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
+++ b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.6</PackageTargetFramework>
+    <PackageTargetFramework>netcoreapp1.1</PackageTargetFramework>
     <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt b/src/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt
deleted file mode 100644
index 48d436201f09..000000000000
--- a/src/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-MembersMustExist : Member 'System.Text.RegularExpressions.Regex.Caps.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Text.RegularExpressions.Regex.Caps.set(System.Collections.IDictionary)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Text.RegularExpressions.Regex.CapNames.get()' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Text.RegularExpressions.Regex.CapNames.set(System.Collections.IDictionary)' does not exist in the implementation but it does exist in the contract.
-MembersMustExist : Member 'System.Text.RegularExpressions.Group.Name.get()' does not exist in the implementation but it does exist in the contract.
\ No newline at end of file
diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
index b0177b5074d5..c7dcad142419 100644
--- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
+++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
@@ -3,10 +3,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <Project Include="System.Text.RegularExpressions.csproj" />
-    <!-- Net46 facade is currently inbox for 4.0-->
-    <Project Include="System.Text.RegularExpressions.csproj">
-      <TargetGroup>net463</TargetGroup>
-    </Project>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
 </Project>
diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
index c37f56746c6c..aaff24ced8f2 100644
--- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
+++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
@@ -4,17 +4,13 @@
   <PropertyGroup>
     <ProjectGuid>{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}</ProjectGuid>
     <AssemblyName>System.Text.RegularExpressions</AssemblyName>
-    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
-    <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.6</PackageTargetFramework>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netcoreapp1.1</PackageTargetFramework>
     <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.6</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net463_Release|AnyCPU'" />
-  <ItemGroup Condition="'$(TargetGroup)' != 'net463'">
+  <ItemGroup>
     <Compile Include="System\Text\RegularExpressions\Regex.cs" />
     <Compile Include="System\Text\RegularExpressions\RegexBoyerMoore.cs" />
     <Compile Include="System\Text\RegularExpressions\RegexCapture.cs" />
@@ -44,10 +40,6 @@
       <Link>Common\System\IO\StringBuilderCache.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'net463'">
-    <TargetingPackReference Include="mscorlib" />
-    <TargetingPackReference Include="System" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />
   </ItemGroup>
diff --git a/src/System.Text.RegularExpressions/src/project.json b/src/System.Text.RegularExpressions/src/project.json
index 730455c869e5..2192c138d2ad 100644
--- a/src/System.Text.RegularExpressions/src/project.json
+++ b/src/System.Text.RegularExpressions/src/project.json
@@ -16,11 +16,6 @@
       "imports": [
         "dotnet5.7"
       ]
-    },
-    "net463": {
-      "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
-      }
     }
   }
 }