diff --git a/Tests/HttpUnitTests/HttpUnitTests.nfproj b/Tests/HttpUnitTests/HttpUnitTests.nfproj
index 62016a5..481bca6 100644
--- a/Tests/HttpUnitTests/HttpUnitTests.nfproj
+++ b/Tests/HttpUnitTests/HttpUnitTests.nfproj
@@ -57,7 +57,7 @@
       <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.58\lib\netnano1.0\nanoFramework.UnitTestLauncher.exe</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.21\lib\netnano1.0\System.IO.Streams.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Tests/HttpUnitTests/packages.config b/Tests/HttpUnitTests/packages.config
index be0f3ab..94d4f12 100644
--- a/Tests/HttpUnitTests/packages.config
+++ b/Tests/HttpUnitTests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.52" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.21" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Text" version="2.0.0-preview.18" targetFramework="netnano1.0" />
   <package id="nanoFramework.TestFramework" version="4.0.0-preview.58" targetFramework="netnano1.0" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Tests/HttpUnitTests/packages.lock.json b/Tests/HttpUnitTests/packages.lock.json
index 1970450..a35e189 100644
--- a/Tests/HttpUnitTests/packages.lock.json
+++ b/Tests/HttpUnitTests/packages.lock.json
@@ -10,9 +10,9 @@
       },
       "nanoFramework.System.IO.Streams": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
-        "resolved": "2.0.0-preview.18",
-        "contentHash": "X6Zv6eYRWqSY1eu7S7SwfIoFtFQfc8Rrl7CJN8dxuiry0K4SioSjuRFvnGerTnCWPEXy1gXGbbLRBVkYscw9fg=="
+        "requested": "[2.0.0-preview.21, 2.0.0-preview.21]",
+        "resolved": "2.0.0-preview.21",
+        "contentHash": "wsgKxwjG/QWIgIi/6zPs9M5u1g8digdOHOkUXweij0jHg96yjfCaN6907XElq9zT79QDomJWKMFGSdGqJAkm4Q=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
diff --git a/nanoFramework.System.Net.Http.Client.nuspec b/nanoFramework.System.Net.Http.Client.nuspec
index 1d44e56..f6b2466 100644
--- a/nanoFramework.System.Net.Http.Client.nuspec
+++ b/nanoFramework.System.Net.Http.Client.nuspec
@@ -24,7 +24,7 @@ There is also a package with the server API only and another with the full API.<
         <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.13" />
         <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.14" />
         <dependency id="nanoFramework.System.Text" version="2.0.0-preview.18" />
-        <dependency id="nanoFramework.System.Net" version="2.0.0-preview.21" />
+        <dependency id="nanoFramework.System.Net" version="2.0.0-preview.22" />
         <dependency id="nanoFramework.System.Threading" version="2.0.0-preview.14" />
       </group>
     </dependencies>
diff --git a/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj b/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj
index eed22e1..ab16353 100644
--- a/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj
+++ b/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj
@@ -222,10 +222,10 @@
       <HintPath>..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.21\lib\netnano1.0\System.IO.Streams.dll</HintPath>
     </Reference>
     <Reference Include="System.Net, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.21\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.22\lib\netnano1.0\System.Net.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Threading.2.0.0-preview.14\lib\netnano1.0\System.Threading.dll</HintPath>
diff --git a/nanoFramework.System.Net.Http.Client/packages.config b/nanoFramework.System.Net.Http.Client/packages.config
index 1510b3e..59d9414 100644
--- a/nanoFramework.System.Net.Http.Client/packages.config
+++ b/nanoFramework.System.Net.Http.Client/packages.config
@@ -3,8 +3,8 @@
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.52" targetFramework="netnano1.0" />
   <package id="nanoFramework.Runtime.Events" version="2.0.0-preview.13" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Collections" version="2.0.0-preview.14" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="2.0.0-preview.21" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.21" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" version="2.0.0-preview.22" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Text" version="2.0.0-preview.18" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="2.0.0-preview.14" targetFramework="netnano1.0" />
   <package id="Nerdbank.GitVersioning" version="3.9.50" developmentDependency="true" targetFramework="netnano1.0" />
diff --git a/nanoFramework.System.Net.Http.Client/packages.lock.json b/nanoFramework.System.Net.Http.Client/packages.lock.json
index d2ec4df..0b6a0bb 100644
--- a/nanoFramework.System.Net.Http.Client/packages.lock.json
+++ b/nanoFramework.System.Net.Http.Client/packages.lock.json
@@ -22,15 +22,15 @@
       },
       "nanoFramework.System.IO.Streams": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
