railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Update NewtonSoft JSON to match react-native-windows version
This commit is contained in:
Hampton Maxwell 2018-08-05 18:16:43 -07:00 committed by GitHub
commit 84dc9f57d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
windows/ReactNativeVideo.Net46/ReactNativeVideo.Net46.csproj
View File

@ -29,8 +29,8 @@
<OutputPath>bin\x86\Release\</OutputPath> <OutputPath>bin\x86\Release\</OutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
@ -71,4 +71,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>

4
windows/ReactNativeVideo.Net46/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" /> <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
</packages> </packages>

4
windows/ReactNativeVideo/project.json
View File

@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2", "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
"Newtonsoft.Json": "9.0.1" "Newtonsoft.Json": "10.0.3"
}, },
"frameworks": { "frameworks": {
"uap10.0": {} "uap10.0": {}
@ -14,4 +14,4 @@
"win10-x64": {}, "win10-x64": {},
"win10-x64-aot": {} "win10-x64-aot": {}
} }
} }