diff --git a/GiantBomb.Api.Net46/GiantBomb.Api.Net46.csproj b/GiantBomb.Api.Net46/GiantBomb.Api.Net46.csproj new file mode 100644 index 0000000..5acdbeb --- /dev/null +++ b/GiantBomb.Api.Net46/GiantBomb.Api.Net46.csproj @@ -0,0 +1,127 @@ + + + + + Debug + AnyCPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B} + Library + Properties + GiantBomb.Api + GiantBomb.Api + v4.6 + 512 + + + + true + full + false + ..\bin\Debug\net46\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\bin\Release\net46\ + TRACE + prompt + 4 + + + + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + True + + + + + + + + + + + + + Core.cs + + + GiantBombApiException.cs + + + GiantBombHttpException.cs + + + IGiantBombRestClient.cs + + + Model\Developer.cs + + + Model\Franchise.cs + + + Model\Game.cs + + + Model\Genre.cs + + + Model\GiantBombBase.cs + + + Model\Image.cs + + + Model\Platform.cs + + + Model\Publisher.cs + + + Model\Rating.cs + + + Model\Region.cs + + + Model\Release.cs + + + Resources\Games.cs + + + Resources\Platforms.cs + + + Resources\Regions.cs + + + Resources\Releases.cs + + + Resources\Search.cs + + + ResourceTypes.cs + + + SharedAssemblyInfo.cs + + + + + + + + + \ No newline at end of file diff --git a/GiantBomb.Api.Net46/Properties/AssemblyInfo.cs b/GiantBomb.Api.Net46/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..190befe --- /dev/null +++ b/GiantBomb.Api.Net46/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.InteropServices; + +[assembly: Guid("0f3123eb-bee8-4d22-8b82-fee48332479b")] \ No newline at end of file diff --git a/GiantBomb.Api.Net46/packages.config b/GiantBomb.Api.Net46/packages.config new file mode 100644 index 0000000..ba5e32a --- /dev/null +++ b/GiantBomb.Api.Net46/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/GiantBomb.Api.Net461/GiantBomb.Api.Net461.csproj b/GiantBomb.Api.Net461/GiantBomb.Api.Net461.csproj new file mode 100644 index 0000000..3802b5b --- /dev/null +++ b/GiantBomb.Api.Net461/GiantBomb.Api.Net461.csproj @@ -0,0 +1,127 @@ + + + + + Debug + AnyCPU + {64569B67-6E98-490C-A773-E23831189AD7} + Library + Properties + GiantBomb.Api + GiantBomb.Api + v4.6.1 + 512 + + + + true + full + false + ..\bin\Debug\net461\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\bin\Release\net461\ + TRACE + prompt + 4 + + + + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll + True + + + + + + + + + + + + + Core.cs + + + GiantBombApiException.cs + + + GiantBombHttpException.cs + + + IGiantBombRestClient.cs + + + Model\Developer.cs + + + Model\Franchise.cs + + + Model\Game.cs + + + Model\Genre.cs + + + Model\GiantBombBase.cs + + + Model\Image.cs + + + Model\Platform.cs + + + Model\Publisher.cs + + + Model\Rating.cs + + + Model\Region.cs + + + Model\Release.cs + + + Resources\Games.cs + + + Resources\Platforms.cs + + + Resources\Regions.cs + + + Resources\Releases.cs + + + Resources\Search.cs + + + ResourceTypes.cs + + + SharedAssemblyInfo.cs + + + + + + + + + \ No newline at end of file diff --git a/GiantBomb.Api.Net461/Properties/AssemblyInfo.cs b/GiantBomb.Api.Net461/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..54d31a7 --- /dev/null +++ b/GiantBomb.Api.Net461/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.InteropServices; + +[assembly: Guid("64569b67-6e98-490c-a773-e23831189ad7")] \ No newline at end of file diff --git a/GiantBomb.Api.Net461/packages.config b/GiantBomb.Api.Net461/packages.config new file mode 100644 index 0000000..29f5629 --- /dev/null +++ b/GiantBomb.Api.Net461/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/GiantBomb.Api.Tests/GiantBomb.Api.Tests.csproj b/GiantBomb.Api.Tests/GiantBomb.Api.Tests.csproj index 853bd94..9627e39 100644 --- a/GiantBomb.Api.Tests/GiantBomb.Api.Tests.csproj +++ b/GiantBomb.Api.Tests/GiantBomb.Api.Tests.csproj @@ -36,16 +36,12 @@ false - - ..\packages\fastJSON-KAyub.2.0.13.2\lib\net40\fastJSON.dll - True - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll True - - ..\packages\RestSharp.105.1.0\lib\net452\RestSharp.dll + + ..\packages\RestSharp.105.2.3\lib\net452\RestSharp.dll True diff --git a/GiantBomb.Api.Tests/packages.config b/GiantBomb.Api.Tests/packages.config index 6e8a394..e3743f7 100644 --- a/GiantBomb.Api.Tests/packages.config +++ b/GiantBomb.Api.Tests/packages.config @@ -1,6 +1,5 @@  - - + \ No newline at end of file diff --git a/GiantBomb.Api/Core.cs b/GiantBomb.Api/Core.cs index af820e9..2d8a293 100644 --- a/GiantBomb.Api/Core.cs +++ b/GiantBomb.Api/Core.cs @@ -51,8 +51,7 @@ public GiantBombRestClient(string apiToken) : this(apiToken, new Uri("http://www.giantbomb.com/api/")) { } - -#if FRAMEWORK + /// /// Execute a manual REST request /// @@ -126,7 +125,6 @@ public virtual async Task ExecuteAsync(RestRequest request) { return await _client.ExecuteTaskAsync(request).ConfigureAwait(false); } -#endif public virtual RestRequest GetListResource(string resource, int page = 1, int pageSize = GiantBombBase.DefaultLimit, string[] fieldList = null, IDictionary sortOptions = null, IDictionary filterOptions = null) { if (pageSize > GiantBombBase.DefaultLimit) diff --git a/GiantBomb.Api/GiantBomb.Api.csproj b/GiantBomb.Api/GiantBomb.Api.csproj index 79d46e5..2524509 100644 --- a/GiantBomb.Api/GiantBomb.Api.csproj +++ b/GiantBomb.Api/GiantBomb.Api.csproj @@ -20,7 +20,7 @@ true full false - bin\Debug\ + ..\bin\Debug\net452\ TRACE;DEBUG;FRAMEWORK prompt 4 @@ -29,7 +29,7 @@ pdbonly true - bin\Release\ + ..\bin\Release\net452\ TRACE;FRAMEWORK prompt 4 @@ -49,6 +49,9 @@ + + SharedAssemblyInfo.cs + @@ -74,12 +77,14 @@ - + + Designer + - "$(SolutionDir).nuget\nuget.exe" pack "$(ProjectPath)" -OutputDirectory "..\..\.." -Properties Configuration=Release + "$(SolutionDir).nuget\nuget.exe" pack "$(ProjectPath)" -Symbols -OutputDirectory "..\..\.." -Properties Configuration=Release copy "$(SolutionDir)Readme.md" "$(ProjectDir)readme.txt" /y diff --git a/GiantBomb.Api/GiantBomb.Api.nuspec b/GiantBomb.Api/GiantBomb.Api.nuspec index 4471840..60586ff 100644 --- a/GiantBomb.Api/GiantBomb.Api.nuspec +++ b/GiantBomb.Api/GiantBomb.Api.nuspec @@ -18,5 +18,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/GiantBomb.Api/Properties/AssemblyInfo.cs b/GiantBomb.Api/Properties/AssemblyInfo.cs index 6de30f6..310170f 100644 --- a/GiantBomb.Api/Properties/AssemblyInfo.cs +++ b/GiantBomb.Api/Properties/AssemblyInfo.cs @@ -1,17 +1,4 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("GiantBomb.Api")] -[assembly: AssemblyDescription("RestSharp-based API wrapper for the GiantBomb games database public API")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("kayub")] -[assembly: AssemblyProduct("GiantBomb.Api")] -[assembly: AssemblyCopyright("Copyright © kayub 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: Guid("5d910805-e5ae-48f0-8e39-d37104d7a91e")] - -[assembly: AssemblyVersion("2.3.0")] -[assembly: AssemblyFileVersion("2.3.0")] -[assembly: AssemblyInformationalVersion("2.3.0")] \ No newline at end of file +[assembly: Guid("5d910805-e5ae-48f0-8e39-d37104d7a91e")] \ No newline at end of file diff --git a/GiantBomb.sln b/GiantBomb.sln index d0c5df3..0afcdae 100644 --- a/GiantBomb.sln +++ b/GiantBomb.sln @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject LICENSE.txt = LICENSE.txt Readme.md = Readme.md + SharedAssemblyInfo.cs = SharedAssemblyInfo.cs EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9DBE19DE-C523-4B80-88A9-390F46769835}" @@ -21,6 +22,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9DBE19 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{90F6B7F2-5AAE-4D20-A383-F7DEDDC1CD10}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiantBomb.Api.Net46", "GiantBomb.Api.Net46\GiantBomb.Api.Net46.csproj", "{0F3123EB-BEE8-4D22-8B82-FEE48332479B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GiantBomb.Api.Net461", "GiantBomb.Api.Net461\GiantBomb.Api.Net461.csproj", "{64569B67-6E98-490C-A773-E23831189AD7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -75,6 +80,46 @@ Global {1B4925AE-F785-4F8D-AFBE-8FAEF0980946}.Release|x64.Build.0 = Release|Any CPU {1B4925AE-F785-4F8D-AFBE-8FAEF0980946}.Release|x86.ActiveCfg = Release|Any CPU {1B4925AE-F785-4F8D-AFBE-8FAEF0980946}.Release|x86.Build.0 = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|ARM.Build.0 = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|x64.ActiveCfg = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|x64.Build.0 = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|x86.ActiveCfg = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Debug|x86.Build.0 = Debug|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|Any CPU.Build.0 = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|ARM.ActiveCfg = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|ARM.Build.0 = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|x64.ActiveCfg = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|x64.Build.0 = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|x86.ActiveCfg = Release|Any CPU + {0F3123EB-BEE8-4D22-8B82-FEE48332479B}.Release|x86.Build.0 = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|ARM.ActiveCfg = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|ARM.Build.0 = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|x64.ActiveCfg = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|x64.Build.0 = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|x86.ActiveCfg = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Debug|x86.Build.0 = Debug|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|Any CPU.Build.0 = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|ARM.ActiveCfg = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|ARM.Build.0 = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|x64.ActiveCfg = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|x64.Build.0 = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|x86.ActiveCfg = Release|Any CPU + {64569B67-6E98-490C-A773-E23831189AD7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs new file mode 100644 index 0000000..ac426d9 --- /dev/null +++ b/SharedAssemblyInfo.cs @@ -0,0 +1,16 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("GiantBomb.Api")] +[assembly: AssemblyDescription("RestSharp-based API wrapper for the GiantBomb games database public API")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("kayub")] +[assembly: AssemblyProduct("GiantBomb.Api")] +[assembly: AssemblyCopyright("Copyright © kayub 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: ComVisible(false)] + +[assembly: AssemblyVersion("2.3.0")] +[assembly: AssemblyFileVersion("2.3.0")] +[assembly: AssemblyInformationalVersion("2.3.0")] \ No newline at end of file