From faadac4a09cc6808eafc6cf33995232a93d353f3 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Wed, 23 Oct 2019 15:01:51 -0700
Subject: [PATCH 1/6] Update the S.T.E.W configurations to explicitly target a
 versioned TFM (nc3.0).

---
 src/System.Text.Encodings.Web/src/Configurations.props          | 2 +-
 .../src/System.Text.Encodings.Web.csproj                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Text.Encodings.Web/src/Configurations.props b/src/System.Text.Encodings.Web/src/Configurations.props
index 0c9a0f63c1b9..88984b8dd59e 100644
--- a/src/System.Text.Encodings.Web/src/Configurations.props
+++ b/src/System.Text.Encodings.Web/src/Configurations.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
     <BuildConfigurations>
-      netcoreapp;
+      netcoreapp3.0;
       netstandard2.1;
       netstandard;
     </BuildConfigurations>
diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index caff9e8050fc..cec889d85dfc 100644
--- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>System.Text.Encodings.Web</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
+    <Configurations>netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard-Debug;netstandard-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Text\Encodings\Web\DefaultJavaScriptEncoder.cs" />

From 8648cf6d7f5cbe54a6b1facdebc3f33c255572a1 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Wed, 23 Oct 2019 16:20:07 -0700
Subject: [PATCH 2/6] Use custom defined constant like S.T.Json -
 Building_Inbox_Library

---
 .../src/System.Text.Encodings.Web.csproj                    | 1 +
 .../System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs   | 4 ++--
 .../Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs     | 6 +++---
 .../src/System/Text/Encodings/Web/TextEncoder.cs            | 4 ++--
 .../Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs    | 6 +++---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index cec889d85dfc..7d81396d36cf 100644
--- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -3,6 +3,7 @@
     <RootNamespace>System.Text.Encodings.Web</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard-Debug;netstandard-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
+    <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Text\Encodings\Web\DefaultJavaScriptEncoder.cs" />
diff --git a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs
index ad6ffb9bc829..e3adc3cc6144 100644
--- a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs
+++ b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs
@@ -8,7 +8,7 @@
 using System.Text.Internal;
 using System.Text.Unicode;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
