From 6b799df71ca7687286e96596d4124e43bd9d3fae Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Mon, 19 Sep 2016 15:32:54 -0700
Subject: [PATCH 1/2] Make 1.1 API netcoreapp1.1-specific

---
 .../packageIndex.json                              |  6 +++---
 src/System.Runtime.InteropServices/dir.props       |  2 +-
 .../pkg/System.Runtime.InteropServices.pkgproj     | 14 +-------------
 .../ref/System.Runtime.InteropServices.csproj      |  2 +-
 .../ref/project.json                               |  2 +-
 src/System.Text.RegularExpressions/dir.props       |  2 +-
 .../pkg/System.Text.RegularExpressions.pkgproj     |  8 +-------
 .../ref/System.Text.RegularExpressions.csproj      |  2 +-
 .../ref/project.json                               |  2 +-
 .../src/ApiCompatBaseline.net463.txt               |  5 -----
 .../src/System.Text.RegularExpressions.builds      |  4 ----
 .../src/System.Text.RegularExpressions.csproj      |  8 --------
 .../src/project.json                               |  5 -----
 .../System.Text.RegularExpressions.Tests.builds    |  4 ++++
 .../System.Text.RegularExpressions.Tests.csproj    |  6 ++++--
 .../tests/project.json                             |  3 ++-
 16 files changed, 21 insertions(+), 54 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 fb2c9833e014..e98abe2a21f5 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -1182,7 +1182,7 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.1.0.0": "4.1.0",
