Merge branch 'v2-dev' into v2

Author: Hevin

Jiguang.JPush/Jiguang.JPush.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFrameworks Condition="'$(LibraryFrameworks)'==''">netstandard1.1;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>    
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <Description>The CSharp api client by Jiguang.</Description>
@@ -10,11 +11,17 @@
     <Product>JPush</Product>
     <Copyright>MIT</Copyright>
     <PackageLicenseUrl></PackageLicenseUrl>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
+    <PackageReference Include="System.Net.Http">
+      <Version>4.3.2</Version>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>

Jiguang.JPush/Model/SmsMessage.cs

@@ -11,7 +11,7 @@ public class SmsMessage
         [JsonProperty("content")]
         public string Content { get; set; }
 
-        [JsonProperty("delay_time")]
+        [JsonProperty("delay_time", DefaultValueHandling = DefaultValueHandling.Include)]
         public int DelayTime { get; set; }
     }
 }