Merge pull request #66 from graphql-dotnet/newtonsoft-on-net45

Use JSON.NET v5.0.6 on net45
graphql-dotnet · Aug 20, 2017 · 4d0d1bc · 4d0d1bc
2 parents 077e234 + ecfe591
commit 4d0d1bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/GraphQL.Conventions/CommonAssemblyInfo.cs b/src/GraphQL.Conventions/CommonAssemblyInfo.cs
@@ -8,8 +8,8 @@
 [assembly: AssemblyCopyright("Copyright 2016-2017 Tommy Lillehagen. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.3.3")]
-[assembly: AssemblyInformationalVersion("1.3.3")]
+[assembly: AssemblyFileVersion("1.3.4")]
+[assembly: AssemblyInformationalVersion("1.3.4")]
 [assembly: CLSCompliant(false)]
 
 [assembly: InternalsVisibleTo("Tests")]
diff --git a/src/GraphQL.Conventions/GraphQL.Conventions.csproj b/src/GraphQL.Conventions/GraphQL.Conventions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>GraphQL Conventions for .NET</Description>
-    <VersionPrefix>1.3.3</VersionPrefix>
+    <VersionPrefix>1.3.4</VersionPrefix>
     <Authors>Tommy Lillehagen</Authors>
     <TargetFrameworks>netstandard1.5;net45</TargetFrameworks>
     <DebugType>portable</DebugType>
@@ -35,20 +35,18 @@
     <Compile Include="../../deps/parser/src/GraphQLParser/**/*.cs" Exclude="../../deps/parser/src/GraphQLParser/bin/**;../../deps/parser/src/GraphQLParser/obj/**;bin/**;obj/**;**/*.xproj;packages/**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Reflection" Version="4.3.0" />
     <PackageReference Include="System.Runtime" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Newtonsoft.Json" Version="5.0.6" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/src/GraphQL.Conventions/project.json b/src/GraphQL.Conventions/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.3-*",
+  "version": "1.3.4-*",
   "description": "GraphQL Conventions for .NET",
   "authors": [
     "Tommy Lillehagen"
@@ -35,7 +35,6 @@
     "debugType": "portable"
   },
   "dependencies": {
-    "GraphQL-Parser": "2.0.0",
     "Newtonsoft.Json": "9.0.1"
   },
   "frameworks": {