Virus x bugfix/netcore 3.1 issues (#190)

danielwertheim · Virus-X · web-flow · commit 6367571c2560 · 2020-04-15T22:13:56.000+02:00
* Fixed issue with attempt to read json from EmptyReadStream

* Updates tests to use .NET Core 3.1

Skipping multitargetting for tests.

* Removing part of fix as it is only needed in the populate path

Co-authored-by: Valerii Goncharenko &lt;virusx777@gmail.com&gt;
diff --git a/global.json b/global.json
diff --git a/source/projects/MyCouch/Serialization/DefaultSerializer.cs b/source/projects/MyCouch/Serialization/DefaultSerializer.cs
@@ -130,6 +130,9 @@ public virtual void Populate<T>(T item, Stream data) where T : class
             {
                 using (var jsonReader = Configuration.ApplyConfigToReader(CreateReaderFor<T>(sr)))
                 {
+                    if (!jsonReader.Read())
+                        return;
+
                     InternalSerializer.Populate(jsonReader, item);
                 }
             }
diff --git a/source/tests/IntegrationTests/IntegrationTests.csproj b/source/tests/IntegrationTests/IntegrationTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
diff --git a/source/tests/Testing/Testing.csproj b/source/tests/Testing/Testing.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/source/tests/UnitTests/UnitTests.csproj b/source/tests/UnitTests/UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,9 @@ public virtual void Populate<T>(T item, Stream data) where T : class`
`130`	`130`	`{`
`131`	`131`	`using (var jsonReader = Configuration.ApplyConfigToReader(CreateReaderFor<T>(sr)))`
`132`	`132`	`{`
	`133`	`+ if (!jsonReader.Read())`
	`134`	`+ return;`
	`135`	`+`
`133`	`136`	`InternalSerializer.Populate(jsonReader, item);`
`134`	`137`	`}`
`135`	`138`	`}`