diff --git a/Tests/HttpUnitTests/HttpUnitTests.nfproj b/Tests/HttpUnitTests/HttpUnitTests.nfproj
index 767e593..feb976d 100644
--- a/Tests/HttpUnitTests/HttpUnitTests.nfproj
+++ b/Tests/HttpUnitTests/HttpUnitTests.nfproj
@@ -51,10 +51,10 @@
       <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.54\lib\nanoFramework.TestFramework.dll</HintPath>
+      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.58\lib\netnano1.0\nanoFramework.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.54\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
+      <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>
diff --git a/Tests/HttpUnitTests/packages.config b/Tests/HttpUnitTests/packages.config
index 97e9fa5..3d9c453 100644
--- a/Tests/HttpUnitTests/packages.config
+++ b/Tests/HttpUnitTests/packages.config
@@ -3,5 +3,5 @@
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.18" 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.54" targetFramework="netnano1.0" developmentDependency="true" />
+  <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 8b71caa..f58094c 100644
--- a/Tests/HttpUnitTests/packages.lock.json
+++ b/Tests/HttpUnitTests/packages.lock.json
@@ -22,9 +22,9 @@
       },
       "nanoFramework.TestFramework": {
         "type": "Direct",
-        "requested": "[4.0.0-preview.54, 4.0.0-preview.54]",
-        "resolved": "4.0.0-preview.54",
-        "contentHash": "k9DzCviFe94YL23Vr41uII7XkH37M16qndlE12fSiyYA23wqv+qMpyv+e7ZxrckXm/ZAV4ydBgSTbgz30bAl5Q=="
+        "requested": "[4.0.0-preview.58, 4.0.0-preview.58]",
+        "resolved": "4.0.0-preview.58",
+        "contentHash": "9og25km8L7R1m2s0QmYUSIKRYksQJVxV3BZr9OfmcBRbAfedxdhZfOQ1Z01lUWpK0Fq7zxUthkf8t4Br0kDl8w=="
       }
     }
   }
diff --git a/nanoFramework.System.Net.Http.Client.nuspec b/nanoFramework.System.Net.Http.Client.nuspec
index 2bc5903..a135684 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.12" />
         <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.15" />
+        <dependency id="nanoFramework.System.Net" version="2.0.0-preview.17" />
         <dependency id="nanoFramework.System.Threading" version="2.0.0-preview.11" />
       </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 8ae9f61..3476612 100644
--- a/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj
+++ b/nanoFramework.System.Net.Http.Client/System.Net.Http.Client.nfproj
@@ -225,7 +225,7 @@
       <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\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.15\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.17\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.11\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 a9d1775..322d7c8 100644
--- a/nanoFramework.System.Net.Http.Client/packages.config
+++ b/nanoFramework.System.Net.Http.Client/packages.config
@@ -4,7 +4,7 @@
   <package id="nanoFramework.Runtime.Events" version="2.0.0-preview.12" 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.15" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" 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.11" 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 ba4fe38..ad3277c 100644
--- a/nanoFramework.System.Net.Http.Client/packages.lock.json
+++ b/nanoFramework.System.Net.Http.Client/packages.lock.json
@@ -28,9 +28,9 @@
       },
       "nanoFramework.System.Net": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "+nSasz3rgL1VYnPeBK6pURco/0En2Ngv3nX+a1eE9cfIqkmKHcRicShDzYXzQRBdB1ncNRAHItIhuFP2Bg5rNQ=="
+        "requested": "[2.0.0-preview.17, 2.0.0-preview.17]",
+        "resolved": "2.0.0-preview.17",
+        "contentHash": "JW1hEmTZpjTZc0b9BuAss459xl9DyUP7+tpiWpiPHThiktE6y3NyKXGvB2IgGkHc6miyxZxtMfrmzClq2SDQQA=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
diff --git a/nanoFramework.System.Net.Http.Server.nuspec b/nanoFramework.System.Net.Http.Server.nuspec
index fee623e..d875bfc 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.12" />
         <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.15" />
