Merge pull request #28 from gitFurious/dev

v1.5.5.0
gitFurious · Jul 28, 2016 · 592e05e · 592e05e
2 parents 2cc8106 + 05d5fad
commit 592e05e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -56,6 +56,11 @@ A Nuget package is available at [www.nuget.org/packages/HaloSharp](https://www.n
 
 ### Changelog ###
 
+###### v.1.5.6.0 (2016-07-28)
+
+1. Updated XpInfo model.
+  * Updated: PerformanceXP
+
 ###### v.1.5.5.0 (2016-07-16)
 
 1. Updated WarzoneMatch model.

diff --git a/Source/HaloSharp.Test/JSON/Stats/CarnageReport/Common/xp-info.schema.json b/Source/HaloSharp.Test/JSON/Stats/CarnageReport/Common/xp-info.schema.json
@@ -21,7 +21,7 @@
       "type": "integer"
     },
     "PerformanceXP": {
-      "type": "integer"
+      "type": [ "null", "integer" ]
     },
     "PlayerRankXPAward": {
       "type": "integer"

diff --git a/Source/HaloSharp.Test/Properties/AssemblyInfo.cs b/Source/HaloSharp.Test/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.5.0")]
-[assembly: AssemblyFileVersion("1.5.5.0")]
+[assembly: AssemblyVersion("1.5.6.0")]
+[assembly: AssemblyFileVersion("1.5.6.0")]
diff --git a/Source/HaloSharp/Model/Stats/CarnageReport/Common/XpInfo.cs b/Source/HaloSharp/Model/Stats/CarnageReport/Common/XpInfo.cs
@@ -29,7 +29,7 @@ public class XpInfo : IEquatable<XpInfo>
         /// The XP awarded to the player based on how their team ranked when the match concluded.
         /// </summary>
         [JsonProperty(PropertyName = "PerformanceXP")]
-        public int PerformanceXp { get; set; }
+        public int? PerformanceXp { get; set; }
 
         /// <summary>
         /// The XP awarded to the player for their team-agnostic rank.
@@ -125,7 +125,7 @@ public override int GetHashCode()
                 var hashCode = BoostAmount;
                 hashCode = (hashCode*397) ^ MatchSpeedWinAmount;
                 hashCode = (hashCode*397) ^ ObjectivesCompletedAmount;
-                hashCode = (hashCode*397) ^ PerformanceXp;
+                hashCode = (hashCode*397) ^ PerformanceXp.GetHashCode();
                 hashCode = (hashCode*397) ^ PlayerRankXpAward;
                 hashCode = (hashCode*397) ^ PlayerTimePerformanceXpAward;
                 hashCode = (hashCode*397) ^ PrevSpartanRank;

diff --git a/Source/HaloSharp/Properties/AssemblyInfo.cs b/Source/HaloSharp/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.5.0")]
-[assembly: AssemblyFileVersion("1.5.5.0")]
+[assembly: AssemblyVersion("1.5.6.0")]
+[assembly: AssemblyFileVersion("1.5.6.0")]
 
 //HaloSharp.Test
 [assembly: InternalsVisibleTo("HaloSharp.Test")]