diff --git a/.github/workflows/cybersource-rest-client-netstandard-publish2.yml b/.github/workflows/cybersource-rest-client-netstandard-publish2.yml
deleted file mode 100644
index 5a09fdbf..00000000
--- a/.github/workflows/cybersource-rest-client-netstandard-publish2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: CyberSource REST Client Publish 2
-
-on:
- push:
- tags:
- - 'client-*'
-
-jobs:
- build:
- runs-on: windows-2022
- name: build and publish
- steps:
- - name: Support longpaths
- run: git config --system core.longpaths true
- - uses: actions/checkout@v2
- - name: Add nuget package source
- run: dotnet nuget add source --username sipsorcery --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github-nofrixion "https://nuget.pkg.github.com/nofrixion/index.json"
- - name: Install dependencies
- run: dotnet restore cybersource-rest-client-netstandard\cybersource-rest-client-netstandard.sln
- - name: Build
- run: dotnet build cybersource-rest-client-netstandard\cybersource-rest-client-netstandard.sln -c Release --no-restore
- - name: Publish
- run: dotnet nuget push **\*.nupkg --source https://nuget.pkg.github.com/nofrixion/index.json --api-key ${{ secrets.GITHUB_TOKEN }}
diff --git a/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdk/AuthenticationSdk.csproj b/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdk/AuthenticationSdk.csproj
index e585d445..41a19d8f 100644
--- a/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdk/AuthenticationSdk.csproj
+++ b/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdk/AuthenticationSdk.csproj
@@ -38,7 +38,7 @@
-
+
diff --git a/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdk/authentication/http/HttpTokenGenerator.cs b/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdk/authentication/http/HttpTokenGenerator.cs
index 97fcec43..1c5d74aa 100644
--- a/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdk/authentication/http/HttpTokenGenerator.cs
+++ b/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdk/authentication/http/HttpTokenGenerator.cs
@@ -44,11 +44,11 @@ private string SignatureForCategory1()
{
var signatureString = new StringBuilder();
var signatureHeaderValue = new StringBuilder();
- const string getOrDeleteHeaders = "host date (request-target) v-c-merchant-id";
+ const string getOrDeleteHeaders = "host date request-target v-c-merchant-id";
signatureString.Append($"\nhost: {_httpToken.HostName}")
.Append($"\ndate: {_httpToken.GmtDateTime}")
- .Append($"\n(request-target): {_httpToken.HttpSignRequestTarget}")
+ .Append($"\nrequest-target: {_httpToken.HttpSignRequestTarget}")
.Append($"\nv-c-merchant-id: ");
if (_httpToken.UseMetaKey == true)
@@ -81,11 +81,11 @@ private string SignatureForCategory2()
var signatureString = new StringBuilder();
var signatureHeaderValue = new StringBuilder();
_httpToken.Digest = GenerateDigest();
- const string postOrPutHeaders = "host date (request-target) digest v-c-merchant-id";
+ const string postOrPutHeaders = "host date request-target digest v-c-merchant-id";
signatureString.Append($"\nhost: {_httpToken.HostName}")
.Append($"\ndate: {_httpToken.GmtDateTime}")
- .Append($"\n(request-target): {_httpToken.HttpSignRequestTarget}")
+ .Append($"\nrequest-target: {_httpToken.HttpSignRequestTarget}")
.Append($"\ndigest: {_httpToken.Digest}")
.Append($"\nv-c-merchant-id: ");
diff --git a/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdkTests.NetCore/AuthenticationSdkTests.NetCore.csproj b/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdkTests.NetCore/AuthenticationSdkTests.NetCore.csproj
index 5a634b31..41dd3445 100644
--- a/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdkTests.NetCore/AuthenticationSdkTests.NetCore.csproj
+++ b/cybersource-rest-auth-netstandard/AuthenticationSdk/AuthenticationSdkTests.NetCore/AuthenticationSdkTests.NetCore.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.1
+ net8.0
false
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/cybersource-rest-client-netstandard.Test.csproj b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/cybersource-rest-client-netstandard.Test.csproj
index 9edb74d1..17db00f6 100644
--- a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/cybersource-rest-client-netstandard.Test.csproj
+++ b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/cybersource-rest-client-netstandard.Test.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Api/AsymmetricKeyManagementApi.cs b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Api/AsymmetricKeyManagementApi.cs
index 291575ce..a98935ad 100644
--- a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Api/AsymmetricKeyManagementApi.cs
+++ b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Api/AsymmetricKeyManagementApi.cs
@@ -216,7 +216,7 @@ public AsymmetricKeyManagementApi(Configuration configuration = null)
/// The base path
public string GetBasePath()
{
- return Configuration.ApiClient.RestClient.BaseUrl.ToString();
+ return Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
}
///
@@ -349,8 +349,8 @@ public ApiResponse< KmsV2KeysAsymPost201Response > CreateP12KeysWithHttpInfo (Cr
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
- Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+ var localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -446,8 +446,8 @@ public async System.Threading.Tasks.Task DeleteBulkP12KeysWithH
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
- Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+ RestResponse localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -638,8 +638,8 @@ public async System.Threading.Tasks.Task GetP12KeyDetailsWithHttpInfo (
localVarPathParams.Add("keyId", Configuration.ApiClient.ParameterToString(keyId)); // path parameter
}
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarPathParams)}");
- if (Method.GET == Method.POST)
+ if (Method.Get == Method.Post)
{
localVarPostBody = "{}";
}
@@ -729,8 +729,8 @@ public ApiResponse< KmsV2KeysAsymGet200Response > GetP12KeyDetailsWithHttpInfo (
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
- Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+ RestResponse localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -811,7 +811,7 @@ public async System.Threading.Tasks.TaskThe base path
public string GetBasePath()
{
- return Configuration.ApiClient.RestClient.BaseUrl.ToString();
+ return Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
}
///
@@ -282,8 +282,8 @@ public ApiResponse< PtsV2PaymentsCapturesPost201Response > CapturePaymentWithHtt
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
- Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+ RestResponse localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -392,8 +392,8 @@ public async System.Threading.Tasks.TaskThe base path
public string GetBasePath()
{
- return Configuration.ApiClient.RestClient.BaseUrl.ToString();
+ return Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
}
///
@@ -279,7 +279,7 @@ public ApiResponse< ReportingV3ChargebackDetailsGet200Response > GetChargebackDe
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
- if (Method.GET == Method.POST)
+ if (Method.Get == Method.Post)
{
localVarPostBody = "{}";
}
@@ -290,8 +290,8 @@ public ApiResponse< ReportingV3ChargebackDetailsGet200Response > GetChargebackDe
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
- Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+ RestResponse localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -393,7 +393,7 @@ public async System.Threading.Tasks.TaskThe base path
public string GetBasePath()
{
- return Configuration.ApiClient.RestClient.BaseUrl.ToString();
+ return Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
}
///
@@ -279,7 +279,7 @@ public ApiResponse< ReportingV3ChargebackSummariesGet200Response > GetChargeback
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
- if (Method.GET == Method.POST)
+ if (Method.Get == Method.Post)
{
localVarPostBody = "{}";
}
@@ -290,8 +290,8 @@ public ApiResponse< ReportingV3ChargebackSummariesGet200Response > GetChargeback
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
- Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+ RestResponse localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -393,7 +393,7 @@ public async System.Threading.Tasks.TaskThe base path
public string GetBasePath()
{
- return Configuration.ApiClient.RestClient.BaseUrl.ToString();
+ return Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
}
///
@@ -279,7 +279,7 @@ public ApiResponse< ReportingV3ConversionDetailsGet200Response > GetConversionDe
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
logger.Debug($"HTTP Request Body :\n{logUtility.ConvertDictionaryToString(localVarQueryParams)}");
- if (Method.GET == Method.POST)
+ if (Method.Get == Method.Post)
{
localVarPostBody = "{}";
}
@@ -290,8 +290,8 @@ public ApiResponse< ReportingV3ConversionDetailsGet200Response > GetConversionDe
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
- Method.GET, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+ RestResponse localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ Method.Get, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -393,7 +393,7 @@ public async System.Threading.Tasks.TaskThe base path
public string GetBasePath()
{
- return Configuration.ApiClient.RestClient.BaseUrl.ToString();
+ return Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
}
///
@@ -265,8 +265,8 @@ public ApiResponse< PtsV2CreditsPost201Response > CreateCreditWithHttpInfo (Crea
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
- Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+ RestResponse localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ Method.Post, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
int localVarStatusCode = (int) localVarResponse.StatusCode;
@@ -362,8 +362,8 @@ public async System.Threading.Tasks.TaskThe base path
public string GetBasePath()
{
- return Configuration.ApiClient.RestClient.BaseUrl.ToString();
+ return Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
}
///
@@ -404,7 +404,7 @@ public ApiResponse
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ApiClient.mustache b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ApiClient.mustache
index 3b3132d1..8a38dce0 100644
--- a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ApiClient.mustache
+++ b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ApiClient.mustache
@@ -42,14 +42,14 @@ namespace {{packageName}}.Client
/// Allows for extending request processing for generated code.
///
/// The RestSharp request object
- partial void InterceptRequest(IRestRequest request);
+ partial void InterceptRequest(RestRequest request);
///
/// Allows for extending response processing for generated code.
///
/// The RestSharp request object
/// The RestSharp response object
- partial void InterceptResponse(IRestRequest request, IRestResponse response);
+ partial void InterceptResponse(RestRequest request, RestResponse response);
///
/// Initializes a new instance of the class
@@ -304,7 +304,7 @@ namespace {{packageName}}.Client
}
//initiate a HttpWebRequest object
- HttpWebRequest requestT = (HttpWebRequest)WebRequest.Create(Uri.EscapeUriString("https://" + RestClient.BaseUrl.Host + path));
+ HttpWebRequest requestT = (HttpWebRequest)WebRequest.Create(Uri.EscapeUriString("https://" + RestClient.Options.BaseUrl.Host + path));
requestT.UserAgent = Configuration.UserAgent;
if (Configuration.Proxy != null)
@@ -729,7 +729,7 @@ namespace {{packageName}}.Client
/// The HTTP response.
/// Object type.
/// Object representation of the JSON string.
- public object Deserialize(IRestResponse response, Type type)
+ public object Deserialize(RestResponse response, Type type)
{
{{^netStandard}}IList{{/netStandard}}{{#netStandard}}IHttpHeaders{{/netStandard}} headers = response.Headers;
if (type == typeof(byte[])) // return byte array
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ExceptionFactory.mustache b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ExceptionFactory.mustache
index 7b330b77..5ce23ca6 100644
--- a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ExceptionFactory.mustache
+++ b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/ExceptionFactory.mustache
@@ -16,5 +16,5 @@ namespace {{packageName}}.Client
/// Method name
/// Response
/// Exceptions
- {{>visibility}} delegate Exception ExceptionFactory(string methodName, IRestResponse response);
+ {{>visibility}} delegate Exception ExceptionFactory(string methodName, RestResponse response);
}
diff --git a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/api.mustache b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/api.mustache
index e8d3380f..c546588e 100644
--- a/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/api.mustache
+++ b/cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/generator/cybersource-csharp-template/api.mustache
@@ -136,7 +136,7 @@ namespace {{packageName}}.{{apiPackage}}
/// The base path
public string GetBasePath()
{
- return Configuration.ApiClient.RestClient.BaseUrl.ToString();
+ return Configuration.ApiClient.RestClient.Options.BaseUrl.ToString();
}
///
@@ -308,7 +308,7 @@ namespace {{packageName}}.{{apiPackage}}
}
{{/bodyParam}}
{{^bodyParam}}
- if (Method.{{httpMethod}} == Method.POST)
+ if (Method.{{httpMethod}} == Method.Post)
{
localVarPostBody = "{}";
}
@@ -350,7 +350,7 @@ namespace {{packageName}}.{{apiPackage}}
{{/authMethods}}
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse) Configuration.ApiClient.CallApi(localVarPath,
+ RestResponse localVarResponse = (RestResponse) Configuration.ApiClient.CallApi(localVarPath,
Method.{{httpMethod}}, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);
@@ -493,7 +493,7 @@ namespace {{packageName}}.{{apiPackage}}
}
{{/bodyParam}}
{{^bodyParam}}
- if (Method.{{httpMethod}} == Method.POST)
+ if (Method.{{httpMethod}} == Method.Post)
{
localVarPostBody = "{}";
}
@@ -535,7 +535,7 @@ namespace {{packageName}}.{{apiPackage}}
{{/authMethods}}
// make the HTTP request
- IRestResponse localVarResponse = (IRestResponse)await Configuration.ApiClient.CallApiAsync(localVarPath,
+ RestResponse localVarResponse = (RestResponse)await Configuration.ApiClient.CallApiAsync(localVarPath,
Method.{{httpMethod}}, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
localVarPathParams, localVarHttpContentType);