-        "resolved": "2.0.0-preview.18",
-        "contentHash": "X6Zv6eYRWqSY1eu7S7SwfIoFtFQfc8Rrl7CJN8dxuiry0K4SioSjuRFvnGerTnCWPEXy1gXGbbLRBVkYscw9fg=="
+        "requested": "[2.0.0-preview.21, 2.0.0-preview.21]",
+        "resolved": "2.0.0-preview.21",
+        "contentHash": "wsgKxwjG/QWIgIi/6zPs9M5u1g8digdOHOkUXweij0jHg96yjfCaN6907XElq9zT79QDomJWKMFGSdGqJAkm4Q=="
       },
       "nanoFramework.System.Net": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.21, 2.0.0-preview.21]",
-        "resolved": "2.0.0-preview.21",
-        "contentHash": "FwudtrZ58UfZPegEEMjQtjkIzF1IlN6hu8t1N2sKkNske09fXu0N09p7iPFL7D6mF9pwEtTPLOzlO+XdbvFZIg=="
+        "requested": "[2.0.0-preview.22, 2.0.0-preview.22]",
+        "resolved": "2.0.0-preview.22",
+        "contentHash": "+0R0vgvae5W8yJCoTyP8/LAbqvSf3GCOh39rPlhT3FTc5naGiJipMrMsGPtfUjMh+TC/7EtaFvyicppkMiJcaA=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
diff --git a/nanoFramework.System.Net.Http.Server.nuspec b/nanoFramework.System.Net.Http.Server.nuspec
index 3cdda03..02654e3 100644
--- a/nanoFramework.System.Net.Http.Server.nuspec
+++ b/nanoFramework.System.Net.Http.Server.nuspec
@@ -24,7 +24,7 @@ There is also a package with the client API only and another with the full API.<
         <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.13" />
         <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.14" />
         <dependency id="nanoFramework.System.Text" version="2.0.0-preview.18" />
-        <dependency id="nanoFramework.System.Net" version="2.0.0-preview.21" />
+        <dependency id="nanoFramework.System.Net" version="2.0.0-preview.22" />
         <dependency id="nanoFramework.System.Threading" version="2.0.0-preview.14" />
       </group>
     </dependencies>
diff --git a/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj b/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj
index 8f21a2b..924f407 100644
--- a/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj
+++ b/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj
@@ -148,10 +148,10 @@
       <HintPath>..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.21\lib\netnano1.0\System.IO.Streams.dll</HintPath>
     </Reference>
     <Reference Include="System.Net, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.21\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.22\lib\netnano1.0\System.Net.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Threading.2.0.0-preview.14\lib\netnano1.0\System.Threading.dll</HintPath>
diff --git a/nanoFramework.System.Net.Http.Server/packages.config b/nanoFramework.System.Net.Http.Server/packages.config
index 1510b3e..59d9414 100644
--- a/nanoFramework.System.Net.Http.Server/packages.config
+++ b/nanoFramework.System.Net.Http.Server/packages.config
@@ -3,8 +3,8 @@
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.52" targetFramework="netnano1.0" />
   <package id="nanoFramework.Runtime.Events" version="2.0.0-preview.13" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Collections" version="2.0.0-preview.14" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="2.0.0-preview.21" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.21" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" version="2.0.0-preview.22" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Text" version="2.0.0-preview.18" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="2.0.0-preview.14" targetFramework="netnano1.0" />
   <package id="Nerdbank.GitVersioning" version="3.9.50" developmentDependency="true" targetFramework="netnano1.0" />
diff --git a/nanoFramework.System.Net.Http.Server/packages.lock.json b/nanoFramework.System.Net.Http.Server/packages.lock.json
index d2ec4df..0b6a0bb 100644
--- a/nanoFramework.System.Net.Http.Server/packages.lock.json
+++ b/nanoFramework.System.Net.Http.Server/packages.lock.json
@@ -22,15 +22,15 @@
       },
       "nanoFramework.System.IO.Streams": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
-        "resolved": "2.0.0-preview.18",
-        "contentHash": "X6Zv6eYRWqSY1eu7S7SwfIoFtFQfc8Rrl7CJN8dxuiry0K4SioSjuRFvnGerTnCWPEXy1gXGbbLRBVkYscw9fg=="
+        "requested": "[2.0.0-preview.21, 2.0.0-preview.21]",
+        "resolved": "2.0.0-preview.21",
+        "contentHash": "wsgKxwjG/QWIgIi/6zPs9M5u1g8digdOHOkUXweij0jHg96yjfCaN6907XElq9zT79QDomJWKMFGSdGqJAkm4Q=="
       },
       "nanoFramework.System.Net": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.21, 2.0.0-preview.21]",
