Skip to content

Commit 3e7fb75

Browse files
gitFuriousgitFurious
committed
Merge branch 'develop'
2 parents 425da94 + a78ff45 commit 3e7fb75

File tree

7 files changed

+78
-58
lines changed

7 files changed

+78
-58
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
### Changelog ###
44

5+
###### v.2.0.1.0 (2017-03-22)
6+
7+
1. Updated HW2 Season Model.
8+
* Added property: Image4K
9+
* Fixed property: Playlists
10+
511
###### v.2.0.0.0 (2017-03-12)
612

713
1. Breaking changes galore!

‎Source/HaloSharp.Test/JSON/HaloWars2/Metadata/seasons.json

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
{
2-
"Paging": {
3-
"StartAt": 0,
4-
"InlineCount": 1,
5-
"TotalCount": 1
2+
"Paging" : {
3+
"StartAt" : 0,
4+
"InlineCount" : 1,
5+
"TotalCount" : 1
66
},
7-
"ContentItems": [
8-
{
9-
"Id": 202347,
10-
"Type": "HW2Season",
11-
"View": {
12-
"Status": "Published",
13-
"Common": {
14-
"Owner": "v-caarse",
15-
"CreatedUtc": "2016-09-29T08:55:55Z",
16-
"ModifiedUtc": "2017-02-03T18:17:42Z",
17-
"PublishedUtc": "2017-02-03T19:35:18Z",
18-
"Container": -1
7+
"ContentItems" : [{
8+
"Id" : 202347,
9+
"Type" : "HW2Season",
10+
"View" : {
11+
"Status" : "Published",
12+
"Common" : {
13+
"Owner" : "v-caarse",
14+
"CreatedUtc" : "2016-09-29T08:55:55Z",
15+
"ModifiedUtc" : "2017-03-08T16:52:51Z",
16+
"PublishedUtc" : "2017-03-08T16:52:52Z",
17+
"Container" : -1
1918
},
20-
"Identity": "2cdf3fae3cf945a581657aff644ccdbc",
21-
"Title": "Season - Pre Season - Started - Dev",
22-
"HW2Season": {
23-
"StartDate": "2016-09-28T16:53:00Z",
24-
"DisplayInfo": {
25-
"Id": 202342,
26-
"Type": "HW2SeasonDisplayInfo",
27-
"View": {
28-
"Status": "Published",
29-
"Common": {
30-
"Owner": "v-caarse",
31-
"CreatedUtc": "2016-09-29T08:49:46Z",
32-
"ModifiedUtc": "2017-02-03T18:33:17Z",
33-
"PublishedUtc": "2017-02-03T19:34:17Z",
34-
"Container": -1
19+
"Identity" : "2cdf3fae3cf945a581657aff644ccdbc",
20+
"Title" : "Season - Pre Season - Started - Dev",
21+
"HW2Season" : {
22+
"StartDate" : "2016-09-28T16:53:00Z",
23+
"DisplayInfo" : {
24+
"Id" : 202342,
25+
"Type" : "HW2SeasonDisplayInfo",
26+
"View" : {
27+
"Status" : "Published",
28+
"Common" : {
29+
"Owner" : "v-caarse",
30+
"CreatedUtc" : "2016-09-29T08:49:46Z",
31+
"ModifiedUtc" : "2017-02-03T18:33:17Z",
32+
"PublishedUtc" : "2017-02-03T19:34:17Z",
33+
"Container" : -1
3534
},
36-
"Identity": "f2704e55b3b84f88a58a01892fac1f38",
37-
"Title": "Season Display Info - Pre Season",
38-
"HW2SeasonDisplayInfo": {
39-
"Name": "PRE SEASON",
40-
"Description": "Not quite ready yet but almost"
35+
"Identity" : "f2704e55b3b84f88a58a01892fac1f38",
36+
"Title" : "Season Display Info - Pre Season",
37+
"HW2SeasonDisplayInfo" : {
38+
"Name" : "PRE SEASON",
39+
"Description" : "Not quite ready yet but almost"
4140
},
42-
"BatchLocalization": {
43-
"IsLocked": false
41+
"BatchLocalization" : {
42+
"IsLocked" : false
4443
},
45-
"Localization": {
46-
"Culture": "en",
47-
"MasterContentItemId": ""
44+
"Localization" : {
45+
"Culture" : "en",
46+
"MasterContentItemId" : ""
4847
}
4948
}
5049
},
51-
"Image": {},
52-
"Playlists": []
50+
"Image" : {},
51+
"Playlists" : [],
52+
"Image4K" : {}
5353
}
5454
},
55-
"Links": [
56-
{
57-
"Absolute": false,
58-
"Relation": "Self",
59-
"URI": "/content/202347"
60-
}
61-
],
62-
"ChildrenCount": 0
55+
"Links": [
56+
{
57+
"Absolute": false,
58+
"Relation": "Self",
59+
"URI": "/content/202347"
60+
}
61+
],
62+
"ChildrenCount" : 0
6363
}
6464
]
6565
}

‎Source/HaloSharp.Test/JSON/HaloWars2/Metadata/seasons.schema.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,21 @@
8282
{ "$ref": "common/image.schema.json#/definitions/ImageContentItemTypeB" }
8383
]
8484
},
85+
"Image4K": {
86+
"oneOf": [
87+
// TODO: This is pretty terrible.
88+
{ "$ref": "common/empty.schema.json" },
89+
{ "$ref": "common/image.schema.json#/definitions/null" },
90+
{ "$ref": "common/image.schema.json#/definitions/ImageContentItemTypeB" }
91+
]
92+
},
8593
"Playlists": {
8694
"type": "array",
8795
"items": {
8896
"oneOf": [
8997
// TODO: This is pretty terrible.
9098
{ "$ref": "common/empty.schema.json" },
91-
{ "$ref": "common/playlist.schema.json#/definitions/HW2PlaylistContentItemTypeB" }
99+
{ "$ref": "common/content-item-type-d.schema.json#/definitions/ContentItemTypeD" }
92100
]
93101
}
94102
}
@@ -97,6 +105,7 @@
97105
"StartDate",
98106
"DisplayInfo",
99107
"Image",
108+
"Image4K",
100109
"Playlists"
101110
]
102111
},

‎Source/HaloSharp.Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("2.0.0.0")]
35-
[assembly: AssemblyFileVersion("2.0.0.0")]
34+
[assembly: AssemblyVersion("2.0.1.0")]
35+
[assembly: AssemblyFileVersion("2.0.1.0")]

‎Source/HaloSharp/HaloSharp.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<iconUrl>http://i.imgur.com/bNFI8wr.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>$description$</description>
14-
<releaseNotes>Updated RequisitionPack model after API update.</releaseNotes>
14+
<releaseNotes>Halo 5, Halo 5 : Forge, Halo Wars 2!</releaseNotes>
1515
<copyright>Copyright 2016</copyright>
1616
<tags>HaloSharp, Halo, API, Game Data</tags>
1717
</metadata>

‎Source/HaloSharp/Model/HaloWars2/Metadata/Season/Season.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ public class Season : IEquatable<Season>
1717
[JsonProperty(PropertyName = "Image")]
1818
public ContentItemTypeB<Image.View> Image { get; set; }
1919

20+
[JsonProperty(PropertyName = "Image4K")]
21+
public ContentItemTypeB<Image.View> Image4K { get; set; }
22+
2023
[JsonProperty(PropertyName = "Playlists")]
21-
public List<ContentItemTypeB<Playlist.View>> Playlists { get; set; }
24+
public List<ContentItemTypeD> Playlists { get; set; }
2225

2326
public bool Equals(Season other)
2427
{
@@ -34,6 +37,7 @@ public bool Equals(Season other)
3437

3538
return Equals(DisplayInfo, other.DisplayInfo)
3639
&& Equals(Image, other.Image)
40+
&& Equals(Image4K, other.Image4K)
3741
&& Playlists.OrderBy(p => p.Id).SequenceEqual(other.Playlists.OrderBy(p => p.Id))
3842
&& StartDate.Equals(other.StartDate);
3943
}
@@ -64,6 +68,7 @@ public override int GetHashCode()
6468
{
6569
var hashCode = (DisplayInfo != null ? DisplayInfo.GetHashCode() : 0);
6670
hashCode = (hashCode*397) ^ (Image != null ? Image.GetHashCode() : 0);
71+
hashCode = (hashCode*397) ^ (Image4K != null ? Image4K.GetHashCode() : 0);
6772
hashCode = (hashCode*397) ^ (Playlists?.GetHashCode() ?? 0);
6873
hashCode = (hashCode*397) ^ StartDate.GetHashCode();
6974
return hashCode;

‎Source/HaloSharp/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.0.0.0")]
36-
[assembly: AssemblyFileVersion("2.0.0.0")]
35+
[assembly: AssemblyVersion("2.0.1.0")]
36+
[assembly: AssemblyFileVersion("2.0.1.0")]
3737

3838
//HaloSharp.Test
3939
[assembly: InternalsVisibleTo("HaloSharp.Test")]

0 commit comments

Comments
 (0)