Update 4 NuGet dependencies (#188)

nanoframework · Feb 17, 2022 · d0bcbd4 · d0bcbd4
1 parent b442279
commit d0bcbd4
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 35 deletions.
diff --git a/nanoFramework.Json.Test/nanoFramework.Json.Test.nfproj b/nanoFramework.Json.Test/nanoFramework.Json.Test.nfproj
@@ -32,15 +32,15 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib, Version=1.12.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.12.0-preview.5\lib\mscorlib.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.CoreLibrary.1.12.0-preview.9\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.System.Collections, Version=1.4.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.4.0-preview.14\lib\nanoFramework.System.Collections.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Collections.1.4.0-preview.16\lib\nanoFramework.System.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.System.Text, Version=1.1.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.1.3-preview.13\lib\nanoFramework.System.Text.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Text.1.1.3-preview.15\lib\nanoFramework.System.Text.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.TestFramework, Version=1.0.175.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
@@ -51,9 +51,8 @@
       <HintPath>..\packages\nanoFramework.TestFramework.1.0.175\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Windows.Storage.Streams, Version=1.12.4.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.Streams.1.12.4-preview.14\lib\Windows.Storage.Streams.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.IO.Streams">
+      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.0.0-preview.12\lib\System.IO.Streams.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/nanoFramework.Json.Test/packages.config b/nanoFramework.Json.Test/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="nanoFramework.CoreLibrary" version="1.12.0-preview.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Collections" version="1.4.0-preview.14" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Text" version="1.1.3-preview.13" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.CoreLibrary" version="1.12.0-preview.9" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.System.Collections" version="1.4.0-preview.16" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.System.IO.Streams" version="1.0.0-preview.12" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.System.Text" version="1.1.3-preview.15" targetFramework="netnanoframework10" />
   <package id="nanoFramework.TestFramework" version="1.0.175" targetFramework="netnanoframework10" developmentDependency="true" />
-  <package id="nanoFramework.Windows.Storage.Streams" version="1.12.4-preview.14" targetFramework="netnanoframework10" />
 </packages>
diff --git a/nanoFramework.Json.nuspec b/nanoFramework.Json.nuspec
@@ -18,10 +18,9 @@
     <description>This package includes nanoFramework.Json, a helper class library to deal with json serialization/deserialization in .NET nanoFramework C# projects.</description>
     <tags>nanoFramework C# csharp netmf netnf json</tags>
     <dependencies>
-      <dependency id="nanoFramework.CoreLibrary" version="1.12.0-preview.5" />
-      <dependency id="nanoFramework.System.Collections" version="1.4.0-preview.14" />
-      <dependency id="nanoFramework.System.Text" version="1.1.3-preview.13" />
-      <dependency id="nanoFramework.Windows.Storage.Streams" version="1.12.4-preview.14" />
+      <dependency id="nanoFramework.CoreLibrary" version="1.12.0-preview.9" />
+      <dependency id="nanoFramework.System.Collections" version="1.4.0-preview.16" />
+      <dependency id="nanoFramework.System.IO.Streams" version="1.0.0-preview.12" />
     </dependencies>
   </metadata>
   <files>

diff --git a/nanoFramework.Json/JsonConvert.cs b/nanoFramework.Json/JsonConvert.cs
@@ -9,9 +9,6 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
-#if NANOFRAMEWORK_1_0
-using Windows.Storage.Streams;
-#endif
 
 namespace nanoFramework.Json
 {
@@ -114,22 +111,22 @@ public static object DeserializeObject(Stream stream, Type type)
         /// <param name="dr"></param>
         /// <param name="type">The object type to convert to</param>
         /// <returns></returns>
-        public static object DeserializeObject(DataReader dr, Type type)
+        public static object DeserializeObject(StreamReader dr, Type type)
         {
             var dserResult = Deserialize(dr);
 
             return PopulateObject((JsonToken)dserResult, type, "/");
         }
 
-        private static object Deserialize(DataReader dr)
+        private static object Deserialize(StreamReader dr)
         {
             // Read the DataReader into jsonBytes[]
-            jsonBytes = new byte[dr.UnconsumedBufferLength];
+            jsonBytes = new byte[dr.BaseStream.Length];
             jsonPos = 0;
 
-            while (dr.UnconsumedBufferLength > 0)
+            while (!dr.EndOfStream)
             {
-                jsonBytes[jsonPos++] = dr.ReadByte();
+                jsonBytes[jsonPos++] = (byte)dr.Read();
             }
 
             jsonPos = 0;

diff --git a/nanoFramework.Json/nanoFramework.Json.nfproj b/nanoFramework.Json/nanoFramework.Json.nfproj
@@ -47,20 +47,19 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib, Version=1.12.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.12.0-preview.5\lib\mscorlib.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.CoreLibrary.1.12.0-preview.9\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.System.Collections, Version=1.4.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Collections.1.4.0-preview.14\lib\nanoFramework.System.Collections.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Collections.1.4.0-preview.16\lib\nanoFramework.System.Collections.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nanoFramework.System.Text, Version=1.1.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.System.Text.1.1.3-preview.13\lib\nanoFramework.System.Text.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.System.Text.1.1.3-preview.15\lib\nanoFramework.System.Text.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Windows.Storage.Streams, Version=1.12.4.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Windows.Storage.Streams.1.12.4-preview.14\lib\Windows.Storage.Streams.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.IO.Streams">
+      <HintPath>..\packages\nanoFramework.System.IO.Streams.1.0.0-preview.12\lib\System.IO.Streams.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
@@ -69,11 +68,11 @@
       <ProjectConfigurationsDeclaredAsItems />
     </ProjectCapabilities>
   </ProjectExtensions>
-  <Import Project="..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" />
+  <Import Project="..\packages\Nerdbank.GitVersioning.3.4.255\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.4.255\build\Nerdbank.GitVersioning.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.205\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.255\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.255\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
 </Project>
diff --git a/nanoFramework.Json/packages.config b/nanoFramework.Json/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="nanoFramework.CoreLibrary" version="1.12.0-preview.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Collections" version="1.4.0-preview.14" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.System.Text" version="1.1.3-preview.13" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Windows.Storage.Streams" version="1.12.4-preview.14" targetFramework="netnanoframework10" />
-  <package id="Nerdbank.GitVersioning" version="3.4.205" targetFramework="netnanoframework10" developmentDependency="true" />
+  <package id="nanoFramework.CoreLibrary" version="1.12.0-preview.9" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.System.Collections" version="1.4.0-preview.16" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.System.IO.Streams" version="1.0.0-preview.12" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.System.Text" version="1.1.3-preview.15" targetFramework="netnanoframework10" />
+  <package id="Nerdbank.GitVersioning" version="3.4.255" targetFramework="netnanoframework10" developmentDependency="true" />
 </packages>