-        "resolved": "2.0.0-preview.21",
-        "contentHash": "FwudtrZ58UfZPegEEMjQtjkIzF1IlN6hu8t1N2sKkNske09fXu0N09p7iPFL7D6mF9pwEtTPLOzlO+XdbvFZIg=="
+        "requested": "[2.0.0-preview.22, 2.0.0-preview.22]",
+        "resolved": "2.0.0-preview.22",
+        "contentHash": "+0R0vgvae5W8yJCoTyP8/LAbqvSf3GCOh39rPlhT3FTc5naGiJipMrMsGPtfUjMh+TC/7EtaFvyicppkMiJcaA=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
diff --git a/nanoFramework.System.Net.Http.nuspec b/nanoFramework.System.Net.Http.nuspec
index f2516da..18dcbed 100644
--- a/nanoFramework.System.Net.Http.nuspec
+++ b/nanoFramework.System.Net.Http.nuspec
@@ -24,7 +24,7 @@ These are meant to be used when there is the need to use smaller assemblies.</de
       <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.13" />
       <dependency id="nanoFramework.System.Collections" version="2.0.0-preview.14" />
       <dependency id="nanoFramework.System.Text" version="2.0.0-preview.18" />
-      <dependency id="nanoFramework.System.Net" version="2.0.0-preview.21" />
+      <dependency id="nanoFramework.System.Net" version="2.0.0-preview.22" />
       <dependency id="nanoFramework.System.Threading" version="2.0.0-preview.14" />
     </dependencies>
   </metadata>
diff --git a/nanoFramework.System.Net.Http/System.Net.Http.nfproj b/nanoFramework.System.Net.Http/System.Net.Http.nfproj
index a7d101a..b20e064 100644
--- a/nanoFramework.System.Net.Http/System.Net.Http.nfproj
+++ b/nanoFramework.System.Net.Http/System.Net.Http.nfproj
@@ -122,10 +122,10 @@
       <HintPath>..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Streams, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\lib\netnano1.0\System.IO.Streams.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.21\lib\netnano1.0\System.IO.Streams.dll</HintPath>
     </Reference>
     <Reference Include="System.Net, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.21\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.22\lib\netnano1.0\System.Net.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.System.Threading.2.0.0-preview.14\lib\netnano1.0\System.Threading.dll</HintPath>
diff --git a/nanoFramework.System.Net.Http/packages.config b/nanoFramework.System.Net.Http/packages.config
index 1510b3e..59d9414 100644
--- a/nanoFramework.System.Net.Http/packages.config
+++ b/nanoFramework.System.Net.Http/packages.config
@@ -3,8 +3,8 @@
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.52" targetFramework="netnano1.0" />
   <package id="nanoFramework.Runtime.Events" version="2.0.0-preview.13" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Collections" version="2.0.0-preview.14" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Net" version="2.0.0-preview.21" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.21" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" version="2.0.0-preview.22" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Text" version="2.0.0-preview.18" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Threading" version="2.0.0-preview.14" targetFramework="netnano1.0" />
   <package id="Nerdbank.GitVersioning" version="3.9.50" developmentDependency="true" targetFramework="netnano1.0" />
diff --git a/nanoFramework.System.Net.Http/packages.lock.json b/nanoFramework.System.Net.Http/packages.lock.json
index d2ec4df..0b6a0bb 100644
--- a/nanoFramework.System.Net.Http/packages.lock.json
+++ b/nanoFramework.System.Net.Http/packages.lock.json
@@ -22,15 +22,15 @@
       },
       "nanoFramework.System.IO.Streams": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
-        "resolved": "2.0.0-preview.18",
-        "contentHash": "X6Zv6eYRWqSY1eu7S7SwfIoFtFQfc8Rrl7CJN8dxuiry0K4SioSjuRFvnGerTnCWPEXy1gXGbbLRBVkYscw9fg=="
+        "requested": "[2.0.0-preview.21, 2.0.0-preview.21]",
+        "resolved": "2.0.0-preview.21",
+        "contentHash": "wsgKxwjG/QWIgIi/6zPs9M5u1g8digdOHOkUXweij0jHg96yjfCaN6907XElq9zT79QDomJWKMFGSdGqJAkm4Q=="
       },
       "nanoFramework.System.Net": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.21, 2.0.0-preview.21]",
-        "resolved": "2.0.0-preview.21",
-        "contentHash": "FwudtrZ58UfZPegEEMjQtjkIzF1IlN6hu8t1N2sKkNske09fXu0N09p7iPFL7D6mF9pwEtTPLOzlO+XdbvFZIg=="
+        "requested": "[2.0.0-preview.22, 2.0.0-preview.22]",
+        "resolved": "2.0.0-preview.22",
+        "contentHash": "+0R0vgvae5W8yJCoTyP8/LAbqvSf3GCOh39rPlhT3FTc5naGiJipMrMsGPtfUjMh+TC/7EtaFvyicppkMiJcaA=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",