Skip to content

Commit 15ec9a9

Browse files
author
babelshift
committed
Merge branch 'master' into version-2
Conflicts: SteamWebAPI2.Net451/SteamWebAPI2.Net451.csproj SteamWebAPI2.Net451/packages.config SteamWebAPI2.Net452/SteamWebAPI2.Net452.csproj SteamWebAPI2.Net452/packages.config SteamWebAPI2.Portable/project.json SteamWebAPI2.Portable/project.lock.json SteamWebAPI2/SteamWebAPI2.csproj
2 parents b588e92 + 91bdc8b commit 15ec9a9

7 files changed

Lines changed: 13 additions & 9 deletions

File tree

SteamWebAPI2.Net451/SteamWebAPI2.Net451.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
42-
<Reference Include="Steam.Models, Version=1.0.0.9, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Steam.Models.1.0.0.9\lib\net451\Steam.Models.dll</HintPath>
42+
<Reference Include="Steam.Models, Version=1.0.0.11, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Steam.Models.1.0.0.11\lib\net451\Steam.Models.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="System" />

SteamWebAPI2.Net451/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="AutoMapper" version="4.2.0" targetFramework="net451" />
44
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net451" />
5-
<package id="Steam.Models" version="1.0.0.9" targetFramework="net451" />
5+
<package id="Steam.Models" version="1.0.0.11" targetFramework="net451" />
66
</packages>

SteamWebAPI2.Net452/SteamWebAPI2.Net452.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
42-
<Reference Include="Steam.Models, Version=1.0.0.9, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Steam.Models.1.0.0.9\lib\net452\Steam.Models.dll</HintPath>
42+
<Reference Include="Steam.Models, Version=1.0.0.11, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Steam.Models.1.0.0.11\lib\net452\Steam.Models.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="System" />

SteamWebAPI2.Net452/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="AutoMapper" version="4.2.0" targetFramework="net452" />
44
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
5-
<package id="Steam.Models" version="1.0.0.9" targetFramework="net452" />
5+
<package id="Steam.Models" version="1.0.0.11" targetFramework="net452" />
66
</packages>

SteamWebAPI2.Portable/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"Microsoft.NETCore": "5.0.0",
99
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
1010
"Newtonsoft.Json": "8.0.2",
11-
"Steam.Models": "1.0.0.9"
11+
"Steam.Models": "1.0.0.11"
1212
},
1313
"frameworks": {
1414
"dotnet": {

SteamWebAPI2/Models/DOTA2/HeroResultContainer.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
using System.Collections.Generic;
1+
using Newtonsoft.Json;
2+
using System.Collections.Generic;
23

34
namespace SteamWebAPI2.Models.DOTA2
45
{
56
internal class Hero
67
{
78
public string Name { get; set; }
89
public int Id { get; set; }
10+
11+
[JsonProperty(PropertyName = "localized_name")]
12+
public string LocalizedName { get; set; }
913
}
1014

1115
internal class HeroResult

SteamWebAPI2/SteamWebAPI2.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="Steam.Models, Version=1.0.0.11, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\..\..\Projects\TestSteamWebAPI2\packages\Steam.Models.1.0.0.11\lib\net46\Steam.Models.dll</HintPath>
42+
<HintPath>..\packages\Steam.Models.1.0.0.11\lib\net46\Steam.Models.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="System" />

0 commit comments

Comments
 (0)