diff --git a/build.cmd b/build.cmd index 04f7fec408..7a7cb429fc 100644 --- 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 index 578bbc4036..55b234175d 100644 --- a/build/Stripe.net.nuspec +++ b/build/Stripe.net.nuspec @@ -2,7 +2,7 @@ Stripe.net - 6.0.0 + 6.0.1 Jayme Davis Jayme Davis false @@ -13,12 +13,25 @@ Stripe.net is a .NET 4.5+ client, and a portable class library for stripe.com. stripe, payment, credit cards, money, gateway, paypal, braintree - + + + + + + + + + + + + - + + + \ No newline at end of file diff --git a/readme.md b/readme.md index 76b5ff9254..f374a41d5e 100644 --- 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 index 2c041750b5..c62cfbc9f6 100644 --- 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 index 43107123f3..2e2f780b05 100644 --- a/src/Stripe.Portable/Stripe.Portable.csproj +++ b/src/Stripe.Portable/Stripe.Portable.csproj @@ -9,12 +9,14 @@ Library Properties Stripe - Stripe.net.Portable + Stripe.net en-US 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Profile259 v4.5 + + true @@ -404,8 +406,12 @@ + + ..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll + True + - ..\packages\Newtonsoft.Json.8.0.2\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.8.0.3\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll True @@ -422,9 +428,11 @@ - - - - + + + + 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}. + + \ No newline at end of file diff --git a/src/Stripe.Portable/packages.config b/src/Stripe.Portable/packages.config index 63ab628777..07543fb551 100644 --- a/src/Stripe.Portable/packages.config +++ b/src/Stripe.Portable/packages.config @@ -1,7 +1,8 @@  - + - + + \ No newline at end of file diff --git a/src/Stripe.Tests/Stripe.Tests.csproj b/src/Stripe.Tests/Stripe.Tests.csproj index c39b23b287..593851b07e 100644 --- a/src/Stripe.Tests/Stripe.Tests.csproj +++ b/src/Stripe.Tests/Stripe.Tests.csproj @@ -42,7 +42,7 @@ True - ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True @@ -219,9 +219,9 @@ - - {e48e9ac1-3a88-406b-82ff-166b1e3c7a48} - Stripe + + {41019920-b57d-4065-b9df-1442cdaf3bac} + Stripe.Portable diff --git a/src/Stripe.Tests/packages.config b/src/Stripe.Tests/packages.config index f215c13090..a38004d591 100644 --- a/src/Stripe.Tests/packages.config +++ b/src/Stripe.Tests/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/src/Stripe.sln b/src/Stripe.sln index 5a24d6f785..05380c53c3 100644 --- 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 index ed85dfd153..1e4ea5364a 100644 --- 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 index 9a935a68bb..43481c6322 100644 --- a/src/Stripe/Stripe.csproj +++ b/src/Stripe/Stripe.csproj @@ -38,22 +38,18 @@ + + ..\packages\modernhttpclient.2.4.2\lib\Portable-Net45+WinRT45+WP8+WPA81\ModernHttpClient.dll + True + - ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll True - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - True - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - True - @@ -190,11 +186,4 @@ - - - - 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}. - - - \ No newline at end of file diff --git a/src/Stripe/packages.config b/src/Stripe/packages.config index ac0cee1b8e..bba8b45bf8 100644 --- a/src/Stripe/packages.config +++ b/src/Stripe/packages.config @@ -1,7 +1,5 @@  - - - - + + \ No newline at end of file