Merge pull request #601 from felipeleusin/net452_reference

.Net 4.5 References
sendgrid · Aug 21, 2018 · ec5c26e · ec5c26e
2 parents b523445 + dc6592f
commit ec5c26e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/nuspec/Sendgrid.9.9.0.nuspec b/nuspec/Sendgrid.9.9.0.nuspec
@@ -19,16 +19,26 @@
         <copyright>SendGrid, Inc. 2017</copyright>
         <tags>SendGrid Email Mail Microsoft Azure Transactional .NET Core</tags>
         <dependencies>
-            <group targetFramework=".NETFramework4.0">
+            <group targetFramework="net45">
+                <dependency id="Newtonsoft.Json" version="9.0.1" />
+            </group>
+            <group targetFramework="net40">
                 <dependency id="Newtonsoft.Json" version="9.0.1" />
                 <dependency id="System.Net.Http" version="4.0.0" />
             </group>
-            <group targetFramework=".NETStandard1.3">
+            <group targetFramework="netstandard1.3">
                 <dependency id="NETStandard.Library" version="1.6.1" />
                 <dependency id="Newtonsoft.Json" version="9.0.1" />
                 <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="1.1.0" />
             </group>
+            <group targetFramework="netstandard2.0">
+                <dependency id="Newtonsoft.Json" version="9.0.1" />
+                <dependency id="Microsoft.AspNetCore.Http.Abstractions" version="1.1.0" />
+            </group>
         </dependencies>
+        <frameworkAssemblies>
+            <frameworkAssembly assemblyName="System.Net.Http" targetFramework="net45" />
+        </frameworkAssemblies>
     </metadata>
     <files>
         <file src="lib\net452\SendGrid.dll" target="lib\net452\SendGrid.dll" />

diff --git a/src/SendGrid/SendGrid.csproj b/src/SendGrid/SendGrid.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>9.9.0</VersionPrefix>
-    <TargetFrameworks>netstandard1.3;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;netstandard2.0;net452</TargetFrameworks>
     <PlatformTarget>anycpu</PlatformTarget>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>SendGrid</AssemblyName>
@@ -30,6 +30,11 @@
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <Reference Include="System.Net.Http" />