diff --git a/Tests/IPAddressTests/IPAddressTests.nfproj b/Tests/IPAddressTests/IPAddressTests.nfproj
index da6e0df..f85f9f5 100644
--- a/Tests/IPAddressTests/IPAddressTests.nfproj
+++ b/Tests/IPAddressTests/IPAddressTests.nfproj
@@ -49,7 +49,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/IPAddressTests/packages.config b/Tests/IPAddressTests/packages.config
index be0f3ab..94d4f12 100644
--- a/Tests/IPAddressTests/packages.config
+++ b/Tests/IPAddressTests/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/IPAddressTests/packages.lock.json b/Tests/IPAddressTests/packages.lock.json
index 1970450..a35e189 100644
--- a/Tests/IPAddressTests/packages.lock.json
+++ b/Tests/IPAddressTests/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/Tests/NetworkHelperTests/NetworkHelperTests.nfproj b/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
index 20711d0..d578f85 100644
--- a/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
+++ b/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
@@ -58,7 +58,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>
     <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/Tests/NetworkHelperTests/packages.config b/Tests/NetworkHelperTests/packages.config
index 45a76a8..b763daf 100644
--- a/Tests/NetworkHelperTests/packages.config
+++ b/Tests/NetworkHelperTests/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.System.Threading" version="2.0.0-preview.14" targetFramework="netnano1.0" />
   <package id="nanoFramework.TestFramework" version="4.0.0-preview.58" targetFramework="netnano1.0" developmentDependency="true" />
diff --git a/Tests/NetworkHelperTests/packages.lock.json b/Tests/NetworkHelperTests/packages.lock.json
index d7e290c..29ccc67 100644
--- a/Tests/NetworkHelperTests/packages.lock.json
+++ b/Tests/NetworkHelperTests/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/Tests/SocketTests/SocketTests.nfproj b/Tests/SocketTests/SocketTests.nfproj
index 424e4e8..3efa8c6 100644
--- a/Tests/SocketTests/SocketTests.nfproj
+++ b/Tests/SocketTests/SocketTests.nfproj
@@ -52,7 +52,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/SocketTests/packages.config b/Tests/SocketTests/packages.config
index be0f3ab..94d4f12 100644
--- a/Tests/SocketTests/packages.config
+++ b/Tests/SocketTests/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/SocketTests/packages.lock.json b/Tests/SocketTests/packages.lock.json
index 1970450..a35e189 100644
--- a/Tests/SocketTests/packages.lock.json
+++ b/Tests/SocketTests/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.nuspec b/nanoFramework.System.Net.nuspec
index b9e6e86..10b5867 100644
--- a/nanoFramework.System.Net.nuspec
+++ b/nanoFramework.System.Net.nuspec
@@ -24,7 +24,7 @@ This package requires a target with System.Net v$nativeVersion$ (checksum $check
         <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.13" />
         <dependency id="nanoFramework.System.Text" version="2.0.0-preview.18" />
         <dependency id="nanoFramework.System.Threading" version="2.0.0-preview.14" />
-        <dependency id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" />
+        <dependency id="nanoFramework.System.IO.Streams" version="2.0.0-preview.21" />
       </group>
     </dependencies>
   </metadata>
diff --git a/nanoFramework.System.Net/System.Net.nfproj b/nanoFramework.System.Net/System.Net.nfproj
index c16c880..eb889a3 100644
--- a/nanoFramework.System.Net/System.Net.nfproj
+++ b/nanoFramework.System.Net/System.Net.nfproj
@@ -98,7 +98,7 @@
       <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.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/packages.config b/nanoFramework.System.Net/packages.config
index fdd482e..3fe5eef 100644
--- a/nanoFramework.System.Net/packages.config
+++ b/nanoFramework.System.Net/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <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.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.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/packages.lock.json b/nanoFramework.System.Net/packages.lock.json
index 2137d46..9211551 100644
--- a/nanoFramework.System.Net/packages.lock.json
+++ b/nanoFramework.System.Net/packages.lock.json
@@ -16,9 +16,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",