Update all projects to netstandard 2.0 minimum

DotnetCLIVersion.txt

@@ -1 +1 @@
-3.0.100-preview6-011836
+3.0.100

corefxlab.sln

@@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Formatting.Glob
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Http", "src\System.Text.Http\System.Text.Http.csproj", "{90008F3E-FFBA-47C4-842F-24014256A9F8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.JsonLab", "src\System.Text.JsonLab\System.Text.JsonLab.csproj", "{D49453F3-A51A-49B8-B151-1C7CD92C229E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Time", "src\System.Time\System.Time.csproj", "{66579C6A-8316-4888-8D96-36D4B49D7D51}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Primitives", "src\System.Text.Primitives\System.Text.Primitives.csproj", "{80E6332B-DC83-4DFC-9C19-8D89E988BA4E}"
@@ -41,8 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web.U
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Sequences", "src\System.Collections.Sequences\System.Collections.Sequences.csproj", "{2D178A3D-247D-46C4-BAC3-DAB5EFC064A7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.JsonLab.Dynamic", "src\System.Text.JsonLab.Dynamic\System.Text.JsonLab.Dynamic.csproj", "{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Experimental.Tests", "tests\System.Buffers.Experimental.Tests\System.Buffers.Experimental.Tests.csproj", "{0935E538-179C-4768-89B0-C0D197B4D18B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watcher.Polling.Tests", "tests\System.IO.FileSystem.Watcher.Polling.Tests\System.IO.FileSystem.Watcher.Polling.Tests.csproj", "{1FE25651-12C4-45B4-BB9F-E2F6D1D8383F}"
@@ -53,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Formatting.Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Http.Tests", "tests\System.Text.Http.Tests\System.Text.Http.Tests.csproj", "{5BEB8847-AD3C-45DF-A705-6F6DE3F4214D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.JsonLab.Tests", "tests\System.Text.JsonLab.Tests\System.Text.JsonLab.Tests.csproj", "{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Primitives.Tests", "tests\System.Text.Primitives.Tests\System.Text.Primitives.Tests.csproj", "{67B42C20-D98A-420B-82C0-04AFD963E650}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Binary.Base64.Tests", "tests\System.Binary.Base64.Tests\System.Binary.Base64.Tests.csproj", "{481F242E-57E0-4904-89E2-345677D98C55}"
@@ -69,8 +63,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web.U
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "tests\Benchmarks\Benchmarks.csproj", "{E87AA970-5AE9-405E-8D34-F31EF415BE6D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.JsonLab.Dynamic.Tests", "tests\System.Text.JsonLab.Dynamic.Tests\System.Text.JsonLab.Dynamic.Tests.csproj", "{1ED92192-6C2A-44A5-9098-F9CBABB0292D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Primitives", "src\System.Buffers.Primitives\System.Buffers.Primitives.csproj", "{AABC47B4-F133-4B16-920B-9BDCE22F7E97}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Primitives.Tests", "tests\System.Buffers.Primitives.Tests\System.Buffers.Primitives.Tests.csproj", "{5E04C824-5961-445E-85E2-8AC27C9AA761}"
@@ -207,18 +199,6 @@ Global
 		{90008F3E-FFBA-47C4-842F-24014256A9F8}.Release|x64.Build.0 = Release|Any CPU
 		{90008F3E-FFBA-47C4-842F-24014256A9F8}.Release|x86.ActiveCfg = Release|Any CPU
 		{90008F3E-FFBA-47C4-842F-24014256A9F8}.Release|x86.Build.0 = Release|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Debug|x64.Build.0 = Debug|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Debug|x86.Build.0 = Debug|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Release|x64.ActiveCfg = Release|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Release|x64.Build.0 = Release|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Release|x86.ActiveCfg = Release|Any CPU
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E}.Release|x86.Build.0 = Release|Any CPU
 		{66579C6A-8316-4888-8D96-36D4B49D7D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{66579C6A-8316-4888-8D96-36D4B49D7D51}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{66579C6A-8316-4888-8D96-36D4B49D7D51}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -291,18 +271,6 @@ Global
 		{2D178A3D-247D-46C4-BAC3-DAB5EFC064A7}.Release|x64.Build.0 = Release|Any CPU
 		{2D178A3D-247D-46C4-BAC3-DAB5EFC064A7}.Release|x86.ActiveCfg = Release|Any CPU
 		{2D178A3D-247D-46C4-BAC3-DAB5EFC064A7}.Release|x86.Build.0 = Release|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Debug|x64.Build.0 = Debug|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Debug|x86.Build.0 = Debug|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Release|x64.ActiveCfg = Release|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Release|x64.Build.0 = Release|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Release|x86.ActiveCfg = Release|Any CPU
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0}.Release|x86.Build.0 = Release|Any CPU
 		{0935E538-179C-4768-89B0-C0D197B4D18B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0935E538-179C-4768-89B0-C0D197B4D18B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0935E538-179C-4768-89B0-C0D197B4D18B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -363,18 +331,6 @@ Global
 		{5BEB8847-AD3C-45DF-A705-6F6DE3F4214D}.Release|x64.Build.0 = Release|Any CPU
 		{5BEB8847-AD3C-45DF-A705-6F6DE3F4214D}.Release|x86.ActiveCfg = Release|Any CPU
 		{5BEB8847-AD3C-45DF-A705-6F6DE3F4214D}.Release|x86.Build.0 = Release|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Debug|x64.Build.0 = Debug|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Debug|x86.Build.0 = Debug|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Release|x64.ActiveCfg = Release|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Release|x64.Build.0 = Release|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Release|x86.ActiveCfg = Release|Any CPU
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA}.Release|x86.Build.0 = Release|Any CPU
 		{67B42C20-D98A-420B-82C0-04AFD963E650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67B42C20-D98A-420B-82C0-04AFD963E650}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67B42C20-D98A-420B-82C0-04AFD963E650}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -459,18 +415,6 @@ Global
 		{E87AA970-5AE9-405E-8D34-F31EF415BE6D}.Release|x64.Build.0 = Release|Any CPU
 		{E87AA970-5AE9-405E-8D34-F31EF415BE6D}.Release|x86.ActiveCfg = Release|Any CPU
 		{E87AA970-5AE9-405E-8D34-F31EF415BE6D}.Release|x86.Build.0 = Release|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Debug|x64.Build.0 = Debug|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Debug|x86.Build.0 = Debug|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Release|x64.ActiveCfg = Release|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Release|x64.Build.0 = Release|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Release|x86.ActiveCfg = Release|Any CPU
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D}.Release|x86.Build.0 = Release|Any CPU
 		{AABC47B4-F133-4B16-920B-9BDCE22F7E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AABC47B4-F133-4B16-920B-9BDCE22F7E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AABC47B4-F133-4B16-920B-9BDCE22F7E97}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -806,28 +750,24 @@ Global
 		{03F1B57E-756C-4AF0-91FD-3E2871C1B193} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{99FA7791-A190-44A2-9A77-303BFA13095F} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{90008F3E-FFBA-47C4-842F-24014256A9F8} = {4B000021-5278-4F2A-B734-DE49F55D4024}
-		{D49453F3-A51A-49B8-B151-1C7CD92C229E} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{66579C6A-8316-4888-8D96-36D4B49D7D51} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{80E6332B-DC83-4DFC-9C19-8D89E988BA4E} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{B9ECBAF7-524D-4134-AE37-EFF7802B221F} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{12D7B81D-26FD-4BCA-9D72-AFDEA900BAAC} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{20974D06-EBDC-44B8-A034-DE1440CF7A45} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{2D178A3D-247D-46C4-BAC3-DAB5EFC064A7} = {4B000021-5278-4F2A-B734-DE49F55D4024}
-		{BB6D79C1-783F-4B87-A281-5EAB22CA7BF0} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{0935E538-179C-4768-89B0-C0D197B4D18B} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{1FE25651-12C4-45B4-BB9F-E2F6D1D8383F} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{800D4694-944C-44BB-9516-138ACCD22943} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{CC8EBE40-4B0B-471F-B182-F1039B69D802} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{5BEB8847-AD3C-45DF-A705-6F6DE3F4214D} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
-		{CAE4AD10-4A0F-4DBD-8894-2FA91E7E6DCA} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{67B42C20-D98A-420B-82C0-04AFD963E650} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{481F242E-57E0-4904-89E2-345677D98C55} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{872C74A2-97BD-4672-9674-BC361419AF32} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{C57FDCE0-2A8A-4827-95D4-439239E32EB9} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{8EC131AE-D04F-4B7D-B223-D82821D8AFCC} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{D38CF672-795E-41D2-B10D-CFA87927BBDC} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{E87AA970-5AE9-405E-8D34-F31EF415BE6D} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
-		{1ED92192-6C2A-44A5-9098-F9CBABB0292D} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{AABC47B4-F133-4B16-920B-9BDCE22F7E97} = {4B000021-5278-4F2A-B734-DE49F55D4024}
 		{5E04C824-5961-445E-85E2-8AC27C9AA761} = {3079E458-D0E6-4F99-8CAB-80011D35C7DA}
 		{07CC9F28-FC67-453B-9057-AC9025E5CA67} = {4B000021-5278-4F2A-B734-DE49F55D4024}

samples/LowAllocationWebServer/LowAllocationWebServer.csproj

@@ -12,10 +12,12 @@
     <None Remove="LowAllocationWebServerCore\obj\**" />
     <None Remove="LowAllocationWebServerLibrary\obj\**" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.Text.Http\System.Text.Http.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Formatting\System.Text.Formatting.csproj" />
-    <ProjectReference Include="..\..\src\System.Text.JsonLab\System.Text.JsonLab.csproj" />
     <ProjectReference Include="..\..\src\System.Text.Primitives\System.Text.Primitives.csproj" />
     <ProjectReference Include="..\..\src\System.Buffers.Primitives\System.Buffers.Primitives.csproj" />
     <ProjectReference Include="..\..\src\System.Buffers.Experimental\System.Buffers.Experimental.csproj" />

samples/LowAllocationWebServer/Shared/SampleServer.cs

@@ -5,8 +5,8 @@
 using System;
 using System.Diagnostics;
 using System.Text.Formatting;
-using System.Text.JsonLab;
 using System.Buffers;
+using System.Text.Json;
 using System.Threading;
 using System.Text.Http.Parser;
 using Microsoft.Net;
@@ -63,15 +63,15 @@ static void WriteResponseForGetJson(HttpRequest request, ReadOnlySequence<byte>
             response.AppendEoh();
 
             // write response JSON
-            var jsonWriter = new Utf8JsonWriter<TcpConnectionFormatter>(response, prettyPrint: false);
-            jsonWriter.WriteObjectStart();
-            jsonWriter.WriteArrayStart("values");
+            var jsonWriter = new Utf8JsonWriter(response);
+            jsonWriter.WriteStartObject();
+            jsonWriter.WriteStartArray("values");
             for (int i = 0; i < 5; i++)
             {
-                jsonWriter.WriteValue("hello!");
+                jsonWriter.WriteStringValue("hello!");
             }
-            jsonWriter.WriteArrayEnd();
-            jsonWriter.WriteObjectEnd();
+            jsonWriter.WriteEndArray();
+            jsonWriter.WriteEndObject();
             jsonWriter.Flush();
         }
 
@@ -80,31 +80,25 @@ static void WriteResponseForPostJson(HttpRequest request, ReadOnlySequence<byte>
             // read request json
             int requestedCount;
 
-            // TODO: this should not convert to span
-            JsonObject dom = JsonObject.Parse(body.First.Span);
-            try
+            using (JsonDocument dom = JsonDocument.Parse(body.First))
             {
-                requestedCount = (int)dom["Count"];
-            }
-            finally
-            {
-                dom.Dispose();
+                requestedCount = dom.RootElement.GetProperty("Count").GetInt32();
             }
 
             WriteCommonHeaders(ref response, Http.Version.Http11, 200, "OK");
             response.Append("Content-Type : application/json; charset=UTF-8\r\n");
             response.AppendEoh();
 
             // write response JSON
-            var jsonWriter = new Utf8JsonWriter<TcpConnectionFormatter>(response, prettyPrint: false);
-            jsonWriter.WriteObjectStart();
-            jsonWriter.WriteArrayStart("values");
+            var jsonWriter = new Utf8JsonWriter(response);
+            jsonWriter.WriteStartObject();
+            jsonWriter.WriteStartArray("values");
             for (int i = 0; i < requestedCount; i++)
             {
-                jsonWriter.WriteValue("hello!");
+                jsonWriter.WriteStringValue("hello!");
             }
-            jsonWriter.WriteArrayEnd();
-            jsonWriter.WriteObjectEnd();
+            jsonWriter.WriteEndArray();
+            jsonWriter.WriteEndObject();
             jsonWriter.Flush();
         }
     }

src/System.Azure.Experimental/System.Azure.Experimental.csproj

@@ -8,7 +8,7 @@
 
   <PropertyGroup>
     <Description>Set of building blocks for Azure SDK</Description>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageTags>BCL for Azure SDK </PackageTags>
     <!-- disable automatic compile item inclusion so that we can set the correct metadata on TextTemplate-generated sources -->

src/System.Binary.Base64/System.Binary.Base64.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Non-allocating Base64 encoder and decoded</Description>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <PackageTags>.NET non-allocating Base64 encoder and decoder</PackageTags>
   </PropertyGroup>

src/System.Buffers.Experimental/System.Buffers.Experimental.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Pool of unmanaged Span&lt;byte&gt; values</Description>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageTags>Span Spans Pool corefxlab</PackageTags>
   </PropertyGroup>

src/System.Buffers.Primitives/System.Buffers.Primitives.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Slices of arrays and buffers</Description>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageTags>Slice Span Slices Spans</PackageTags>
     <RootNamespace></RootNamespace>

src/System.Buffers.ReaderWriter/System.Buffers.ReaderWriter.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Buffer Readers, Writers, and Transformations</Description>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageTags>Span BufferReader BufferWriter corefxlab</PackageTags>
   </PropertyGroup>
@@ -11,6 +11,6 @@
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemCompilerServicesUnsafeVersion)" />
-    <PackageReference Include="System.Numerics.Vectors" Version="$(CoreFxStableVersion)" />
+    <PackageReference Include="System.Numerics.Vectors" Version="$(SystemNumericsVectorsVersion)" />
   </ItemGroup>
 </Project>

src/System.Collections.Sequences/System.Collections.Sequences.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Non-allocating collections</Description>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageTags>collections, non-allocating, corefxlab</PackageTags>
   </PropertyGroup>