Merge branch 'develop'

gitFurious · Mar 22, 2017 · 3e7fb75 · 3e7fb75
2 parents 425da94 + a78ff45
commit 3e7fb75
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ### Changelog ###
 
+###### v.2.0.1.0 (2017-03-22)
+
+1. Updated HW2 Season Model.
+  * Added property: Image4K
+  * Fixed property: Playlists
+
 ###### v.2.0.0.0 (2017-03-12)
 
 1. Breaking changes galore!

diff --git a/Source/HaloSharp.Test/JSON/HaloWars2/Metadata/seasons.json b/Source/HaloSharp.Test/JSON/HaloWars2/Metadata/seasons.json
@@ -1,65 +1,65 @@
 {
-  "Paging": {
-    "StartAt": 0,
-    "InlineCount": 1,
-    "TotalCount": 1
+  "Paging" : {
+    "StartAt" : 0,
+    "InlineCount" : 1,
+    "TotalCount" : 1
   },
-  "ContentItems": [
-    {
-      "Id": 202347,
-      "Type": "HW2Season",
-      "View": {
-        "Status": "Published",
-        "Common": {
-          "Owner": "v-caarse",
-          "CreatedUtc": "2016-09-29T08:55:55Z",
-          "ModifiedUtc": "2017-02-03T18:17:42Z",
-          "PublishedUtc": "2017-02-03T19:35:18Z",
-          "Container": -1
+  "ContentItems" : [{
+      "Id" : 202347,
+      "Type" : "HW2Season",
+      "View" : {
+        "Status" : "Published",
+        "Common" : {
+          "Owner" : "v-caarse",
+          "CreatedUtc" : "2016-09-29T08:55:55Z",
+          "ModifiedUtc" : "2017-03-08T16:52:51Z",
+          "PublishedUtc" : "2017-03-08T16:52:52Z",
+          "Container" : -1
         },
-        "Identity": "2cdf3fae3cf945a581657aff644ccdbc",
-        "Title": "Season - Pre Season - Started - Dev",
-        "HW2Season": {
-          "StartDate": "2016-09-28T16:53:00Z",
-          "DisplayInfo": {
-            "Id": 202342,
-            "Type": "HW2SeasonDisplayInfo",
-            "View": {
-              "Status": "Published",
-              "Common": {
-                "Owner": "v-caarse",
-                "CreatedUtc": "2016-09-29T08:49:46Z",
-                "ModifiedUtc": "2017-02-03T18:33:17Z",
-                "PublishedUtc": "2017-02-03T19:34:17Z",
-                "Container": -1
+        "Identity" : "2cdf3fae3cf945a581657aff644ccdbc",
+        "Title" : "Season - Pre Season - Started - Dev",
+        "HW2Season" : {
+          "StartDate" : "2016-09-28T16:53:00Z",
+          "DisplayInfo" : {
+            "Id" : 202342,
+            "Type" : "HW2SeasonDisplayInfo",
+            "View" : {
+              "Status" : "Published",
+              "Common" : {
+                "Owner" : "v-caarse",
+                "CreatedUtc" : "2016-09-29T08:49:46Z",
+                "ModifiedUtc" : "2017-02-03T18:33:17Z",
+                "PublishedUtc" : "2017-02-03T19:34:17Z",
+                "Container" : -1
               },
-              "Identity": "f2704e55b3b84f88a58a01892fac1f38",
-              "Title": "Season Display Info - Pre Season",
-              "HW2SeasonDisplayInfo": {
-                "Name": "PRE SEASON",
-                "Description": "Not quite ready yet but almost"
+              "Identity" : "f2704e55b3b84f88a58a01892fac1f38",
+              "Title" : "Season Display Info - Pre Season",
+              "HW2SeasonDisplayInfo" : {
+                "Name" : "PRE SEASON",
+                "Description" : "Not quite ready yet but almost"
               },
-              "BatchLocalization": {
-                "IsLocked": false
+              "BatchLocalization" : {
+                "IsLocked" : false
               },
-              "Localization": {
-                "Culture": "en",
-                "MasterContentItemId": ""
+              "Localization" : {
+                "Culture" : "en",
+                "MasterContentItemId" : ""
               }
             }
           },
-          "Image": {},
-          "Playlists": []
+          "Image" : {},
+          "Playlists" : [],
+          "Image4K" : {}
         }
       },
-      "Links": [
-        {
-          "Absolute": false,
-          "Relation": "Self",
-          "URI": "/content/202347"
-        }
-      ],
-      "ChildrenCount": 0
+    "Links": [
+      {
+        "Absolute": false,
+        "Relation": "Self",
+        "URI": "/content/202347"
+      }
+    ],
+      "ChildrenCount" : 0
     }
   ]
 }
diff --git a/Source/HaloSharp.Test/JSON/HaloWars2/Metadata/seasons.schema.json b/Source/HaloSharp.Test/JSON/HaloWars2/Metadata/seasons.schema.json
@@ -82,13 +82,21 @@
             { "$ref": "common/image.schema.json#/definitions/ImageContentItemTypeB" }
           ]
         },
+        "Image4K": {
+          "oneOf": [
+            // TODO: This is pretty terrible.
+            { "$ref": "common/empty.schema.json" },
+            { "$ref": "common/image.schema.json#/definitions/null" },
+            { "$ref": "common/image.schema.json#/definitions/ImageContentItemTypeB" }
+          ]
+        },
         "Playlists": {
           "type": "array",
           "items": {
             "oneOf": [
               // TODO: This is pretty terrible.
               { "$ref": "common/empty.schema.json" },
-              { "$ref": "common/playlist.schema.json#/definitions/HW2PlaylistContentItemTypeB" }
+              { "$ref": "common/content-item-type-d.schema.json#/definitions/ContentItemTypeD" }
             ]
           }
         }
@@ -97,6 +105,7 @@
         "StartDate",
         "DisplayInfo",
         "Image",
+        "Image4K",
         "Playlists"
       ]
     },

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("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]
diff --git a/Source/HaloSharp/HaloSharp.nuspec b/Source/HaloSharp/HaloSharp.nuspec
@@ -11,7 +11,7 @@
     <iconUrl>http://i.imgur.com/bNFI8wr.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>Updated RequisitionPack model after API update.</releaseNotes>
+    <releaseNotes>Halo 5, Halo 5 : Forge, Halo Wars 2!</releaseNotes>
     <copyright>Copyright 2016</copyright>
     <tags>HaloSharp, Halo, API, Game Data</tags>
   </metadata>

diff --git a/Source/HaloSharp/Model/HaloWars2/Metadata/Season/Season.cs b/Source/HaloSharp/Model/HaloWars2/Metadata/Season/Season.cs
@@ -17,8 +17,11 @@ public class Season : IEquatable<Season>
         [JsonProperty(PropertyName = "Image")]
         public ContentItemTypeB<Image.View> Image { get; set; }
 
+        [JsonProperty(PropertyName = "Image4K")]
+        public ContentItemTypeB<Image.View> Image4K { get; set; }
+
         [JsonProperty(PropertyName = "Playlists")]
-        public List<ContentItemTypeB<Playlist.View>> Playlists { get; set; }
+        public List<ContentItemTypeD> Playlists { get; set; }
 
         public bool Equals(Season other)
         {
@@ -34,6 +37,7 @@ public bool Equals(Season other)
 
             return Equals(DisplayInfo, other.DisplayInfo)
                 && Equals(Image, other.Image)
+                && Equals(Image4K, other.Image4K)
                 && Playlists.OrderBy(p => p.Id).SequenceEqual(other.Playlists.OrderBy(p => p.Id))
                 && StartDate.Equals(other.StartDate);
         }
@@ -64,6 +68,7 @@ public override int GetHashCode()
             {
                 var hashCode = (DisplayInfo != null ? DisplayInfo.GetHashCode() : 0);
                 hashCode = (hashCode*397) ^ (Image != null ? Image.GetHashCode() : 0);
+                hashCode = (hashCode*397) ^ (Image4K != null ? Image4K.GetHashCode() : 0);
                 hashCode = (hashCode*397) ^ (Playlists?.GetHashCode() ?? 0);
                 hashCode = (hashCode*397) ^ StartDate.GetHashCode();
                 return hashCode;

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