From 4bdeede5c19ccede7884eb2b6ce3c5112858a677 Mon Sep 17 00:00:00 2001 From: Damon Pollard Date: Thu, 28 Jul 2016 10:06:27 +0800 Subject: [PATCH 1/2] Updated XpInfo model. PerformanceXP is now nullable. Thanks, b01000100. --- .../JSON/Stats/CarnageReport/Common/xp-info.schema.json | 2 +- Source/HaloSharp/Model/Stats/CarnageReport/Common/XpInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 index e627593..2328fb9 100644 --- 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/Model/Stats/CarnageReport/Common/XpInfo.cs b/Source/HaloSharp/Model/Stats/CarnageReport/Common/XpInfo.cs index 75be5fa..2dde196 100644 --- 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 /// The XP awarded to the player based on how their team ranked when the match concluded. /// [JsonProperty(PropertyName = "PerformanceXP")] - public int PerformanceXp { get; set; } + public int? PerformanceXp { get; set; } /// /// 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; From 05d5fad2056f56fc8d305cb46906b2bf7b8db8ef Mon Sep 17 00:00:00 2001 From: Damon Pollard Date: Thu, 28 Jul 2016 10:09:19 +0800 Subject: [PATCH 2/2] NuGet package v1.5.6.0 --- README.md | 5 +++++ Source/HaloSharp.Test/Properties/AssemblyInfo.cs | 4 ++-- Source/HaloSharp/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f9c5df7..c8bd14f 100644 --- 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/Properties/AssemblyInfo.cs b/Source/HaloSharp.Test/Properties/AssemblyInfo.cs index f56bfc8..43c58a2 100644 --- 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")] \ No newline at end of file +[assembly: AssemblyVersion("1.5.6.0")] +[assembly: AssemblyFileVersion("1.5.6.0")] \ No newline at end of file diff --git a/Source/HaloSharp/Properties/AssemblyInfo.cs b/Source/HaloSharp/Properties/AssemblyInfo.cs index c8b4fc8..0e6b6bb 100644 --- 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")] \ No newline at end of file