diff --git a/Tests/IPAddressTests/IPAddressTests.nfproj b/Tests/IPAddressTests/IPAddressTests.nfproj
index fd65705..5e67c85 100644
--- a/Tests/IPAddressTests/IPAddressTests.nfproj
+++ b/Tests/IPAddressTests/IPAddressTests.nfproj
@@ -40,7 +40,7 @@
       <HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.System.Text, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.15\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.TestFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.52\lib\nanoFramework.TestFramework.dll</HintPath>
@@ -49,7 +49,7 @@
       <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.52\lib\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.15\lib\netnano1.0\System.IO.Streams.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.17\lib\netnano1.0\System.IO.Streams.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Tests/IPAddressTests/packages.config b/Tests/IPAddressTests/packages.config
index 705553a..7f22931 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.49" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="2.0.0-preview.15" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.17" 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.52" 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 ae27c54..db5db7a 100644
--- a/Tests/IPAddressTests/packages.lock.json
+++ b/Tests/IPAddressTests/packages.lock.json
@@ -10,15 +10,15 @@
       },
       "nanoFramework.System.IO.Streams": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "VjdWLxapAF4hEr0vtJPAFEOY1xT9TyQlAB9wyRfcYmvoHiBIQWB0krgpw0yvC2C1AOLgE9op3HpsFbzrVRw3EA=="
+        "requested": "[2.0.0-preview.17, 2.0.0-preview.17]",
+        "resolved": "2.0.0-preview.17",
+        "contentHash": "bJNKElIzGlyTi6cgKnVcO4nrM8XOsNTBdSJygL62vZGBWBUZi7tJqjJTwfGgay/yMvKfNNnYYMg17jEXCwmEWw=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "zhVxQ+zUBkDPhpU35xX9JT/H8bFjo0ylQRmX/45QtM3QJQRd7a327R1PfBhpU5o3kpx2V8AcOgZBM8UilKwQeA=="
+        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
+        "resolved": "2.0.0-preview.18",
+        "contentHash": "ZnV49vaKgIzXN223aZ8Co3GZexDY+0d92QmOqfMdM/tzGIG2gnOy90UfAwQ3/n3Ea3a5RxNNgSxwxNGwsFgyMQ=="
       },
       "nanoFramework.TestFramework": {
         "type": "Direct",
diff --git a/Tests/NetworkHelperTests/NetworkHelperTests.nfproj b/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
index 7b377f5..e3a132f 100644
--- a/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
+++ b/Tests/NetworkHelperTests/NetworkHelperTests.nfproj
@@ -49,7 +49,7 @@
       <HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.System.Text, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.15\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.TestFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.52\lib\nanoFramework.TestFramework.dll</HintPath>
@@ -58,7 +58,7 @@
       <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.52\lib\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.15\lib\netnano1.0\System.IO.Streams.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.17\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.9\lib\netnano1.0\System.Threading.dll</HintPath>
diff --git a/Tests/NetworkHelperTests/packages.config b/Tests/NetworkHelperTests/packages.config
index e5afe0e..0a18105 100644
--- a/Tests/NetworkHelperTests/packages.config
+++ b/Tests/NetworkHelperTests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="2.0.0-preview.15" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.17" 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.9" targetFramework="netnano1.0" />
   <package id="nanoFramework.TestFramework" version="4.0.0-preview.52" targetFramework="netnano1.0" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Tests/NetworkHelperTests/packages.lock.json b/Tests/NetworkHelperTests/packages.lock.json
index 7ff57c4..9580479 100644
--- a/Tests/NetworkHelperTests/packages.lock.json
+++ b/Tests/NetworkHelperTests/packages.lock.json
@@ -10,15 +10,15 @@
       },
       "nanoFramework.System.IO.Streams": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "VjdWLxapAF4hEr0vtJPAFEOY1xT9TyQlAB9wyRfcYmvoHiBIQWB0krgpw0yvC2C1AOLgE9op3HpsFbzrVRw3EA=="
+        "requested": "[2.0.0-preview.17, 2.0.0-preview.17]",
+        "resolved": "2.0.0-preview.17",
+        "contentHash": "bJNKElIzGlyTi6cgKnVcO4nrM8XOsNTBdSJygL62vZGBWBUZi7tJqjJTwfGgay/yMvKfNNnYYMg17jEXCwmEWw=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "zhVxQ+zUBkDPhpU35xX9JT/H8bFjo0ylQRmX/45QtM3QJQRd7a327R1PfBhpU5o3kpx2V8AcOgZBM8UilKwQeA=="
+        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
+        "resolved": "2.0.0-preview.18",
+        "contentHash": "ZnV49vaKgIzXN223aZ8Co3GZexDY+0d92QmOqfMdM/tzGIG2gnOy90UfAwQ3/n3Ea3a5RxNNgSxwxNGwsFgyMQ=="
       },
       "nanoFramework.System.Threading": {
         "type": "Direct",
diff --git a/Tests/SocketTests/SocketTests.nfproj b/Tests/SocketTests/SocketTests.nfproj
index ea9c8da..755c9e7 100644
--- a/Tests/SocketTests/SocketTests.nfproj
+++ b/Tests/SocketTests/SocketTests.nfproj
@@ -43,7 +43,7 @@
       <HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.System.Text, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.15\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.18\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.TestFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.52\lib\nanoFramework.TestFramework.dll</HintPath>
@@ -52,7 +52,7 @@
       <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.52\lib\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.15\lib\netnano1.0\System.IO.Streams.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.17\lib\netnano1.0\System.IO.Streams.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Tests/SocketTests/packages.config b/Tests/SocketTests/packages.config
index 705553a..7f22931 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.49" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="2.0.0-preview.15" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.17" 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.52" 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 ae27c54..db5db7a 100644
--- a/Tests/SocketTests/packages.lock.json
+++ b/Tests/SocketTests/packages.lock.json
@@ -10,15 +10,15 @@
       },
       "nanoFramework.System.IO.Streams": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "VjdWLxapAF4hEr0vtJPAFEOY1xT9TyQlAB9wyRfcYmvoHiBIQWB0krgpw0yvC2C1AOLgE9op3HpsFbzrVRw3EA=="
