Merge pull request #51 from gocardless/template-changes

Changes from gocardless-dotnet-template

GoCardless/GoCardless.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>GoCardless</PackageId>
-    <PackageVersion>3.6.0</PackageVersion>
+    <PackageVersion>3.7.0</PackageVersion>
     <Authors>GoCardless Ltd</Authors>
     <Description>Client for the GoCardless API - a powerful, simple solution for the collection of recurring bank-to-bank payments</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -11,7 +11,7 @@
     <Copyright>GoCardless Ltd</Copyright>
     <PackageTags>gocardless payments rest api direct debit</PackageTags>
     <PackageLicenseUrl>https://github.com/gocardless/gocardless-dotnet/blob/master/LICENSE.txt</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/gocardless/gocardless-dotnet/releases/tag/v3.6.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/gocardless/gocardless-dotnet/releases/tag/v3.7.0</PackageReleaseNotes>
     <TargetFrameworks>netstandard1.6;netstandard2.0;net46</TargetFrameworks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

GoCardless/GoCardlessClient.cs

@@ -252,9 +252,9 @@ private HttpRequestMessage BuildHttpRequestMessage<T>(string method, string path
             var httpMethod = new HttpMethod(method);
 
             var requestMessage = new HttpRequestMessage(httpMethod, new Uri(_baseUrl, path));
-            requestMessage.Headers.Add("User-Agent", "gocardless-dotnet/3.6.0");
+            requestMessage.Headers.Add("User-Agent", "gocardless-dotnet/3.7.0");
             requestMessage.Headers.Add("GoCardless-Version", "2015-07-06");
-            requestMessage.Headers.Add("GoCardless-Client-Version", "3.6.0");
+            requestMessage.Headers.Add("GoCardless-Client-Version", "3.7.0");
             requestMessage.Headers.Add("GoCardless-Client-Library", "gocardless-dotnet");
             requestMessage.Headers.Authorization =
                 new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _accessToken);

GoCardless/Resources/Payment.cs

@@ -36,10 +36,11 @@ public class Payment
 
         /// <summary>
         /// A future date on which the payment should be collected. If not
-        /// specified, the payment will be collected as soon as possible. This
-        /// must be on or after the [mandate](#core-endpoints-mandates)'s
-        /// `next_possible_charge_date`, and will be rolled-forwards by
-        /// GoCardless if it is not a working day.
+        /// specified, the payment will be collected as soon as possible. If the
+        /// value is before the [mandate](#core-endpoints-mandates)'s
+        /// `next_possible_charge_date` we will roll it forwards to match. If
+        /// the value is not a working day it will be rolled forwards to the
+        /// next available one.
         /// </summary>
         [JsonProperty("charge_date")]
         public string ChargeDate { get; set; }

GoCardless/Services/PaymentService.cs

@@ -242,10 +242,11 @@ public class PaymentCreateRequest : IHasIdempotencyKey
 
         /// <summary>
         /// A future date on which the payment should be collected. If not
-        /// specified, the payment will be collected as soon as possible. This
-        /// must be on or after the [mandate](#core-endpoints-mandates)'s
-        /// `next_possible_charge_date`, and will be rolled-forwards by
-        /// GoCardless if it is not a working day.
+        /// specified, the payment will be collected as soon as possible. If the
+        /// value is before the [mandate](#core-endpoints-mandates)'s
+        /// `next_possible_charge_date` we will roll it forwards to match. If
+        /// the value is not a working day it will be rolled forwards to the
+        /// next available one.
         /// </summary>
         [JsonProperty("charge_date")]
         public string ChargeDate { get; set; }
@@ -675,6 +676,17 @@ public class PaymentCancelRequest
     public class PaymentRetryRequest
     {
 
+        /// <summary>
+        /// A future date on which the payment should be collected. If not
+        /// specified, the payment will be collected as soon as possible. If the
+        /// value is before the [mandate](#core-endpoints-mandates)'s
+        /// `next_possible_charge_date` we will roll it forwards to match. If
+        /// the value is not a working day it will be rolled forwards to the
+        /// next available one.
+        /// </summary>
+        [JsonProperty("charge_date")]
+        public string ChargeDate { get; set; }
+
         /// <summary>
         /// Key-value store of custom data. Up to 3 keys are permitted, with key
         /// names up to 50 characters and values up to 500 characters.

README.md

@@ -3,7 +3,7 @@
 For full details of the GoCardless API, see the [API docs](https://developer.gocardless.com/).
 
 [![NuGet](https://img.shields.io/nuget/v/GoCardless.svg)](https://www.nuget.org/packages/GoCardless/)
-[![AppVeyor](https://img.shields.io/appveyor/ci/gocardless/gocardless-dotnet.svg)](https://ci.appveyor.com/project/gocardless/gocardless-dotnet)
+[![<GoCardless>](https://circleci.com/gh/gocardless/gocardless-dotnet.svg?style=svg)](https://circleci.com/gh/gocardless/gocardless-dotnet)
 
 - ["Getting started" guide](https://developer.gocardless.com/getting-started/api/introduction/)
 - [API Reference](https://developer.gocardless.com/api-reference)
@@ -13,7 +13,7 @@ For full details of the GoCardless API, see the [API docs](https://developer.goc
 
 To install `GoCardless`, run the following command in the [Package Manager Console](https://docs.microsoft.com/en-us/nuget/tools/package-manager-console)
 
-`Install-Package GoCardless -Version 3.6.0`
+`Install-Package GoCardless -Version 3.7.0`
 
 
 ## Usage