Merge upstream changes

This commit is contained in:
Daniel Plaisted 2017-08-28 11:09:19 -07:00
commit 107252ebe7
51 changed files with 137 additions and 123 deletions

View file

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="5.0.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">