From 2391ff356374cf5884ca4875553296f8b33aaa2e Mon Sep 17 00:00:00 2001
From: Lakshmi Priya Sekar <lasekar@microsoft.com>
Date: Thu, 2 Jun 2016 11:05:41 -0700
Subject: [PATCH] Move RegularExpressions contract to be supported from net463.

Commit migrated from https://github.com/dotnet/corefx/commit/3dd150b10be8098c62a343d958e72b22f6d81d69
---
 .../pkg/System.Text.RegularExpressions.pkgproj   |  2 +-
 .../ref/System.Text.RegularExpressions.csproj    |  4 ++--
 .../ref/project.json                             |  4 ++--
 ...e.net462.txt => ApiCompatBaseline.net463.txt} |  0
 .../src/System.Text.RegularExpressions.builds    |  2 +-
 .../src/System.Text.RegularExpressions.csproj    | 16 ++++++++--------
 .../src/project.json                             |  6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)
 rename src/libraries/System.Text.RegularExpressions/src/{ApiCompatBaseline.net462.txt => ApiCompatBaseline.net463.txt} (100%)

diff --git a/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj b/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
index ca94f4772d2..6148189b0fc 100644
--- a/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
+++ b/src/libraries/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj
@@ -9,7 +9,7 @@
       <SupportedFramework>net46;netcore50</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\ref\System.Text.RegularExpressions.csproj">
-      <SupportedFramework>net462;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Text.RegularExpressions.builds" />
     <InboxOnTargetFramework Include="MonoAndroid10" />
diff --git a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
index c40c99a50e6..49c4b106fc2 100644
--- a/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
+++ b/src/libraries/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj
@@ -4,8 +4,8 @@
   <PropertyGroup>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <OutputType>Library</OutputType>
-    <PackageTargetFramework>netstandard1.5</PackageTargetFramework>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.5</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.6</PackageTargetFramework>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Text.RegularExpressions.cs" />
diff --git a/src/libraries/System.Text.RegularExpressions/ref/project.json b/src/libraries/System.Text.RegularExpressions/ref/project.json
index 9c66bb28d8d..ce6a93d4897 100644
--- a/src/libraries/System.Text.RegularExpressions/ref/project.json
+++ b/src/libraries/System.Text.RegularExpressions/ref/project.json
@@ -3,9 +3,9 @@
     "System.Runtime": "4.0.0"
   },
   "frameworks": {
-    "netstandard1.5": {
+    "netstandard1.6": {
       "imports": [
-        "dotnet5.6"
+        "dotnet5.7"
       ]
     }
   }
diff --git a/src/libraries/System.Text.RegularExpressions/src/ApiCompatBaseline.net462.txt b/src/libraries/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt
similarity index 100%
rename from src/libraries/System.Text.RegularExpressions/src/ApiCompatBaseline.net462.txt
rename to src/libraries/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt
diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
index fbeee589088..4b31babf72b 100644
--- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
+++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds
@@ -5,7 +5,7 @@
     <Project Include="System.Text.RegularExpressions.csproj" />
     <!-- Net46 facade is currently inbox for 4.0-->
     <Project Include="System.Text.RegularExpressions.csproj">
-      <TargetGroup>net462</TargetGroup>
+      <TargetGroup>net463</TargetGroup>
     </Project>
     <Project Include="redist\System.Text.RegularExpressions.depproj">
       <TargetGroup>netcore50</TargetGroup>
diff --git a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
index e008ec83c37..7035a65774f 100644
--- a/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
+++ b/src/libraries/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj
@@ -5,17 +5,17 @@
     <ProjectGuid>{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}</ProjectGuid>
     <AssemblyName>System.Text.RegularExpressions</AssemblyName>
     <AssemblyVersion>4.1.0.0</AssemblyVersion>
-    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net462'">true</IsPartialFacadeAssembly>
-    <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net462'">None</ResourcesSourceOutputDirectory>
-    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.5</PackageTargetFramework>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.5</NuGetTargetMoniker>
+    <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
+    <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net463'">None</ResourcesSourceOutputDirectory>
+    <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netstandard1.6</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)' == 'net462_Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net462_Release|AnyCPU'" />
-  <ItemGroup Condition="'$(TargetGroup)' != 'net462'">
+  <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" />
     <Compile Include="System\Text\RegularExpressions\RegexCapture.cs" />
@@ -45,7 +45,7 @@
       <Link>Common\System\IO\StringBuilderCache.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'net462'">
+  <ItemGroup Condition="'$(TargetGroup)' == 'net463'">
     <TargetingPackReference Include="mscorlib" />
     <TargetingPackReference Include="System" />
   </ItemGroup>
diff --git a/src/libraries/System.Text.RegularExpressions/src/project.json b/src/libraries/System.Text.RegularExpressions/src/project.json
index 0e2cbe4aea2..4162d78e08b 100644
--- a/src/libraries/System.Text.RegularExpressions/src/project.json
+++ b/src/libraries/System.Text.RegularExpressions/src/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "netstandard1.5": {
+    "netstandard1.6": {
       "dependencies": {
         "Microsoft.NETCore.Platforms": "1.0.1-rc4-24201-04",
         "System.Collections": "4.0.10",
@@ -14,10 +14,10 @@
         "System.Threading.Tasks": "4.0.10"
       },
       "imports": [
-        "dotnet5.6"
+        "dotnet5.7"
       ]
     },
-    "net462": {
+    "net463": {
       "dependencies": {
         "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
       }
-- 
GitLab