diff --git a/Tests/NFUnitTestEncoding/NFUnitTestEncoding.nfproj b/Tests/NFUnitTestEncoding/NFUnitTestEncoding.nfproj
index 7594309..41d573f 100644
--- a/Tests/NFUnitTestEncoding/NFUnitTestEncoding.nfproj
+++ b/Tests/NFUnitTestEncoding/NFUnitTestEncoding.nfproj
@@ -35,10 +35,10 @@
       <HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.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>
   </ItemGroup>
   <ItemGroup>
diff --git a/Tests/NFUnitTestEncoding/packages.config b/Tests/NFUnitTestEncoding/packages.config
index 296f0ff..ebdc822 100644
--- a/Tests/NFUnitTestEncoding/packages.config
+++ b/Tests/NFUnitTestEncoding/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" 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/NFUnitTestEncoding/packages.lock.json b/Tests/NFUnitTestEncoding/packages.lock.json
index 6deedca..8684d03 100644
--- a/Tests/NFUnitTestEncoding/packages.lock.json
+++ b/Tests/NFUnitTestEncoding/packages.lock.json
@@ -10,9 +10,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/Tests/NFUnitTestStringBuilder/NFUnitTestStringBuilder.nfproj b/Tests/NFUnitTestStringBuilder/NFUnitTestStringBuilder.nfproj
index 226b3b5..f654521 100644
--- a/Tests/NFUnitTestStringBuilder/NFUnitTestStringBuilder.nfproj
+++ b/Tests/NFUnitTestStringBuilder/NFUnitTestStringBuilder.nfproj
@@ -40,10 +40,10 @@
       <HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.49\lib\netnano1.0\mscorlib.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>
   </ItemGroup>
   <ItemGroup>
diff --git a/Tests/NFUnitTestStringBuilder/packages.config b/Tests/NFUnitTestStringBuilder/packages.config
index 296f0ff..ebdc822 100644
--- a/Tests/NFUnitTestStringBuilder/packages.config
+++ b/Tests/NFUnitTestStringBuilder/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" 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/NFUnitTestStringBuilder/packages.lock.json b/Tests/NFUnitTestStringBuilder/packages.lock.json
index 6deedca..8684d03 100644
--- a/Tests/NFUnitTestStringBuilder/packages.lock.json
+++ b/Tests/NFUnitTestStringBuilder/packages.lock.json
@@ -10,9 +10,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.Text.Benchmark/nanoFramework.System.Text.Benchmark.nfproj b/nanoFramework.System.Text.Benchmark/nanoFramework.System.Text.Benchmark.nfproj
index 40f5c71..a370b02 100644
--- a/nanoFramework.System.Text.Benchmark/nanoFramework.System.Text.Benchmark.nfproj
+++ b/nanoFramework.System.Text.Benchmark/nanoFramework.System.Text.Benchmark.nfproj
@@ -33,7 +33,7 @@
       <HintPath>..\packages\nanoFramework.Benchmark.2.0.0-preview.1\lib\netnano1.0\nanoFramework.Benchmark.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.Logging, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Logging.2.0.0-preview.19\lib\netnano1.0\nanoFramework.Logging.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.Logging.2.0.0-preview.20\lib\netnano1.0\nanoFramework.Logging.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.Runtime.Native, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.Runtime.Native.2.0.0-preview.24\lib\netnano1.0\nanoFramework.Runtime.Native.dll</HintPath>
diff --git a/nanoFramework.System.Text.Benchmark/packages.config b/nanoFramework.System.Text.Benchmark/packages.config
index 9aa20d1..0eaad6f 100644
--- a/nanoFramework.System.Text.Benchmark/packages.config
+++ b/nanoFramework.System.Text.Benchmark/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="nanoFramework.Benchmark" version="2.0.0-preview.1" targetFramework="netnano1.0" />
   <package id="nanoFramework.CoreLibrary" version="2.0.0-preview.49" targetFramework="netnano1.0" />
-  <package id="nanoFramework.Logging" version="2.0.0-preview.19" targetFramework="netnano1.0" />
+  <package id="nanoFramework.Logging" version="2.0.0-preview.20" targetFramework="netnano1.0" />
   <package id="nanoFramework.Runtime.Native" version="2.0.0-preview.24" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Collections" version="2.0.0-preview.14" targetFramework="netnano1.0" />
   <package id="nanoFramework.System.Diagnostics.Stopwatch" version="2.0.0-preview.59" targetFramework="netnano1.0" />
diff --git a/nanoFramework.System.Text.Benchmark/packages.lock.json b/nanoFramework.System.Text.Benchmark/packages.lock.json
index bd45501..b12ad83 100644
--- a/nanoFramework.System.Text.Benchmark/packages.lock.json
+++ b/nanoFramework.System.Text.Benchmark/packages.lock.json
@@ -16,9 +16,9 @@
       },
       "nanoFramework.Logging": {
         "type": "Direct",
-        "requested": "[2.0.0-preview.19, 2.0.0-preview.19]",
-        "resolved": "2.0.0-preview.19",
-        "contentHash": "DyBmlEvslQTbsAFJURbSXI7v6RK+lVNvk+IaeHY4FeEakGCapd5pEPqTSU0yHnGopu/UOZh0nu25ujtRUfS3JA=="
+        "requested": "[2.0.0-preview.20, 2.0.0-preview.20]",
+        "resolved": "2.0.0-preview.20",
+        "contentHash": "3Q/B9J4JzXd6HfNYm0sALSo8ujQIEmQz3txdn7PqeG/3OSrdgRLKuwsNhq7OGh9QYduFXhunRMtkLPoeT2T9hw=="
       },
       "nanoFramework.Runtime.Native": {
         "type": "Direct",