Added cross-platform support by migrating package to a portable class…

… library.
adamfisher · May 1, 2017 · 5d1ac43 · 5d1ac43
1 parent 5e20f6b
commit 5d1ac43
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+RestSharp.Newtonsoft.Json.Tests/obj/
+RestSharp.Newtonsoft.Json/bin/
+RestSharp.Newtonsoft.Json/obj/
+RestSharp.Newtonsoft.Json.Tests/bin/
diff --git a/RestSharp.Newtonsoft.Json.Tests/RestSharp.Newtonsoft.Json.Tests.csproj b/RestSharp.Newtonsoft.Json.Tests/RestSharp.Newtonsoft.Json.Tests.csproj
@@ -30,37 +30,27 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FakeItEasy, Version=1.25.3.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
-      <HintPath>..\RestSharp.Newtonsoft.Json\packages\FakeItEasy.1.25.3\lib\net40\FakeItEasy.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FakeItEasy, Version=3.2.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FakeItEasy.3.2.0\lib\net40\FakeItEasy.dll</HintPath>
     </Reference>
-    <Reference Include="Machine.Specifications, Version=0.9.1.0, Culture=neutral, PublicKeyToken=e2091e5cc31f01f1, processorArchitecture=MSIL">
-      <HintPath>..\RestSharp.Newtonsoft.Json\packages\SignedBuild-Machine.Specifications.0.9.1\lib\net45\Machine.Specifications.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Machine.Specifications, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Machine.Specifications.0.11.0\lib\net45\Machine.Specifications.dll</HintPath>
     </Reference>
-    <Reference Include="Machine.Specifications.Clr4, Version=0.9.1.0, Culture=neutral, PublicKeyToken=e2091e5cc31f01f1, processorArchitecture=MSIL">
-      <HintPath>..\RestSharp.Newtonsoft.Json\packages\SignedBuild-Machine.Specifications.0.9.1\lib\net45\Machine.Specifications.Clr4.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Machine.Specifications.Should, Version=0.7.2.0, Culture=neutral, PublicKeyToken=e2091e5cc31f01f1, processorArchitecture=MSIL">
-      <HintPath>..\RestSharp.Newtonsoft.Json\packages\SignedBuild-Machine.Specifications.Should.0.7.2\lib\net45\Machine.Specifications.Should.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\RestSharp.Newtonsoft.Json\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Machine.Specifications.Should, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Machine.Specifications.Should.0.11.0\lib\net45\Machine.Specifications.Should.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\RestSharp.Newtonsoft.Json\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Serialization" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="RestRequest_Tests.cs" />
@@ -72,7 +62,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\RestSharp.Newtonsoft.Json\RestSharp.Newtonsoft.Json.csproj">
-      <Project>{54B76044-B67F-4CAB-88DC-3E605E3C33D9}</Project>
+      <Project>{D0172576-61BA-4CA0-A5DE-E4AC88A03E40}</Project>
       <Name>RestSharp.Newtonsoft.Json</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/RestSharp.Newtonsoft.Json.Tests/packages.config b/RestSharp.Newtonsoft.Json.Tests/packages.config
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FakeItEasy" version="1.25.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
+  <package id="FakeItEasy" version="3.2.0" targetFramework="net45" />
+  <package id="Machine.Specifications" version="0.11.0" targetFramework="net45" />
+  <package id="Machine.Specifications.Should" version="0.11.0" targetFramework="net45" />
   <package id="RestSharp" version="105.2.3" targetFramework="net45" />
-  <package id="SignedBuild-Machine.Specifications" version="0.9.1" targetFramework="net45" />
-  <package id="SignedBuild-Machine.Specifications.Should" version="0.7.2" targetFramework="net45" />
 </packages>
diff --git a/RestSharp.Newtonsoft.Json.sln b/RestSharp.Newtonsoft.Json.sln
@@ -1,26 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.3
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Newtonsoft.Json", "RestSharp.Newtonsoft.Json\RestSharp.Newtonsoft.Json.csproj", "{54B76044-B67F-4CAB-88DC-3E605E3C33D9}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Newtonsoft.Json.Tests", "RestSharp.Newtonsoft.Json.Tests\RestSharp.Newtonsoft.Json.Tests.csproj", "{FD7F655A-0486-4A98-9464-CC30364DB6AF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Newtonsoft.Json", "RestSharp.Newtonsoft.Json\RestSharp.Newtonsoft.Json.csproj", "{D0172576-61BA-4CA0-A5DE-E4AC88A03E40}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{54B76044-B67F-4CAB-88DC-3E605E3C33D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54B76044-B67F-4CAB-88DC-3E605E3C33D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54B76044-B67F-4CAB-88DC-3E605E3C33D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54B76044-B67F-4CAB-88DC-3E605E3C33D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD7F655A-0486-4A98-9464-CC30364DB6AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD7F655A-0486-4A98-9464-CC30364DB6AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD7F655A-0486-4A98-9464-CC30364DB6AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD7F655A-0486-4A98-9464-CC30364DB6AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0172576-61BA-4CA0-A5DE-E4AC88A03E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0172576-61BA-4CA0-A5DE-E4AC88A03E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0172576-61BA-4CA0-A5DE-E4AC88A03E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0172576-61BA-4CA0-A5DE-E4AC88A03E40}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/RestSharp.Newtonsoft.Json/Properties/AssemblyInfo.cs b/RestSharp.Newtonsoft.Json/Properties/AssemblyInfo.cs
@@ -1,35 +1,29 @@
-using System.Reflection;
+using System.Resources;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("RestSharp.Newtonsoft.Json")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Adam Fisher")]
+[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("RestSharp.Newtonsoft.Json")]
-[assembly: AssemblyCopyright("Copyright © Adam Fisher 2016")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1e3fac64-7d2c-4b0c-b00f-42342a183521")]
+[assembly: NeutralResourcesLanguage("en")]
 
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]

diff --git a/RestSharp.Newtonsoft.Json/RestSharp.Newtonsoft.Json.csproj b/RestSharp.Newtonsoft.Json/RestSharp.Newtonsoft.Json.csproj
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{54B76044-B67F-4CAB-88DC-3E605E3C33D9}</ProjectGuid>
+    <ProjectGuid>{D0172576-61BA-4CA0-A5DE-E4AC88A03E40}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RestSharp.Newtonsoft.Json</RootNamespace>
     <AssemblyName>RestSharp.Newtonsoft.Json</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,37 +32,21 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\RestSharp.105.2.3\lib\net45\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.Xml" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="NewtonsoftJsonSerializer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RestRequest.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\portable-net45+win8+wpa81+wp8\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="RestSharp">
+      <HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
+    </Reference>
+  </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>
-  -->
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
 </Project>
diff --git a/RestSharp.Newtonsoft.Json/RestSharp.Newtonsoft.Json.v12.suo b/RestSharp.Newtonsoft.Json/RestSharp.Newtonsoft.Json.v12.suo
diff --git a/RestSharp.Newtonsoft.Json/packages.config b/RestSharp.Newtonsoft.Json/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
-  <package id="RestSharp" version="105.2.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>