diff --git a/nanoFramework.System.Net.Http.Client.nuspec b/nanoFramework.System.Net.Http.Client.nuspec
index a135684..ad3a6d6 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.17" />
+        <dependency id="nanoFramework.System.Net" version="2.0.0-preview.18" />
         <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 3476612..ed3f186 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.17\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.18\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 322d7c8..e086a6c 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.17" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" 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.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 ad3277c..f323eae 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.17, 2.0.0-preview.17]",
-        "resolved": "2.0.0-preview.17",
-        "contentHash": "JW1hEmTZpjTZc0b9BuAss459xl9DyUP7+tpiWpiPHThiktE6y3NyKXGvB2IgGkHc6miyxZxtMfrmzClq2SDQQA=="
+        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
+        "resolved": "2.0.0-preview.18",
+        "contentHash": "qLCtluDaXsPIi3vpyRhmifx0yw065UToZ/uPNUJwe0uG3O+uDtEwSWmo/iySy4yiqTBGZ8vFGnfIb0bU2fWFPw=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
diff --git a/nanoFramework.System.Net.Http.Server.nuspec b/nanoFramework.System.Net.Http.Server.nuspec
index d875bfc..6606d43 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.17" />
+        <dependency id="nanoFramework.System.Net" version="2.0.0-preview.18" />
         <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 31f739d..37f7b9c 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.17\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.18\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 322d7c8..e086a6c 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.17" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" 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.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 ad3277c..f323eae 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.17, 2.0.0-preview.17]",
-        "resolved": "2.0.0-preview.17",
-        "contentHash": "JW1hEmTZpjTZc0b9BuAss459xl9DyUP7+tpiWpiPHThiktE6y3NyKXGvB2IgGkHc6miyxZxtMfrmzClq2SDQQA=="
+        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
+        "resolved": "2.0.0-preview.18",
+        "contentHash": "qLCtluDaXsPIi3vpyRhmifx0yw065UToZ/uPNUJwe0uG3O+uDtEwSWmo/iySy4yiqTBGZ8vFGnfIb0bU2fWFPw=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",
diff --git a/nanoFramework.System.Net.Http.nuspec b/nanoFramework.System.Net.Http.nuspec
index 5fbb230..093981b 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.17" />
+      <dependency id="nanoFramework.System.Net" version="2.0.0-preview.18" />
       <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 8191f08..226422e 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.17\lib\netnano1.0\System.Net.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.18\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 322d7c8..e086a6c 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.17" targetFramework="netnano1.0" />
+  <package id="nanoFramework.System.Net" 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.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 ad3277c..f323eae 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.17, 2.0.0-preview.17]",
-        "resolved": "2.0.0-preview.17",
-        "contentHash": "JW1hEmTZpjTZc0b9BuAss459xl9DyUP7+tpiWpiPHThiktE6y3NyKXGvB2IgGkHc6miyxZxtMfrmzClq2SDQQA=="
+        "requested": "[2.0.0-preview.18, 2.0.0-preview.18]",
+        "resolved": "2.0.0-preview.18",
+        "contentHash": "qLCtluDaXsPIi3vpyRhmifx0yw065UToZ/uPNUJwe0uG3O+uDtEwSWmo/iySy4yiqTBGZ8vFGnfIb0bU2fWFPw=="
       },
       "nanoFramework.System.Text": {
         "type": "Direct",