removed msbuild process, I think it possibly blows right now.

using modernhttpclient bumped json.net version
stripe · Mar 15, 2016 · c1e3a34 · c1e3a34
1 parent 9024c48
commit c1e3a34
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 47 deletions.
diff --git a/build.cmd b/build.cmd
@@ -1,8 +1,9 @@
 .\build\nuget restore .\src\Stripe.sln
 
-call %WINDIR%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe .\src\Stripe.sln /p:Configuration=Release
 copy .\src\Stripe\bin\Release\Stripe.net.dll .\build\net45\Stripe.net.dll /Y
-copy .\src\Stripe.Portable\bin\Release\Stripe.net.Portable.dll .\build\portable\Stripe.net.dll /Y
+copy .\src\Stripe\bin\Release\Stripe.net.dll .\build\net45\Stripe.net.pdb /Y
+copy .\src\Stripe.Portable\bin\Release\Stripe.net.dll .\build\portable\Stripe.net.dll /Y
+copy .\src\Stripe.Portable\bin\Release\Stripe.net.pdb .\build\portable\Stripe.net.pdb /Y
 
 cd build
 nuget pack Stripe.net.nuspec
diff --git a/build/Stripe.net.nuspec b/build/Stripe.net.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>Stripe.net</id>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <authors>Jayme Davis</authors>
     <owners>Jayme Davis</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -13,12 +13,25 @@
     <description>Stripe.net is a .NET 4.5+ client, and a portable class library for stripe.com.</description>
     <tags>stripe, payment, credit cards, money, gateway, paypal, braintree</tags>
     <dependencies>
-      <dependency id="Newtonsoft.Json" version="8.0.2" />
+      <group targetFramework="portable-net45+wp8+wpa81+win8+MonoAndroid+MonoTouch+Xamarin.iOS+Xamarin.Mac">
+        <dependency id="Microsoft.Net.Http" version="2.2.29"/>
+        <dependency id="Microsoft.Bcl" version="1.1.10" />
+        <dependency id="Microsoft.Bcl.Build" version="1.0.21" />
+        <dependency id="Newtonsoft.Json" version="8.0.3" />
+        <dependency id="modernhttpclient" version="2.4.2" />
+      </group>
+      <group targetFramework="net45">
+        <dependency id="Newtonsoft.Json" version="8.0.3" />
+        <dependency id="modernhttpclient" version="2.4.2" />
+      </group>
     </dependencies>
   </metadata>
   <files>
     <file src="net45\Stripe.net.dll" target="lib\net45" />
+    <file src="net45\Stripe.net.pdb" target="lib\net45" />
     <file src="portable\Stripe.net.dll" target="lib\dotnet" />
-    <file src="portable\Stripe.net.dll" target="lib\portable-net45+win8+wpa81+wp8" />
+    <file src="portable\Stripe.net.pdb" target="lib\dotnet" />
+    <file src="portable\Stripe.net.dll" target="lib\portable-net45+wp8+wpa81+win8+MonoAndroid+MonoTouch+Xamarin.iOS+Xamarin.Mac" />
+    <file src="portable\Stripe.net.pdb" target="lib\portable-net45+wp8+wpa81+win8+MonoAndroid+MonoTouch+Xamarin.iOS+Xamarin.Mac" />
   </files>
 </package>
