Skip to content

Commit 75a8289

Browse files
author
babelshift
committed
This branch is currently a work in progress.
I am reworking all return values to come from a Steam.Models lib rather than from internal Json-specific classes. By referencing a "shared" lib, we can pass these models on to other libs or apps who also reference the "shared" lib without having to take a dependency on SteamWebAPI2. Additionally, using models that don't depend on JsonSerialization specifics will not require other libs and apps to take a dependency on Newtonsoft.Json.
1 parent 86f83d7 commit 75a8289

92 files changed

Lines changed: 2886 additions & 591 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.vs/config/applicationhost.config‎

Lines changed: 1030 additions & 0 deletions
Large diffs are not rendered by default.

‎SteamWebAPI2.Net451/SteamWebAPI2.Net451.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34+
<Reference Include="AutoMapper, Version=4.2.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
35+
<HintPath>..\packages\AutoMapper.4.2.0\lib\net45\AutoMapper.dll</HintPath>
36+
<Private>True</Private>
37+
</Reference>
3438
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3539
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
3640
<Private>True</Private>
3741
</Reference>
38-
<Reference Include="Steam.Models, Version=1.0.0.6, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Steam.Models.1.0.0.6\lib\net451\Steam.Models.dll</HintPath>
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>
4044
<Private>True</Private>
4145
</Reference>
4246
<Reference Include="System" />
@@ -49,6 +53,9 @@
4953
<Reference Include="System.Xml" />
5054
</ItemGroup>
5155
<ItemGroup>
56+
<Compile Include="..\SteamWebAPI2\AutoMapperConfiguration.cs">
57+
<Link>AutoMapperConfiguration.cs</Link>
58+
</Compile>
5259
<Compile Include="..\SteamWebAPI2\ErrorMessages.Designer.cs">
5360
<Link>ErrorMessages.Designer.cs</Link>
5461
</Compile>

‎SteamWebAPI2.Net451/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="AutoMapper" version="4.2.0" targetFramework="net451" />
34
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net451" />
4-
<package id="Steam.Models" version="1.0.0.6" targetFramework="net451" />
5+
<package id="Steam.Models" version="1.0.0.9" targetFramework="net451" />
56
</packages>

‎SteamWebAPI2.Net452/SteamWebAPI2.Net452.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34+
<Reference Include="AutoMapper, Version=4.2.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
35+
<HintPath>..\packages\AutoMapper.4.2.0\lib\net45\AutoMapper.dll</HintPath>
36+
<Private>True</Private>
37+
</Reference>
3438
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3539
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
3640
<Private>True</Private>
3741
</Reference>
38-
<Reference Include="Steam.Models, Version=1.0.0.6, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Steam.Models.1.0.0.6\lib\net452\Steam.Models.dll</HintPath>
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>
4044
<Private>True</Private>
4145
</Reference>
4246
<Reference Include="System" />
@@ -50,6 +54,9 @@
5054
<Reference Include="System.Xml" />
5155
</ItemGroup>
5256
<ItemGroup>
57+
<Compile Include="..\SteamWebAPI2\AutoMapperConfiguration.cs">
58+
<Link>AutoMapperConfiguration.cs</Link>
59+
</Compile>
5360
<Compile Include="..\SteamWebAPI2\ErrorMessages.Designer.cs">
5461
<Link>ErrorMessages.Designer.cs</Link>
5562
</Compile>

‎SteamWebAPI2.Net452/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="AutoMapper" version="4.2.0" targetFramework="net452" />
34
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
4-
<package id="Steam.Models" version="1.0.0.6" targetFramework="net452" />
5+
<package id="Steam.Models" version="1.0.0.9" targetFramework="net452" />
56
</packages>

‎SteamWebAPI2.Portable/SteamWebAPI2.Portable.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
<!-- A reference to the entire .NET Framework is automatically included -->
4040
</ItemGroup>
4141
<ItemGroup>
42+
<Compile Include="..\SteamWebAPI2\AutoMapperConfiguration.cs">
43+
<Link>AutoMapperConfiguration.cs</Link>
44+
</Compile>
4245
<Compile Include="..\SteamWebAPI2\ErrorMessages.Designer.cs">
4346
<Link>ErrorMessages.Designer.cs</Link>
4447
</Compile>

‎SteamWebAPI2.Portable/project.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
"uwp.10.0.app": {}
55
},
66
"dependencies": {
7+
"automapper": "4.2.0",
78
"Microsoft.NETCore": "5.0.0",
89
"Microsoft.NETCore.Portable.Compatibility": "1.0.0",
910
"Newtonsoft.Json": "8.0.2",
10-
"Steam.Models": "1.0.0.6"
11+
"Steam.Models": "1.0.0.9"
1112
},
1213
"frameworks": {
1314
"dotnet": {

0 commit comments

Comments
 (0)