+        "requested": "[2.0.0-preview.17, 2.0.0-preview.17]",
+        "resolved": "2.0.0-preview.17",
+        "contentHash": "bJNKElIzGlyTi6cgKnVcO4nrM8XOsNTBdSJygL62vZGBWBUZi7tJqjJTwfGgay/yMvKfNNnYYMg17jEXCwmEWw=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "zhVxQ+zUBkDPhpU35xX9JT/H8bFjo0ylQRmX/45QtM3QJQRd7a327R1PfBhpU5o3kpx2V8AcOgZBM8UilKwQeA=="
+        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
+        "resolved": "2.0.0-preview.18",
+        "contentHash": "ZnV49vaKgIzXN223aZ8Co3GZexDY+0d92QmOqfMdM/tzGIG2gnOy90UfAwQ3/n3Ea3a5RxNNgSxwxNGwsFgyMQ=="
       },
       "nanoFramework.TestFramework": {
         "type": "Direct",
diff --git a/nanoFramework.System.Net.nuspec b/nanoFramework.System.Net.nuspec
index 01b825d..2423418 100644
--- a/nanoFramework.System.Net.nuspec
+++ b/nanoFramework.System.Net.nuspec
@@ -22,9 +22,9 @@ This package requires a target with System.Net v$nativeVersion$ (checksum $check
       <group targetFramework=".NETnanoFramework1.0">
         <dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" />
         <dependency id="nanoFramework.Runtime.Events" version="2.0.0-preview.12" />
-        <dependency id="nanoFramework.System.Text" version="2.0.0-preview.15" />
+        <dependency id="nanoFramework.System.Text" version="2.0.0-preview.18" />
         <dependency id="nanoFramework.System.Threading" version="2.0.0-preview.9" />
-        <dependency id="nanoFramework.System.IO.Streams" version="2.0.0-preview.15" />
+        <dependency id="nanoFramework.System.IO.Streams" version="2.0.0-preview.17" />
       </group>
     </dependencies>
   </metadata>
diff --git a/nanoFramework.System.Net/System.Net.nfproj b/nanoFramework.System.Net/System.Net.nfproj
index ab7a2f9..6621443 100644
--- a/nanoFramework.System.Net/System.Net.nfproj
+++ b/nanoFramework.System.Net/System.Net.nfproj
@@ -139,10 +139,10 @@
       <HintPath>..\packages\nanoFramework.Runtime.Events.2.0.0-preview.12\lib\netnano1.0\nanoFramework.Runtime.Events.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.System.Text, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.2.0.0-preview.15\lib\netnano1.0\nanoFramework.System.Text.dll</HintPath>
+      <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.15\lib\netnano1.0\System.IO.Streams.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.17\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.9\lib\netnano1.0\System.Threading.dll</HintPath>
diff --git a/nanoFramework.System.Net/packages.config b/nanoFramework.System.Net/packages.config
index b4ca600..8e7f0fe 100644
--- a/nanoFramework.System.Net/packages.config
+++ b/nanoFramework.System.Net/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" targetFramework="netnano1.0" />
   <package id="nanoFramework.Runtime.Events" version="2.0.0-preview.12" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.15" targetFramework="netnano1.0" />
-  <package id="nanoFramework.System.Text" version="2.0.0-preview.15" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.17" 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.9" targetFramework="netnano1.0" />
   <package id="Nerdbank.GitVersioning" version="3.9.50" developmentDependency="true" targetFramework="netnano1.0" />
 </packages>
\ No newline at end of file
diff --git a/nanoFramework.System.Net/packages.lock.json b/nanoFramework.System.Net/packages.lock.json
index 38d50ed..7131802 100644
--- a/nanoFramework.System.Net/packages.lock.json
+++ b/nanoFramework.System.Net/packages.lock.json
@@ -16,15 +16,15 @@
       },
       "nanoFramework.System.IO.Streams": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "VjdWLxapAF4hEr0vtJPAFEOY1xT9TyQlAB9wyRfcYmvoHiBIQWB0krgpw0yvC2C1AOLgE9op3HpsFbzrVRw3EA=="
+        "requested": "[2.0.0-preview.17, 2.0.0-preview.17]",
+        "resolved": "2.0.0-preview.17",
+        "contentHash": "bJNKElIzGlyTi6cgKnVcO4nrM8XOsNTBdSJygL62vZGBWBUZi7tJqjJTwfGgay/yMvKfNNnYYMg17jEXCwmEWw=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "zhVxQ+zUBkDPhpU35xX9JT/H8bFjo0ylQRmX/45QtM3QJQRd7a327R1PfBhpU5o3kpx2V8AcOgZBM8UilKwQeA=="
+        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
+        "resolved": "2.0.0-preview.18",
+        "contentHash": "ZnV49vaKgIzXN223aZ8Co3GZexDY+0d92QmOqfMdM/tzGIG2gnOy90UfAwQ3/n3Ea3a5RxNNgSxwxNGwsFgyMQ=="
       },
       "nanoFramework.System.Threading": {
         "type": "Direct",