diff --git a/readme.md b/readme.md
@@ -1,5 +1,7 @@
 ![Stripe](https://stripe.com/img/navigation/logo.png?2)
 
+We are aware of issues relating to UWP and Xamarin. Both are being worked on now and will be fixed asap.    
+
 **Release: 6.0.0**    
 Stripe.net now supports .NET 4.5+ and is a portable class library. UWP, .NET Core, Windows 8, WindowsPhone 8.0+, and Xamarin are now supported.
 

diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
@@ -4,5 +4,5 @@
 [assembly: AssemblyCompany("Jayme Davis")]
 [assembly: AssemblyProduct("Stripe.net")]
 [assembly: AssemblyCopyright("Copyright (C) Jayme Davis 2016")]
-[assembly: AssemblyVersion("6.0.0")]
+[assembly: AssemblyVersion("6.0.1")]
 
diff --git a/src/Stripe.Portable/Stripe.Portable.csproj b/src/Stripe.Portable/Stripe.Portable.csproj
@@ -9,12 +9,14 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Stripe</RootNamespace>
-    <AssemblyName>Stripe.net.Portable</AssemblyName>
+    <AssemblyName>Stripe.net</AssemblyName>
     <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>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -404,8 +406,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -422,9 +428,11 @@
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
   </Target>
 </Project>
diff --git a/src/Stripe.Portable/packages.config b/src/Stripe.Portable/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="modernhttpclient" version="2.4.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
diff --git a/src/Stripe.Tests/Stripe.Tests.csproj b/src/Stripe.Tests/Stripe.Tests.csproj
@@ -42,7 +42,7 @@
       <Private>True</Private>
     </Reference>
     <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>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -219,9 +219,9 @@
     <Content Include="infrastructure\test_data\subscription.json" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Stripe\Stripe.csproj">
-      <Project>{e48e9ac1-3a88-406b-82ff-166b1e3c7a48}</Project>
-      <Name>Stripe</Name>
+    <ProjectReference Include="..\Stripe.Portable\Stripe.Portable.csproj">
+      <Project>{41019920-b57d-4065-b9df-1442cdaf3bac}</Project>
+      <Name>Stripe.Portable</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/Stripe.Tests/packages.config b/src/Stripe.Tests/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Machine.Specifications" version="0.9.3" targetFramework="net45" />
   <package id="Machine.Specifications.Should" version="0.8.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
 </packages>
diff --git a/src/Stripe.sln b/src/Stripe.sln
@@ -12,21 +12,63 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Debug|x64.Build.0 = Debug|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Debug|x86.Build.0 = Debug|Any CPU
 		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Release|ARM.Build.0 = Release|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Release|x64.ActiveCfg = Release|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Release|x64.Build.0 = Release|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Release|x86.ActiveCfg = Release|Any CPU
+		{E48E9AC1-3A88-406B-82FF-166B1E3C7A48}.Release|x86.Build.0 = Release|Any CPU
 		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Debug|x64.Build.0 = Debug|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Debug|x86.Build.0 = Debug|Any CPU
 		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Release|ARM.Build.0 = Release|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Release|x64.ActiveCfg = Release|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Release|x64.Build.0 = Release|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Release|x86.ActiveCfg = Release|Any CPU
+		{9150C4E3-8FBB-4C2B-A652-A18C58AE9678}.Release|x86.Build.0 = Release|Any CPU
 		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Debug|ARM.Build.0 = Debug|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Debug|x64.Build.0 = Debug|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Debug|x86.Build.0 = Debug|Any CPU
 		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Release|ARM.Build.0 = Release|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Release|x64.ActiveCfg = Release|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Release|x64.Build.0 = Release|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Release|x86.ActiveCfg = Release|Any CPU
+		{41019920-B57D-4065-B9DF-1442CDAF3BAC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Stripe/Infrastructure/Requestor.cs b/src/Stripe/Infrastructure/Requestor.cs
@@ -2,6 +2,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Text;
+using ModernHttpClient;
 
 namespace Stripe
 {
@@ -11,14 +12,7 @@ internal static class Requestor
 
         static Requestor()
         {
-            var handler = new HttpClientHandler();
-
-#if !PORTABLE
-            if (handler.SupportsAutomaticDecompression)
-                handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-#endif
-
-            HttpClient = new HttpClient(handler);
+            HttpClient = new HttpClient(new NativeMessageHandler());
         }
 
         public static string GetString(string url, StripeRequestOptions requestOptions)

diff --git a/src/Stripe/Stripe.csproj b/src/Stripe/Stripe.csproj
@@ -38,22 +38,18 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <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>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
@@ -190,11 +186,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
-  </Target>
 </Project>
diff --git a/src/Stripe/packages.config b/src/Stripe/packages.config
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
-  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
-  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net45" />
+  <package id="modernhttpclient" version="2.4.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
 </packages>