-        "4.1.1.0": "4.3.0",
+        "4.1.1.0": "4.3.0"
       }
     },
     "System.Linq.Expressions": {
@@ -1659,7 +1659,7 @@
         "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.3.0"
+        "4.1.1.0": "4.3.0"
       }
     },
     "System.Runtime.InteropServices.RuntimeInformation": {
@@ -2047,7 +2047,7 @@
         "4.0.0.0": "4.0.0",
         "4.0.10.0": "4.0.10",
         "4.1.0.0": "4.1.0",
-        "4.2.0.0": "4.3.0"
+        "4.1.1.0": "4.3.0"
       }
     },
     "System.Threading": {
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..b1282d32de15 100644
--- a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
+++ b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj
@@ -2,20 +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.csproj">
-      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>netcoreapp1.1</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\redist\System.Runtime.InteropServices.depproj">
       <TargetGroup>net462</TargetGroup>
diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
index 62d736496b2e..5bd873162706 100644
--- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
+++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj
@@ -7,7 +7,7 @@
     <NoWarn>618</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>Library</OutputType>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+    <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
     <ProjectGuid>{B17014F1-D902-417F-89B0-271204695831}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/System.Runtime.InteropServices/ref/project.json b/src/System.Runtime.InteropServices/ref/project.json
index 227efb5c0e26..071591f7871d 100644
--- a/src/System.Runtime.InteropServices/ref/project.json
+++ b/src/System.Runtime.InteropServices/ref/project.json
@@ -6,7 +6,7 @@
     "System.Runtime.Handles": "4.0.0"
   },
   "frameworks": {
-    "netstandard1.6": {
+    "netcoreapp1.1": {
       "imports": [
         "dotnet5.7"
       ]
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 39dd35d071e0..0f05cfa1aac1 100644
--- a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
+++ b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
@@ -2,14 +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.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>
+      <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 09c39bb89746..8952ed407d11 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>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+    <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Text.RegularExpressions.cs" />
diff --git a/src/System.Text.RegularExpressions/ref/project.json b/src/System.Text.RegularExpressions/ref/project.json
index 3c3c433c747f..21af23ceb45a 100644
--- a/src/System.Text.RegularExpressions/ref/project.json
+++ b/src/System.Text.RegularExpressions/ref/project.json
@@ -3,7 +3,7 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "netstandard1.6": {
+    "netcoreapp1.1": {
       "imports": [
         "dotnet5.7"
       ]
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 4b31babf72be..56027ac40da2 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>
     <Project Include="redist\System.Text.RegularExpressions.depproj">
       <TargetGroup>netcore50</TargetGroup>
     </Project>
diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
index 9770c309df88..87438a6da017 100644
--- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
+++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
@@ -4,15 +4,11 @@
   <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>
     <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'">
     <Compile Include="System\Text\RegularExpressions\Regex.cs" />
     <Compile Include="System\Text\RegularExpressions\RegexBoyerMoore.cs" />
@@ -43,10 +39,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 07441d822dd8..c5ed4668ba3f 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"
-      }
     }
   }
 }
diff --git a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
index 5befc9b6490c..750003c1d0cc 100644
--- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
+++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
@@ -3,6 +3,10 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <Project Include="System.Text.RegularExpressions.Tests.csproj"/>
+    <Project Include="System.Text.RegularExpressions.Tests.csproj">
+      <TestTFMs>netcoreapp1.1</TestTFMs>
+      <TargetGroup>netcoreapp1.1</TargetGroup>
+    </Project>
     <Project Include="System.Text.RegularExpressions.Tests.csproj">
       <TestTFMs>net463</TestTFMs>
       <OSGroup>Windows_NT</OSGroup>
diff --git a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
index a08079eed340..fa0455cba150 100644
--- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
+++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>System.Text.RegularExpressions.Tests</AssemblyName>
-    <NugetTargetMoniker>.NETStandard,Version=v1.6</NugetTargetMoniker>
+    <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.6</NugetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -22,7 +22,6 @@
     <Compile Include="GroupCollectionTests.cs" />
     <Compile Include="MatchCollectionTests.cs" />
     <Compile Include="PrecompiledRegexScenarioTest.cs" />
-    <Compile Include="RegexGroupNameTests.cs" />
     <Compile Include="Regex.EscapeUnescape.Tests.cs" />
     <Compile Include="Regex.GetGroupNames.Tests.cs" />
     <Compile Include="Regex.Ctor.Tests.cs" />
@@ -34,6 +33,9 @@
     <Compile Include="Regex.Match.Tests.cs" />
     <Compile Include="Regex.Tests.Common.cs" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp1.1'">
+    <Compile Include="RegexGroupNameTests.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\pkg\System.Text.RegularExpressions.pkgproj">
       <Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project>
diff --git a/src/System.Text.RegularExpressions/tests/project.json b/src/System.Text.RegularExpressions/tests/project.json
index d8efe821894c..c7fd9c22ca9c 100644
--- a/src/System.Text.RegularExpressions/tests/project.json
+++ b/src/System.Text.RegularExpressions/tests/project.json
@@ -18,7 +18,8 @@
     "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01"
   },
   "frameworks": {
-    "netstandard1.6": {}
+    "netstandard1.6": {},
+    "netcoreapp1.1": {}
   },
   "supports": {
     "coreFx.Test.netcoreapp1.0": {},

From 4f192affbc07a77e6660e75caeae5fba07a9cddf Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Tue, 20 Sep 2016 10:20:46 -0700
Subject: [PATCH 2/2] Build Linq.Expression tests against live Regex

The version for Regex was downgraded when I moved the API to netcoreapp
instead of netstandard.  This caused a failure in CI because the
Linq.Expression tests were building against packages (which had the
higher version) but running against live bits; due to
"TestWithLocalLibraries" used in the CI.

Temporarily build this test against the live bits.  This can be removed
with the next package update.
---
 .../tests/System.Linq.Expressions.Tests.csproj                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
index 88042a484581..3d48280bba37 100644
--- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
+++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj
@@ -226,6 +226,8 @@
       <Project>{aef718e9-d4fc-418f-a7ae-ed6b2c7b3787}</Project>
       <Name>System.Linq.Expressions</Name>
     </ProjectReference>
+    <!-- temporarily compile against the live build of RegularExpressions to handle assembly-version change -->
+    <ProjectReference Include="..\..\System.Text.RegularExpressions\pkg\System.Text.RegularExpressions.pkgproj"/>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file