Merge pull request #38 from paypal/develop

tiffanyrzhou · web-flow · commit f6f4e4cb41e5 · 2019-11-21T15:16:07.000-08:00
1.0.3 release
diff --git a/PayPalCheckoutSdk/AccessTokenRequest.cs b/PayPalCheckoutSdk/AccessTokenRequest.cs
@@ -1,4 +1,4 @@
-﻿using BraintreeHttp;
+﻿using PayPalHttp;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Net.Http.Headers;
diff --git a/PayPalCheckoutSdk/Core/PaypalEnvironment.cs b/PayPalCheckoutSdk/Core/PaypalEnvironment.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Text;
-using BraintreeHttp;
+using PayPalHttp;
 
 namespace PayPalCheckoutSdk.Core
 {
     /// <summary>
     /// Recommended to use SandboxEnvironment for testing or LiveEnvironment for production.
     /// </summary>
-    public class PayPalEnvironment : BraintreeHttp.Environment
+    public class PayPalEnvironment : PayPalHttp.Environment
     {
         private string baseUrl;
         private string clientId;
diff --git a/PayPalCheckoutSdk/Core/PaypalHttpClient.cs b/PayPalCheckoutSdk/Core/PaypalHttpClient.cs
@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using System.Net.Http.Headers;
-using BraintreeHttp;
-
+using PayPalHttp;
 namespace PayPalCheckoutSdk.Core
 {
     public class PayPalHttpClient : HttpClient
diff --git a/PayPalCheckoutSdk/Orders/OrdersAuthorizeRequest.cs b/PayPalCheckoutSdk/Orders/OrdersAuthorizeRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Orders
diff --git a/PayPalCheckoutSdk/Orders/OrdersCaptureRequest.cs b/PayPalCheckoutSdk/Orders/OrdersCaptureRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Orders
diff --git a/PayPalCheckoutSdk/Orders/OrdersCreateRequest.cs b/PayPalCheckoutSdk/Orders/OrdersCreateRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Orders
diff --git a/PayPalCheckoutSdk/Orders/OrdersGetRequest.cs b/PayPalCheckoutSdk/Orders/OrdersGetRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Orders
diff --git a/PayPalCheckoutSdk/Orders/OrdersPatchRequest.cs b/PayPalCheckoutSdk/Orders/OrdersPatchRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Orders
diff --git a/PayPalCheckoutSdk/Orders/OrdersValidateRequest.cs b/PayPalCheckoutSdk/Orders/OrdersValidateRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Orders
diff --git a/PayPalCheckoutSdk/PayPalCheckoutSdk.csproj b/PayPalCheckoutSdk/PayPalCheckoutSdk.csproj
@@ -2,11 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageVersion>1.0.2</PackageVersion>
+    <PackageVersion>1.0.3</PackageVersion>
+    <Owners>PayPal</Owners>
+    <PackageProjectUrl>https://github.com/paypal/Checkout-NET-SDK</PackageProjectUrl>
+    <PackageReleaseNotes>Replaced BraintreeHttp with PayPalHttp</PackageReleaseNotes>
+    <Title>PayPalCheckoutSdk</Title>
+    <PackOnBuild>true</PackOnBuild>
+    <Authors>PayPal</Authors>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BraintreeHttp-Dotnet" Version="0.3.0" />
+    <PackageReference Include="PayPalHttp" Version="1.0.0" />
   </ItemGroup>
-
 </Project>
diff --git a/PayPalCheckoutSdk/Payments/AuthorizationsCaptureRequest.cs b/PayPalCheckoutSdk/Payments/AuthorizationsCaptureRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Payments
diff --git a/PayPalCheckoutSdk/Payments/AuthorizationsGetRequest.cs b/PayPalCheckoutSdk/Payments/AuthorizationsGetRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Payments
diff --git a/PayPalCheckoutSdk/Payments/AuthorizationsReauthorizeRequest.cs b/PayPalCheckoutSdk/Payments/AuthorizationsReauthorizeRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Payments
diff --git a/PayPalCheckoutSdk/Payments/AuthorizationsVoidRequest.cs b/PayPalCheckoutSdk/Payments/AuthorizationsVoidRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Payments
diff --git a/PayPalCheckoutSdk/Payments/CapturesGetRequest.cs b/PayPalCheckoutSdk/Payments/CapturesGetRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Payments
diff --git a/PayPalCheckoutSdk/Payments/CapturesRefundRequest.cs b/PayPalCheckoutSdk/Payments/CapturesRefundRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Payments
diff --git a/PayPalCheckoutSdk/Payments/RefundsGetRequest.cs b/PayPalCheckoutSdk/Payments/RefundsGetRequest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 
 
 namespace PayPalCheckoutSdk.Payments
diff --git a/PayPalCheckoutSdk/RefreshTokenRequest.cs b/PayPalCheckoutSdk/RefreshTokenRequest.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using BraintreeHttp;
+using PayPalHttp;
 
 namespace PayPalCheckoutSdk.Core
 {
diff --git a/README.MD b/README.MD
@@ -6,7 +6,7 @@ __Welcome to PayPal Dotnet SDK__. This repository contains PayPal's Dotnet SDK a
 
 This is a part of the next major PayPal SDK. It includes a simplified interface to only provide simple model objects and blueprints for HTTP calls. This repo currently contains functionality for PayPal Checkout APIs which includes [Orders V2](https://developer.paypal.com/docs/api/orders/v2/) and [Payments V2](https://developer.paypal.com/docs/api/payments/v2/).
 
-Please refer to the [PayPal Checkout Integration Guide](https://developer.paypal.com/docs/checkout/) for more information. Also refer to [Setup your SDK](https://developer.paypal.com/docs/checkout/reference/server-integration/setup-sdk/) for additional information about setting up the SDK's. 
+Please refer to the [PayPal Checkout Integration Guide](https://developer.paypal.com/docs/checkout/) for more information. Also refer to [Setup your SDK](https://developer.paypal.com/docs/checkout/reference/server-integration/setup-sdk/) for additional information about setting up the SDK's.
 
 
 ## Prerequisites
@@ -15,7 +15,7 @@ Please refer to the [PayPal Checkout Integration Guide](https://developer.paypal
 
 An environment which supports TLS 1.2 (see the TLS-update site for more information)
 
-BraintreeHttp-Dotnet 0.3.0
+PayPalHttp 1.0.0
 
 ## Usage
 
@@ -32,11 +32,11 @@ Get client ID and client secret by going to https://developer.paypal.com/develop
 using System;
 using PayPalCheckoutSdk.Core;
 using PayPalCheckoutSdk.Orders;
-using BraintreeHttp;
+using PayPalHttp;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-public class CaptureOrderSample 
+public class CaptureOrderSample
 {
     static String clientId = "PAYPAL-CLIENT-ID";
     static String secret = "PAYPAL-CLIENT-SECRET";
diff --git a/Samples/AuthorizeIntentExamples/AuthorizeOrderSample.cs b/Samples/AuthorizeIntentExamples/AuthorizeOrderSample.cs
@@ -4,7 +4,7 @@
 
 using Samples;
 using PayPalCheckoutSdk.Orders;
-using BraintreeHttp;
+using PayPalHttp;
 
 namespace Samples.AuthorizeIntentExamples
 {
diff --git a/Samples/AuthorizeIntentExamples/CaptureOrderSample.cs b/Samples/AuthorizeIntentExamples/CaptureOrderSample.cs
@@ -4,7 +4,7 @@
 
 using Samples;
 using PayPalCheckoutSdk.Payments;
-using BraintreeHttp;
+using PayPalHttp;
 
 namespace Samples.AuthorizeIntentExamples
 {
diff --git a/Samples/AuthorizeIntentExamples/CreateOrderSample.cs b/Samples/AuthorizeIntentExamples/CreateOrderSample.cs
@@ -4,7 +4,7 @@
 
 using Samples;
 using PayPalCheckoutSdk.Orders;
-using BraintreeHttp;
+using PayPalHttp;
 
 using System.IO;
 using System.Text;
diff --git a/Samples/CaptureIntentExamples/CaptureOrderSample.cs b/Samples/CaptureIntentExamples/CaptureOrderSample.cs
@@ -4,7 +4,7 @@
 
 using PayPalCheckoutSdk.Core;
 using PayPalCheckoutSdk.Orders;
-using BraintreeHttp;
+using PayPalHttp;
 
 namespace Samples.CaptureIntentExamples
 {
diff --git a/Samples/CaptureIntentExamples/CreateOrderSample.cs b/Samples/CaptureIntentExamples/CreateOrderSample.cs
@@ -4,7 +4,7 @@
 
 using PayPalCheckoutSdk.Core;
 using PayPalCheckoutSdk.Orders;
-using BraintreeHttp;
+using PayPalHttp;
 
 namespace Samples.CaptureIntentExamples
 {
diff --git a/Samples/CapturesRefundSample.cs b/Samples/CapturesRefundSample.cs
@@ -4,7 +4,7 @@
 
 using PayPalCheckoutSdk.Core;
 using PayPalCheckoutSdk.Payments;
-using BraintreeHttp;
+using PayPalHttp;
 
 namespace Samples
 {
diff --git a/Samples/GetOrderSample.cs b/Samples/GetOrderSample.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using BraintreeHttp;
+using PayPalHttp;
 using PayPalCheckoutSdk.Core;
 using PayPalCheckoutSdk.Orders;
 using Samples.CaptureIntentExamples;
diff --git a/Samples/PatchOrderSample.cs b/Samples/PatchOrderSample.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using BraintreeHttp;
+using PayPalHttp;
 using PayPalCheckoutSdk.Core;
 using PayPalCheckoutSdk.Orders;
 using Samples.AuthorizeIntentExamples;
diff --git a/Samples/PayPalClient.cs b/Samples/PayPalClient.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 using PayPalCheckoutSdk.Core;
-using BraintreeHttp;
+using PayPalHttp;
 
 using System.IO;
 using System.Text;
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
@@ -3,17 +3,17 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <PackageVersion>1.0.2</PackageVersion>
+    <PackageVersion>1.0.3</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Remove="Program.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PayPalCheckoutSdk\PayPalCheckoutSdk.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="CaptureIntentExamples\" />
     <Folder Include="AuthorizeIntentExamples\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PayPalCheckoutSdk\PayPalCheckoutSdk.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/Test/Orders/OrdersAuthorizeTest.cs b/Test/Orders/OrdersAuthorizeTest.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 using Xunit;
 using PayPalCheckoutSdk.Test;
 using static PayPalCheckoutSdk.Test.TestHarness;
diff --git a/Test/Orders/OrdersCaptureTest.cs b/Test/Orders/OrdersCaptureTest.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 using Xunit;
 using PayPalCheckoutSdk.Test;
 using static PayPalCheckoutSdk.Test.TestHarness;
diff --git a/Test/Orders/OrdersCreateTest.cs b/Test/Orders/OrdersCreateTest.cs
@@ -4,7 +4,7 @@
 using System.Net.Http;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using BraintreeHttp;
+using PayPalHttp;
 using Xunit;
 using Xunit.Abstractions;
 using PayPalCheckoutSdk.Test;
diff --git a/Test/Orders/OrdersGetTest.cs b/Test/Orders/OrdersGetTest.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 using Xunit;
 using PayPalCheckoutSdk.Test;
 using static PayPalCheckoutSdk.Test.TestHarness;
diff --git a/Test/Orders/OrdersPatchTest.cs b/Test/Orders/OrdersPatchTest.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 using Xunit;
 using PayPalCheckoutSdk.Test;
 using static PayPalCheckoutSdk.Test.TestHarness;
diff --git a/Test/Orders/OrdersValidateTest.cs b/Test/Orders/OrdersValidateTest.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.Net.Http;
 using System.Collections.Generic;
-using BraintreeHttp;
+using PayPalHttp;
 using Xunit;
 using PayPalCheckoutSdk.Test;
 using static PayPalCheckoutSdk.Test.TestHarness;
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <PackageVersion>1.0.1</PackageVersion>
+    <PackageVersion>1.0.3</PackageVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/Test/TestHarness.cs b/Test/TestHarness.cs
@@ -1,6 +1,6 @@
 using System;
 using PayPalCheckoutSdk.Core;
-using BraintreeHttp;
+using PayPalHttp;
 using Xunit;
 [assembly: CollectionBehavior(MaxParallelThreads = -1)]
 
diff --git a/packages/BraintreeHttp-Dotnet.0.3.0/BraintreeHttp-Dotnet.0.3.0.nupkg b/packages/BraintreeHttp-Dotnet.0.3.0/BraintreeHttp-Dotnet.0.3.0.nupkg
diff --git a/packages/BraintreeHttp-Dotnet.0.3.0/lib/netstandard2.0/BraintreeHttp-Dotnet.dll b/packages/BraintreeHttp-Dotnet.0.3.0/lib/netstandard2.0/BraintreeHttp-Dotnet.dll
diff --git a/packages/PayPalHttp-Dotnet.1.0.0/PayPalHttp-Dotnet.1.0.0.nupkg b/packages/PayPalHttp-Dotnet.1.0.0/PayPalHttp-Dotnet.1.0.0.nupkg
diff --git a/packages/PayPalHttp-Dotnet.1.0.0/lib/netstandard2.0/PayPalHttp-Dotnet.dll b/packages/PayPalHttp-Dotnet.1.0.0/lib/netstandard2.0/PayPalHttp-Dotnet.dll

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using BraintreeHttp;`
	`1`	`+using PayPalHttp;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Net.Http;`
`4`	`4`	`using System.Net.Http.Headers;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`	`2`	`using System.Net.Http.Headers;`
`3`		`-using BraintreeHttp;`
`4`		`-`
	`3`	`+using PayPalHttp;`
`5`	`4`	`namespace PayPalCheckoutSdk.Core`
`6`	`5`	`{`
`7`	`6`	`public class PayPalHttpClient : HttpClient`