Merge pull request #23 from gitFurious/dev

v1.5.1.0
gitFurious · May 12, 2016 · efc2b86 · efc2b86
2 parents 6e9083a + a8bf30c
commit efc2b86
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -56,6 +56,10 @@ A Nuget package is available at [www.nuget.org/packages/HaloSharp](https://www.n
 
 ### Changelog ###
 
+###### v.1.5.1.0 (2016-05-12)
+
+1. Added new Medal Enum (Infection Hype!).
+
 ###### v.1.5.0.0 (2016-04-21)
 
 1. Stats Endpoints.

diff --git a/Source/HaloSharp.Test/JSON/Metadata/Common/requisition-pack.schema.json b/Source/HaloSharp.Test/JSON/Metadata/Common/requisition-pack.schema.json
@@ -46,7 +46,7 @@
       "type": "integer"
     },
     "flair": {
-      "type": "null"
+      "type": [ "string", "null" ]
     },
     "stackedRequisitionPacks": {
       "type": "array",

diff --git a/Source/HaloSharp.Test/JSON/Metadata/game-base-variants.schema.json b/Source/HaloSharp.Test/JSON/Metadata/game-base-variants.schema.json
@@ -14,7 +14,7 @@
           "type": [ "null", "string" ]
         },
         "supportedGameModes": {
-          "type": "array",
+          "type": ["null", "array"],
           "additionalItems": false,
           "items": {
             "type": "string"

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.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
diff --git a/Source/HaloSharp/Model/Enumeration.cs b/Source/HaloSharp/Model/Enumeration.cs
@@ -113,7 +113,8 @@ public enum MedalType
             Warzone,
             WeaponProficiency,
             Goal,
-            Ball
+            Ball,
+            Infection
         }
 
         public enum OwnerType
@@ -137,11 +138,11 @@ public enum RequisitionPackType
             None,
             New,
             Hot,
-            LeavingSoon,
+            [EnumMember(Value = "Leaving Soon")] LeavingSoon,
             [EnumMember(Value = "Maximum Value")] MaximumValue,
             [EnumMember(Value = "Limited Time")] Limitedtime,
             Featured,
-            BestSeller,
+            [EnumMember(Value = "Best Seller")] BestSeller,
             Popular
         }
 

diff --git a/Source/HaloSharp/Model/Metadata/GameBaseVariant.cs b/Source/HaloSharp/Model/Metadata/GameBaseVariant.cs
@@ -76,7 +76,7 @@ public bool Equals(GameBaseVariant other)
                 && Id.Equals(other.Id)
                 && string.Equals(InternalName, other.InternalName)
                 && string.Equals(Name, other.Name)
-                && SupportedGameModes.OrderBy(sgm => sgm).SequenceEqual(other.SupportedGameModes.OrderBy(sgm => sgm));
+                && ((SupportedGameModes == null && other.SupportedGameModes == null) || (SupportedGameModes != null && other.SupportedGameModes != null && SupportedGameModes.OrderBy(ka => ka).SequenceEqual(other.SupportedGameModes.OrderBy(ka => ka))));
         }
 
         public override bool Equals(object obj)

diff --git a/Source/HaloSharp/Model/Stats/Common/BaseStat.cs b/Source/HaloSharp/Model/Stats/Common/BaseStat.cs
@@ -440,7 +440,7 @@ public class WeaponId : IEquatable<WeaponId>
         /// Any attachments the weapon had.
         /// </summary>
         [JsonProperty(PropertyName = "Attachments")]
-        public List<int> Attachments { get; set; }
+        public List<uint> Attachments { get; set; }
 
         /// <summary>
         /// The ID of the weapon. Weapons are available via the Metadata API.

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.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
 
 //HaloSharp.Test
 [assembly: InternalsVisibleTo("HaloSharp.Test")]