@@ -87,7 +87,7 @@ public override unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf
             {
                 int idx = 0;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
                 if (Sse2.IsSupported)
                 {
                     sbyte* startingAddress = (sbyte*)ptr;
diff --git a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs
index db25c3d6d63f..de1c466e308b 100644
--- a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs
+++ b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs
@@ -7,7 +7,7 @@
 using System.Text.Internal;
 using System.Text.Unicode;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
 using System.Numerics;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
@@ -83,7 +83,7 @@ public override unsafe int FindFirstCharacterToEncode(char* text, int textLength
 
             int idx = 0;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
             if (Sse2.IsSupported)
             {
                 short* startingAddress = (short*)text;
@@ -141,7 +141,7 @@ public override unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf
             {
                 int idx = 0;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
                 if (Sse2.IsSupported)
                 {
                     sbyte* startingAddress = (sbyte*)ptr;
diff --git a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs
index 4debeeeb155b..18defae4a266 100644
--- a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs
+++ b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs
@@ -10,7 +10,7 @@
 using System.Runtime.InteropServices;
 using System.Text.Unicode;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
@@ -711,7 +711,7 @@ public virtual unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf8
             {
                 int idx = 0;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
                 if (Sse2.IsSupported)
                 {
                     sbyte* startingAddress = (sbyte*)ptr;
diff --git a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs
index 3258bc0f0bd5..77e2ee7c23da 100644
--- a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs
+++ b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs
@@ -8,7 +8,7 @@
 using System.Text.Internal;
 using System.Text.Unicode;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
 using System.Numerics;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
@@ -63,7 +63,7 @@ public override unsafe int FindFirstCharacterToEncode(char* text, int textLength
 
             int idx = 0;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
             if (Sse2.IsSupported)
             {
                 short* startingAddress = (short*)text;
@@ -142,7 +142,7 @@ public override unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf
             {
                 int idx = 0;
 
-#if NETCOREAPP
+#if BUILDING_INBOX_LIBRARY
                 if (Sse2.IsSupported)
                 {
                     sbyte* startingAddress = (sbyte*)ptr;

From 563725a7303ea7767bceab8bd45f68acd04dc077 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahson_ahmedk@yahoo.com>
Date: Thu, 24 Oct 2019 02:23:19 -0700
Subject: [PATCH 3/6] Update config.props to use package config and leave
 netcoreapp as a build config

---
 src/System.Text.Encodings.Web/src/Configurations.props | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/System.Text.Encodings.Web/src/Configurations.props b/src/System.Text.Encodings.Web/src/Configurations.props
index 88984b8dd59e..7ea59953e5d4 100644
--- a/src/System.Text.Encodings.Web/src/Configurations.props
+++ b/src/System.Text.Encodings.Web/src/Configurations.props
@@ -1,9 +1,13 @@
 <Project DefaultTargets="Build">
   <PropertyGroup>
-    <BuildConfigurations>
+    <PackageConfigurations>
       netcoreapp3.0;
       netstandard2.1;
       netstandard;
+    </PackageConfigurations>
+    <BuildConfigurations>
+      $(PackageConfigurations);
+      netcoreapp;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

From 87b013c0d59a7b12c22fb3960fb16375774b65e4 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahson_ahmedk@yahoo.com>
Date: Thu, 24 Oct 2019 02:24:26 -0700
Subject: [PATCH 4/6] Add back netcoreapp specific config to the src csproj

---
 .../src/System.Text.Encodings.Web.csproj                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index 7d81396d36cf..e11dbdfb1975 100644
--- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>System.Text.Encodings.Web</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Configurations>netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard-Debug;netstandard-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
+    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard-Debug;netstandard-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
     <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
@@ -45,4 +45,4 @@
     <Reference Include="System.Runtime.Intrinsics" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From 1a7a1eb1f08f078a08e4fc68a4e40738c316a0fb Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Thu, 24 Oct 2019 16:31:10 -0700
Subject: [PATCH 5/6] Revert "Use custom defined constant like S.T.Json -
 Building_Inbox_Library"

This reverts commit 8648cf6d7f5cbe54a6b1facdebc3f33c255572a1.
---
 .../src/System.Text.Encodings.Web.csproj                    | 1 -
 .../System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs   | 4 ++--
 .../Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs     | 6 +++---
 .../src/System/Text/Encodings/Web/TextEncoder.cs            | 4 ++--
 .../Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs    | 6 +++---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index e11dbdfb1975..41f7b312fa02 100644
--- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -3,7 +3,6 @@
     <RootNamespace>System.Text.Encodings.Web</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netstandard-Debug;netstandard-Release;netstandard2.1-Debug;netstandard2.1-Release</Configurations>
-    <DefineConstants Condition="'$(TargetsNetCoreApp)' == 'true'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Text\Encodings\Web\DefaultJavaScriptEncoder.cs" />
diff --git a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs
index e3adc3cc6144..ad6ffb9bc829 100644
--- a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs
+++ b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoder.cs
@@ -8,7 +8,7 @@
 using System.Text.Internal;
 using System.Text.Unicode;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
@@ -87,7 +87,7 @@ public override unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf
             {
                 int idx = 0;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
                 if (Sse2.IsSupported)
                 {
                     sbyte* startingAddress = (sbyte*)ptr;
diff --git a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs
index de1c466e308b..db25c3d6d63f 100644
--- a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs
+++ b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs
@@ -7,7 +7,7 @@
 using System.Text.Internal;
 using System.Text.Unicode;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
 using System.Numerics;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
@@ -83,7 +83,7 @@ public override unsafe int FindFirstCharacterToEncode(char* text, int textLength
 
             int idx = 0;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
             if (Sse2.IsSupported)
             {
                 short* startingAddress = (short*)text;
@@ -141,7 +141,7 @@ public override unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf
             {
                 int idx = 0;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
                 if (Sse2.IsSupported)
                 {
                     sbyte* startingAddress = (sbyte*)ptr;
diff --git a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs
index 18defae4a266..4debeeeb155b 100644
--- a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs
+++ b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/TextEncoder.cs
@@ -10,7 +10,7 @@
 using System.Runtime.InteropServices;
 using System.Text.Unicode;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
 #endif
@@ -711,7 +711,7 @@ public virtual unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf8
             {
                 int idx = 0;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
                 if (Sse2.IsSupported)
                 {
                     sbyte* startingAddress = (sbyte*)ptr;
diff --git a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs
index 77e2ee7c23da..3258bc0f0bd5 100644
--- a/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs
+++ b/src/System.Text.Encodings.Web/src/System/Text/Encodings/Web/UnsafeRelaxedJavaScriptEncoder.cs
@@ -8,7 +8,7 @@
 using System.Text.Internal;
 using System.Text.Unicode;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
 using System.Numerics;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
@@ -63,7 +63,7 @@ public override unsafe int FindFirstCharacterToEncode(char* text, int textLength
 
             int idx = 0;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
             if (Sse2.IsSupported)
             {
                 short* startingAddress = (short*)text;
@@ -142,7 +142,7 @@ public override unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf
             {
                 int idx = 0;
 
-#if BUILDING_INBOX_LIBRARY
+#if NETCOREAPP
                 if (Sse2.IsSupported)
                 {
                     sbyte* startingAddress = (sbyte*)ptr;

From 4c58ba969e5b5dc1d8d43ec80b4ab408d08b259c Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Thu, 24 Oct 2019 16:32:31 -0700
Subject: [PATCH 6/6] Remove extra new line.

---
 .../src/System.Text.Encodings.Web.csproj                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
index 41f7b312fa02..76976d82c58a 100644
--- a/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
+++ b/src/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
@@ -44,4 +44,4 @@
     <Reference Include="System.Runtime.Intrinsics" />
     <Reference Include="System.Threading" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file