Merge pull request #134 from polushinmk/master

@polushinmk I've manually resolved the merge conflicts
wp-net · Aug 23, 2018 · e9eb94a · e9eb94a
2 parents 5ce0f63 + 9fbd65e
commit e9eb94a
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 51 deletions.
diff --git a/WordPressPCL.Tests.Hosted/WordPressPCL.Tests.Hosted.csproj b/WordPressPCL.Tests.Hosted/WordPressPCL.Tests.Hosted.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WordPressPCL.Tests.Selfhosted/WordPressPCL.Tests.Selfhosted.csproj b/WordPressPCL.Tests.Selfhosted/WordPressPCL.Tests.Selfhosted.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/WordPressPCL/Models/Comment.cs b/WordPressPCL/Models/Comment.cs
@@ -106,7 +106,7 @@ public class Comment : Base
         /// State of the object.
         /// </summary>
         /// <remarks>Context: view, edit</remarks>
-        [JsonProperty("status")]
+        [JsonProperty("status", DefaultValueHandling = DefaultValueHandling.Ignore)]
 		public CommentStatus Status { get; set; }
 
         /// <summary>

diff --git a/WordPressPCL/Models/Enums.cs b/WordPressPCL/Models/Enums.cs
@@ -66,18 +66,18 @@ public enum OpenStatus
     [JsonConverter(typeof(StringEnumConverter))]
     public enum CommentStatus
     {
-        /// <summary>
-        /// Comment Approved
-        /// </summary>
-        [EnumMember(Value = "approved")]
-        Approved,
-
         /// <summary>
         /// Comment is pending to approve
         /// </summary>
         [EnumMember(Value = "hold")]
         Pending,
 
+        /// <summary>
+        /// Comment Approved
+        /// </summary>
+        [EnumMember(Value = "approved")]
+        Approved,
+
         /// <summary>
         /// Comment is spam
         /// </summary>

diff --git a/WordPressPCL/WordPressPCL.csproj b/WordPressPCL/WordPressPCL.csproj
@@ -13,11 +13,14 @@
     <RepositoryUrl>https://github.com/wp-net/WordPressPCL</RepositoryUrl>
     <PackageTags>WordPress REST API</PackageTags>
     <RepositoryType>GitHub</RepositoryType>
-    <AssemblyVersion>1.4.5.0</AssemblyVersion>
-    <FileVersion>1.4.5.0</FileVersion>
-    <Version>1.4.5</Version>
+    <AssemblyVersion>1.4.6.0</AssemblyVersion>
+    <FileVersion>1.4.6.0</FileVersion>
+    <Version>1.4.6</Version>
     <PackageLicenseUrl>https://github.com/wp-net/WordPressPCL/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>V1.4.5
+    <PackageReleaseNotes>V1.4.6
+- Bugfix: Add DefaultValueHandling to Comment Status property 
+
+V1.4.5
 - Bugfix: Add NullValueHandling to FeaturedMedia property 
 
 V1.4.4
@@ -61,6 +64,6 @@ V1.2
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/WordPressPCL/WordPressPCL.xml b/WordPressPCL/WordPressPCL.xml