+        <dependency id="nanoFramework.System.Net" version="2.0.0-preview.17" />
         <dependency id="nanoFramework.System.Threading" version="2.0.0-preview.11" />
       </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 7737c42..31f739d 100644
--- a/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj
+++ b/nanoFramework.System.Net.Http.Server/System.Net.Http.Server.nfproj
@@ -151,7 +151,7 @@
       <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\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.15\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.17\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.11\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 a9d1775..322d7c8 100644
--- a/nanoFramework.System.Net.Http.Server/packages.config
+++ b/nanoFramework.System.Net.Http.Server/packages.config
@@ -4,7 +4,7 @@
   <package id="nanoFramework.Runtime.Events" version="2.0.0-preview.12" 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.15" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" 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.11" 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 ba4fe38..ad3277c 100644
--- a/nanoFramework.System.Net.Http.Server/packages.lock.json
+++ b/nanoFramework.System.Net.Http.Server/packages.lock.json
@@ -28,9 +28,9 @@
       },
       "nanoFramework.System.Net": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "+nSasz3rgL1VYnPeBK6pURco/0En2Ngv3nX+a1eE9cfIqkmKHcRicShDzYXzQRBdB1ncNRAHItIhuFP2Bg5rNQ=="
+        "requested": "[2.0.0-preview.17, 2.0.0-preview.17]",
+        "resolved": "2.0.0-preview.17",
+        "contentHash": "JW1hEmTZpjTZc0b9BuAss459xl9DyUP7+tpiWpiPHThiktE6y3NyKXGvB2IgGkHc6miyxZxtMfrmzClq2SDQQA=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
diff --git a/nanoFramework.System.Net.Http.nuspec b/nanoFramework.System.Net.Http.nuspec
index 106581a..5fbb230 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.12" />
       <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.15" />
+      <dependency id="nanoFramework.System.Net" version="2.0.0-preview.17" />
       <dependency id="nanoFramework.System.Threading" version="2.0.0-preview.11" />
     </dependencies>
   </metadata>
diff --git a/nanoFramework.System.Net.Http/System.Net.Http.nfproj b/nanoFramework.System.Net.Http/System.Net.Http.nfproj
index cbb7492..8191f08 100644
--- a/nanoFramework.System.Net.Http/System.Net.Http.nfproj
+++ b/nanoFramework.System.Net.Http/System.Net.Http.nfproj
@@ -125,7 +125,7 @@
       <HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.18\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.15\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.17\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.11\lib\netnano1.0\System.Threading.dll</HintPath>
diff --git a/nanoFramework.System.Net.Http/packages.config b/nanoFramework.System.Net.Http/packages.config
index a9d1775..322d7c8 100644
--- a/nanoFramework.System.Net.Http/packages.config
+++ b/nanoFramework.System.Net.Http/packages.config
@@ -4,7 +4,7 @@
   <package id="nanoFramework.Runtime.Events" version="2.0.0-preview.12" 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.15" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" 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.11" 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 ba4fe38..ad3277c 100644
--- a/nanoFramework.System.Net.Http/packages.lock.json
+++ b/nanoFramework.System.Net.Http/packages.lock.json
@@ -28,9 +28,9 @@
       },
       "nanoFramework.System.Net": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.15, 2.0.0-preview.15]",
-        "resolved": "2.0.0-preview.15",
-        "contentHash": "+nSasz3rgL1VYnPeBK6pURco/0En2Ngv3nX+a1eE9cfIqkmKHcRicShDzYXzQRBdB1ncNRAHItIhuFP2Bg5rNQ=="
+        "requested": "[2.0.0-preview.17, 2.0.0-preview.17]",
+        "resolved": "2.0.0-preview.17",
+        "contentHash": "JW1hEmTZpjTZc0b9BuAss459xl9DyUP7+tpiWpiPHThiktE6y3NyKXGvB2IgGkHc6miyxZxtMfrmzClq2SDQQA=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",