multi target :)

David Lebee · David Lebee · commit 01f510e63775 · 2021-08-13T14:55:08.000-04:00
diff --git a/PoweredSoft.DynamicQuery.AspNetCore.NewtonsoftJson/MvcBuilderExtensions.cs b/PoweredSoft.DynamicQuery.AspNetCore.NewtonsoftJson/MvcBuilderExtensions.cs
@@ -9,10 +9,12 @@ public static  IMvcBuilder AddPoweredSoftJsonNetDynamicQuery(this IMvcBuilder mv
         {
             mvcBuilder.AddPoweredSoftDynamicQuery();
             var serviceProvider = mvcBuilder.Services.BuildServiceProvider();
+
             mvcBuilder.AddNewtonsoftJson(o =>
             {
                 o.SerializerSettings.AddPoweredSoftDynamicQueryNewtonsoftJson(serviceProvider, enableStringEnumConverter: enableStringEnumConverter);
             });
+
             return mvcBuilder;
         }
     }
diff --git a/PoweredSoft.DynamicQuery.AspNetCore.NewtonsoftJson/PoweredSoft.DynamicQuery.AspNetCore.NewtonsoftJson.csproj b/PoweredSoft.DynamicQuery.AspNetCore.NewtonsoftJson/PoweredSoft.DynamicQuery.AspNetCore.NewtonsoftJson.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <Copyright>Powered Softwares Inc.</Copyright>
     <PackageLicenseUrl>MIT</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/PoweredSoft/DynamicQuery</PackageProjectUrl>
@@ -20,9 +20,14 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
+  
+  <ItemGroup  Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0"/>
+  </ItemGroup>
+  
+  <ItemGroup  Condition="'$(TargetFramework)' == 'net5.0'">
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9"/>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PoweredSoft.DynamicQuery.AspNetCore/PoweredSoft.DynamicQuery.AspNetCore.csproj b/PoweredSoft.DynamicQuery.AspNetCore/PoweredSoft.DynamicQuery.AspNetCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <Copyright>Powered Softwares Inc.</Copyright>
     <PackageLicenseUrl>MIT</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/PoweredSoft/DynamicQuery</PackageProjectUrl>
diff --git a/PoweredSoft.DynamicQuery.Core/PoweredSoft.DynamicQuery.Core.csproj b/PoweredSoft.DynamicQuery.Core/PoweredSoft.DynamicQuery.Core.csproj
@@ -19,7 +19,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/PoweredSoft.DynamicQuery.NewtonsoftJson/Extensions.cs b/PoweredSoft.DynamicQuery.NewtonsoftJson/Extensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
+﻿using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System;
 
diff --git a/PoweredSoft.DynamicQuery.NewtonsoftJson/PoweredSoft.DynamicQuery.NewtonsoftJson.csproj b/PoweredSoft.DynamicQuery.NewtonsoftJson/PoweredSoft.DynamicQuery.NewtonsoftJson.csproj
@@ -18,7 +18,6 @@
 
   <ItemGroup>
      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PoweredSoft.DynamicQuery.Test/PoweredSoft.DynamicQuery.Test.csproj b/PoweredSoft.DynamicQuery.Test/PoweredSoft.DynamicQuery.Test.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/PoweredSoft.DynamicQuery/PoweredSoft.DynamicQuery.csproj b/PoweredSoft.DynamicQuery/PoweredSoft.DynamicQuery.csproj
@@ -19,7 +19,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
     <PackageReference Include="PoweredSoft.Data" Version="3.0.0" />
     <PackageReference Include="PoweredSoft.DynamicLinq" Version="1.1.12" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,12 @@ public static IMvcBuilder AddPoweredSoftJsonNetDynamicQuery(this IMvcBuilder mv`
`9`	`9`	`{`
`10`	`10`	`mvcBuilder.AddPoweredSoftDynamicQuery();`
`11`	`11`	`var serviceProvider = mvcBuilder.Services.BuildServiceProvider();`
	`12`	`+`
`12`	`13`	`mvcBuilder.AddNewtonsoftJson(o =>`
`13`	`14`	`{`
`14`	`15`	`o.SerializerSettings.AddPoweredSoftDynamicQueryNewtonsoftJson(serviceProvider, enableStringEnumConverter: enableStringEnumConverter);`
`15`	`16`	`});`
	`17`	`+`
`16`	`18`	`return mvcBuilder;`
`17`	`19`	`}`
`18`	`20`	`}`