Add support for .NET 4.6 and 4.6.1, symbols for Nuget

kamranayub · Dec 8, 2015 · 70ce2b3 · 70ce2b3
1 parent ec82426
commit 70ce2b3
Show file tree

Hide file tree

Showing 14 changed files with 353 additions and 29 deletions.
diff --git a/GiantBomb.Api.Net46/GiantBomb.Api.Net46.csproj b/GiantBomb.Api.Net46/GiantBomb.Api.Net46.csproj
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0F3123EB-BEE8-4D22-8B82-FEE48332479B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>GiantBomb.Api</RootNamespace>
+    <AssemblyName>GiantBomb.Api</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\bin\Debug\net46\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Release\net46\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GiantBomb.Api\Core.cs">
+      <Link>Core.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\GiantBombApiException.cs">
+      <Link>GiantBombApiException.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\GiantBombHttpException.cs">
+      <Link>GiantBombHttpException.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\IGiantBombRestClient.cs">
+      <Link>IGiantBombRestClient.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Developer.cs">
+      <Link>Model\Developer.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Franchise.cs">
+      <Link>Model\Franchise.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Game.cs">
+      <Link>Model\Game.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Genre.cs">
+      <Link>Model\Genre.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\GiantBombBase.cs">
+      <Link>Model\GiantBombBase.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Image.cs">
+      <Link>Model\Image.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Platform.cs">
+      <Link>Model\Platform.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Publisher.cs">
+      <Link>Model\Publisher.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Rating.cs">
+      <Link>Model\Rating.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Region.cs">
+      <Link>Model\Region.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Model\Release.cs">
+      <Link>Model\Release.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Resources\Games.cs">
+      <Link>Resources\Games.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Resources\Platforms.cs">
+      <Link>Resources\Platforms.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Resources\Regions.cs">
+      <Link>Resources\Regions.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Resources\Releases.cs">
+      <Link>Resources\Releases.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\Resources\Search.cs">
+      <Link>Resources\Search.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\ResourceTypes.cs">
+      <Link>ResourceTypes.cs</Link>
+    </Compile>
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>SharedAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/GiantBomb.Api.Net46/Properties/AssemblyInfo.cs b/GiantBomb.Api.Net46/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.InteropServices;
+
+[assembly: Guid("0f3123eb-bee8-4d22-8b82-fee48332479b")]
diff --git a/GiantBomb.Api.Net46/packages.config b/GiantBomb.Api.Net46/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp" version="105.2.3" targetFramework="net46" />
+</packages>
diff --git a/GiantBomb.Api.Net461/GiantBomb.Api.Net461.csproj b/GiantBomb.Api.Net461/GiantBomb.Api.Net461.csproj
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{64569B67-6E98-490C-A773-E23831189AD7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>GiantBomb.Api</RootNamespace>
+    <AssemblyName>GiantBomb.Api</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\bin\Debug\net461\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Release\net461\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\GiantBomb.Api\Core.cs">
+      <Link>Core.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\GiantBombApiException.cs">
+      <Link>GiantBombApiException.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\GiantBombHttpException.cs">
+      <Link>GiantBombHttpException.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\IGiantBombRestClient.cs">
+      <Link>IGiantBombRestClient.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Developer.cs">
+      <Link>Model\Developer.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Franchise.cs">
+      <Link>Model\Franchise.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Game.cs">
+      <Link>Model\Game.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Genre.cs">
+      <Link>Model\Genre.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\GiantBombBase.cs">
+      <Link>Model\GiantBombBase.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Image.cs">
+      <Link>Model\Image.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Platform.cs">
+      <Link>Model\Platform.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Publisher.cs">
+      <Link>Model\Publisher.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Rating.cs">
+      <Link>Model\Rating.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Region.cs">
+      <Link>Model\Region.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\model\Release.cs">
+      <Link>Model\Release.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\resources\Games.cs">
+      <Link>Resources\Games.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\resources\Platforms.cs">
+      <Link>Resources\Platforms.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\resources\Regions.cs">
+      <Link>Resources\Regions.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\resources\Releases.cs">
+      <Link>Resources\Releases.cs</Link>
+    </Compile>
+    <Compile Include="..\giantbomb.api\resources\Search.cs">
+      <Link>Resources\Search.cs</Link>
+    </Compile>
+    <Compile Include="..\GiantBomb.Api\ResourceTypes.cs">
+      <Link>ResourceTypes.cs</Link>
+    </Compile>
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>SharedAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/GiantBomb.Api.Net461/Properties/AssemblyInfo.cs b/GiantBomb.Api.Net461/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.InteropServices;
+
+[assembly: Guid("64569b67-6e98-490c-a773-e23831189ad7")]
diff --git a/GiantBomb.Api.Net461/packages.config b/GiantBomb.Api.Net461/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp" version="105.2.3" targetFramework="net461" />
+</packages>
diff --git a/GiantBomb.Api.Tests/GiantBomb.Api.Tests.csproj b/GiantBomb.Api.Tests/GiantBomb.Api.Tests.csproj
@@ -36,16 +36,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="fastJSON, Version=2.0.13.2, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\fastJSON-KAyub.2.0.13.2\lib\net40\fastJSON.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="RestSharp, Version=105.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.105.1.0\lib\net452\RestSharp.dll</HintPath>
+    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net452\RestSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/GiantBomb.Api.Tests/packages.config b/GiantBomb.Api.Tests/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="fastJSON-KAyub" version="2.0.13.2" targetFramework="net452" />
   <package id="NUnit" version="2.6.4" targetFramework="net452" />
-  <package id="RestSharp" version="105.1.0" targetFramework="net452" />
+  <package id="RestSharp" version="105.2.3" targetFramework="net452" />
 </packages>
diff --git 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
+
         /// <summary>
         /// Execute a manual REST request
         /// </summary>
@@ -126,7 +125,6 @@ public virtual async Task<IRestResponse> 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<string, SortDirection> sortOptions = null, IDictionary<string, object> filterOptions = null) {
             if (pageSize > GiantBombBase.DefaultLimit)

diff --git a/GiantBomb.Api/GiantBomb.Api.csproj b/GiantBomb.Api/GiantBomb.Api.csproj
@@ -20,7 +20,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\bin\Debug\net452\</OutputPath>
     <DefineConstants>TRACE;DEBUG;FRAMEWORK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\bin\Release\net452\</OutputPath>
     <DefineConstants>TRACE;FRAMEWORK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -49,6 +49,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>SharedAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="Core.cs" />
     <Compile Include="GiantBombHttpException.cs" />
     <Compile Include="GiantBombApiException.cs" />
@@ -74,12 +77,14 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="GiantBomb.Api.nuspec" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <PropertyGroup>
-    <PostBuildEvent>"$(SolutionDir).nuget\nuget.exe" pack "$(ProjectPath)" -OutputDirectory "..\..\.." -Properties Configuration=Release</PostBuildEvent>
+    <PostBuildEvent>"$(SolutionDir).nuget\nuget.exe" pack "$(ProjectPath)" -Symbols -OutputDirectory "..\..\.." -Properties Configuration=Release</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>copy "$(SolutionDir)Readme.md" "$(ProjectDir)readme.txt" /y</PreBuildEvent>

diff --git a/GiantBomb.Api/GiantBomb.Api.nuspec b/GiantBomb.Api/GiantBomb.Api.nuspec
@@ -18,5 +18,15 @@
   </metadata>
   <files>
     <file src="readme.txt" target="readme.txt" />
+
+    <!-- .NET 4.5.2 will be inserted automatically -->
+
+    <!-- .NET 4.6 -->
+    <file src="..\bin\Release\net46\GiantBomb.Api.dll" target="lib\net46\GiantBomb.Api.dll"/>
+    <file src="..\bin\Release\net46\GiantBomb.Api.pdb" target="lib\net46\GiantBomb.Api.pdb"/>
+
+    <!-- .NET 4.6.1 -->
+    <file src="..\bin\Release\net461\GiantBomb.Api.dll" target="lib\net461\GiantBomb.Api.dll"/>
+    <file src="..\bin\Release\net461\GiantBomb.Api.pdb" target="lib\net461\GiantBomb.Api.pdb"/>
   </files>
 </package>