Unverified Commit 84dc9f57 authored by Hampton Maxwell's avatar Hampton Maxwell Committed by GitHub
Browse files

Merge pull request #1169 from react-native-community/chore/upgrade-newtonsoft 

Update NewtonSoft JSON to match react-native-windows version
parents 1cc38d1a 139c79b8

windows/ReactNativeVideo.Net46/ReactNativeVideo.Net46.csproj

+2 −2
Changes for windows/ReactNativeVideo.Net46/ReactNativeVideo.Net46.csproj: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
    <OutputPath>bin\x86\Release\</OutputPath>

  </PropertyGroup>

  <ItemGroup>

    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

      <Private>True</Private>

    </Reference>

    <Reference Include="PresentationCore" />

windows/ReactNativeVideo.Net46/packages.config

+1 −1
Changes for windows/ReactNativeVideo.Net46/packages.config: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<packages>

  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />

  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />

</packages>

windows/ReactNativeVideo/project.json

+1 −1
Changes for windows/ReactNativeVideo/project.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
{

  "dependencies": {

    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",

    "Newtonsoft.Json": "9.0.1"

    "Newtonsoft.Json": "10.0.3"

  },

  "frameworks": {

    "uap10.0": {}