Skip to content
This repository has been archived by the owner on Sep 17, 2023. It is now read-only.

Commit

Permalink
Virus x bugfix/netcore 3.1 issues (#190)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
danielwertheim and Virus-X authored Apr 15, 2020
1 parent 288fa17 commit 6367571
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
5 changes: 0 additions & 5 deletions global.json

This file was deleted.

3 changes: 3 additions & 0 deletions source/projects/MyCouch/Serialization/DefaultSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/tests/IntegrationTests/IntegrationTests.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/tests/Testing/Testing.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion source/tests/UnitTests/UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit 6367571

Please sign in to comment.