From 54ff87af8f36a5743cfd134f5322f886b4ee0c65 Mon Sep 17 00:00:00 2001 From: Shaun Date: Thu, 16 Mar 2023 15:04:37 +1100 Subject: [PATCH 01/14] Add function to lookup next paydate. Requires the creatuon of the PayScheduleDateForcastResult --- .../ApiFunctions/V2/PayScheduleFunction.cs | 5 +++++ .../PayScheduleDateForecastResultApiModel.cs | 12 ++++++++++++ src/keypay-dotnet/keypay-dotnet.csproj | 1 + 3 files changed, 18 insertions(+) create mode 100644 src/keypay-dotnet/DomainModels/V2/Business/PayScheduleDateForecastResultApiModel.cs diff --git a/src/keypay-dotnet/ApiFunctions/V2/PayScheduleFunction.cs b/src/keypay-dotnet/ApiFunctions/V2/PayScheduleFunction.cs index 3f91d19..6e62916 100644 --- a/src/keypay-dotnet/ApiFunctions/V2/PayScheduleFunction.cs +++ b/src/keypay-dotnet/ApiFunctions/V2/PayScheduleFunction.cs @@ -39,5 +39,10 @@ public void Delete(int businessId, int payCategoryId) { ApiRequest($"/business/{businessId}/payschedule/{payCategoryId}", Method.Delete); } + + public PayScheduleDateForecastResultApiModel GetNextPayDate(int businessId, int payScheduleId) + { + return ApiRequest($"/business/{businessId}/payschedule/{payScheduleId}/nextpaydate"); + } } } \ No newline at end of file diff --git a/src/keypay-dotnet/DomainModels/V2/Business/PayScheduleDateForecastResultApiModel.cs b/src/keypay-dotnet/DomainModels/V2/Business/PayScheduleDateForecastResultApiModel.cs new file mode 100644 index 0000000..cb8bff6 --- /dev/null +++ b/src/keypay-dotnet/DomainModels/V2/Business/PayScheduleDateForecastResultApiModel.cs @@ -0,0 +1,12 @@ +using System; + +namespace KeyPay.DomainModels.V2.Business +{ + public class PayScheduleDateForecastResultApiModel + { + public int PayScheduleId { get; set; } + public DateTime? NextScheduledPaidDate { get; set; } + public DateTime? NextScheduledFromDate { get; set; } + public DateTime? NextScheduledToDate { get; set; } + } +} \ No newline at end of file diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index 395a751..58dcf09 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -158,6 +158,7 @@ + From 386d16b68bdaedf9abe1ac287e3db89d9fe55455 Mon Sep 17 00:00:00 2001 From: Shaun Date: Mon, 10 Jul 2023 11:43:31 +1000 Subject: [PATCH 02/14] update runtime framework --- src/keypay-dotnet/ApiRequestExecutor.cs | 14 ++++----- src/keypay-dotnet/app.config | 20 ++++++++++-- src/keypay-dotnet/keypay-dotnet.csproj | 42 ++++++++++++------------- src/keypay-dotnet/packages.config | 18 +++++------ 4 files changed, 55 insertions(+), 39 deletions(-) diff --git a/src/keypay-dotnet/ApiRequestExecutor.cs b/src/keypay-dotnet/ApiRequestExecutor.cs index dbd72e1..0620bfc 100644 --- a/src/keypay-dotnet/ApiRequestExecutor.cs +++ b/src/keypay-dotnet/ApiRequestExecutor.cs @@ -6,6 +6,7 @@ using Newtonsoft.Json; using RestSharp; using RestSharp.Authenticators; +using RestSharp.Serializers; using RestSharp.Serializers.NewtonsoftJson; namespace KeyPay @@ -55,15 +56,14 @@ private RestClient GetClient(RestRequest request) var options = new RestClientOptions { BaseUrl = new Uri(baseUrl), - MaxTimeout = 600000 // 10 min timeout for long EI queries + Authenticator = Authenticator, + MaxTimeout = 600000, + // 10 min timeout for long EI queries }; + + var client = new RestClient(options, configureSerialization: s => s.UseNewtonsoftJson() ) ; - var client = new RestClient(options) - { - Authenticator = Authenticator - }; - - client.UseNewtonsoftJson(); + request.OnBeforeDeserialization = resp => HandleResponse(resp, request.Method, request.Resource); return client; diff --git a/src/keypay-dotnet/app.config b/src/keypay-dotnet/app.config index f10b4ac..84d2865 100644 --- a/src/keypay-dotnet/app.config +++ b/src/keypay-dotnet/app.config @@ -4,8 +4,24 @@ - + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index 58dcf09..b0ce223 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -9,9 +9,11 @@ Properties KeyPay KeyPay - v4.6.1 + v4.7.2 512 + + true @@ -33,46 +35,44 @@ true - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - True + + ..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\RestSharp.108.0.1\lib\netstandard2.0\RestSharp.dll + + ..\..\packages\RestSharp.110.2.0\lib\net471\RestSharp.dll - - ..\..\packages\RestSharp.Serializers.NewtonsoftJson.108.0.1\lib\netstandard2.0\RestSharp.Serializers.NewtonsoftJson.dll + + ..\..\packages\RestSharp.Serializers.NewtonsoftJson.110.2.0\lib\net471\RestSharp.Serializers.NewtonsoftJson.dll ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll + + ..\..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll + + ..\..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - True + + ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll diff --git a/src/keypay-dotnet/packages.config b/src/keypay-dotnet/packages.config index 486fe5e..0f15210 100644 --- a/src/keypay-dotnet/packages.config +++ b/src/keypay-dotnet/packages.config @@ -1,15 +1,15 @@  - - - - + + + + - + - - - + + + - + \ No newline at end of file From 5e83dacd9be3b4c5edfb9d2bd713825e606bfdef Mon Sep 17 00:00:00 2001 From: Shaun Date: Mon, 10 Jul 2023 13:28:10 +1000 Subject: [PATCH 03/14] chanes --- src/keypay-dotnet/Properties/AssemblyInfo.cs | 2 +- src/keypay-dotnet/keypay-dotnet.nuspec | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/keypay-dotnet/Properties/AssemblyInfo.cs b/src/keypay-dotnet/Properties/AssemblyInfo.cs index 615825f..7f5069b 100644 --- a/src/keypay-dotnet/Properties/AssemblyInfo.cs +++ b/src/keypay-dotnet/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyInformationalVersion("1.1.0.18")] +[assembly: AssemblyInformationalVersion("1.1.0.18-SNKG")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/keypay-dotnet/keypay-dotnet.nuspec b/src/keypay-dotnet/keypay-dotnet.nuspec index cfccfbc..e33f233 100644 --- a/src/keypay-dotnet/keypay-dotnet.nuspec +++ b/src/keypay-dotnet/keypay-dotnet.nuspec @@ -15,10 +15,10 @@ Copyright 2022 keypay yourpayroll api payroll - - - - + + + + From 20b81e383b0988de6d00f55c879cfb647c2edb91 Mon Sep 17 00:00:00 2001 From: Shaun Date: Mon, 10 Jul 2023 13:45:02 +1000 Subject: [PATCH 04/14] package update --- src/keypay-dotnet/packages.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/keypay-dotnet/packages.config b/src/keypay-dotnet/packages.config index 0f15210..9c587ab 100644 --- a/src/keypay-dotnet/packages.config +++ b/src/keypay-dotnet/packages.config @@ -4,12 +4,12 @@ - + - + - + \ No newline at end of file From 1f774664efdaab1c6b2b5837e3e3c46e93f45bf7 Mon Sep 17 00:00:00 2001 From: Shaun Date: Mon, 10 Jul 2023 15:30:55 +1000 Subject: [PATCH 05/14] get through nuget --- src/keypay-dotnet/keypay-dotnet.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index b0ce223..ca0786c 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -33,6 +33,7 @@ prompt 4 true + NU5128 @@ -48,9 +49,7 @@ ..\..\packages\RestSharp.Serializers.NewtonsoftJson.110.2.0\lib\net471\RestSharp.Serializers.NewtonsoftJson.dll - - ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll From eeb2b5f84c767eb0adc98bd2d4e31befa8c6a696 Mon Sep 17 00:00:00 2001 From: Shaun Date: Mon, 10 Jul 2023 16:37:46 +1000 Subject: [PATCH 06/14] see how we go --- src/keypay-dotnet/Properties/AssemblyInfo.cs | 2 +- src/keypay-dotnet/keypay-dotnet.csproj | 1 - src/keypay-dotnet/keypay-dotnet.nuspec | 9 ++++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/keypay-dotnet/Properties/AssemblyInfo.cs b/src/keypay-dotnet/Properties/AssemblyInfo.cs index 7f5069b..176f3f0 100644 --- a/src/keypay-dotnet/Properties/AssemblyInfo.cs +++ b/src/keypay-dotnet/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("KeyPay")] +[assembly: AssemblyTitle("KeyPay-SKNG")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("KeyPay")] diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index ca0786c..be5b398 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -33,7 +33,6 @@ prompt 4 true - NU5128 diff --git a/src/keypay-dotnet/keypay-dotnet.nuspec b/src/keypay-dotnet/keypay-dotnet.nuspec index e33f233..9b6445e 100644 --- a/src/keypay-dotnet/keypay-dotnet.nuspec +++ b/src/keypay-dotnet/keypay-dotnet.nuspec @@ -16,9 +16,12 @@ keypay yourpayroll api payroll - - - + + + + + + From cfc7ad896c126e1ab954544a9fb20429b7261e22 Mon Sep 17 00:00:00 2001 From: Shaun Date: Mon, 10 Jul 2023 16:55:01 +1000 Subject: [PATCH 07/14] readd suppression --- src/keypay-dotnet/keypay-dotnet.csproj | 1 + .../SampleApplication.csproj | 31 ++++++++++--------- test/SampleApplication/Startup.cs | 6 ++++ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index be5b398..ca0786c 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -33,6 +33,7 @@ prompt 4 true + NU5128 diff --git a/test/SampleApplication/SampleApplication.csproj b/test/SampleApplication/SampleApplication.csproj index 3b1374e..0028815 100644 --- a/test/SampleApplication/SampleApplication.csproj +++ b/test/SampleApplication/SampleApplication.csproj @@ -1,23 +1,26 @@  - net461 + net700 win7-x86 - - - - - - - - - - - - - + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + diff --git a/test/SampleApplication/Startup.cs b/test/SampleApplication/Startup.cs index 3b17e8f..e3ebab1 100644 --- a/test/SampleApplication/Startup.cs +++ b/test/SampleApplication/Startup.cs @@ -36,6 +36,12 @@ public void ConfigureServices(IServiceCollection services) services.AddMvc(); // Adds a default in-memory implementation of IDistributedCache. services.AddDistributedMemoryCache(); + services.AddCookiePolicy(); + new CookiePolicyOptions + { + HttpOnly = Microsoft.AspNetCore.CookiePolicy.HttpOnlyPolicy.Always + }); ; + services.AddSession(options => { From 15a88c793de7c056b8ebb1b16f0310ebfb650412 Mon Sep 17 00:00:00 2001 From: Shaun Date: Tue, 11 Jul 2023 10:13:44 +1000 Subject: [PATCH 08/14] upgrade from .NET framework to net6 --- keypay-dotnet.sln | 4 +- src/keypay-dotnet/Properties/AssemblyInfo.cs | 21 -- src/keypay-dotnet/keypay-dotnet.csproj | 361 +------------------ src/keypay-dotnet/keypay-dotnet.nuspec | 2 +- src/keypay-dotnet/packages.config | 15 - 5 files changed, 19 insertions(+), 384 deletions(-) delete mode 100644 src/keypay-dotnet/packages.config diff --git a/keypay-dotnet.sln b/keypay-dotnet.sln index 4631dd7..465af5f 100644 --- a/keypay-dotnet.sln +++ b/keypay-dotnet.sln @@ -1,9 +1,9 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keypay-dotnet", "src\keypay-dotnet\keypay-dotnet.csproj", "{93365E33-3B92-4EA6-AB42-FFECBC504138}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "keypay-dotnet", "src\keypay-dotnet\keypay-dotnet.csproj", "{93365E33-3B92-4EA6-AB42-FFECBC504138}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApplication", "test\SampleApplication\SampleApplication.csproj", "{08F68476-5DE7-4C24-AEB5-3FFF29DF1C87}" EndProject diff --git a/src/keypay-dotnet/Properties/AssemblyInfo.cs b/src/keypay-dotnet/Properties/AssemblyInfo.cs index 176f3f0..3292c18 100644 --- a/src/keypay-dotnet/Properties/AssemblyInfo.cs +++ b/src/keypay-dotnet/Properties/AssemblyInfo.cs @@ -1,13 +1,5 @@ using System.Reflection; using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("KeyPay-SKNG")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("KeyPay")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -18,16 +10,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("93365e33-3b92-4ea6-ab42-ffecbc504138")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyInformationalVersion("1.1.0.18-SNKG")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index ca0786c..cc0d8eb 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -1,362 +1,33 @@ - - - + - Debug - AnyCPU - {93365E33-3B92-4EA6-AB42-FFECBC504138} Library - Properties KeyPay KeyPay - v4.7.2 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 true - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - NU5128 + true + + + net6.0 + false + KeyPay-SKNG + KeyPay + 1.1.0.18-SKNG + 1.0.0.0 - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\RestSharp.110.2.0\lib\net471\RestSharp.dll - - - ..\..\packages\RestSharp.Serializers.NewtonsoftJson.110.2.0\lib\net471\RestSharp.Serializers.NewtonsoftJson.dll - - - - - ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - - - ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - - ..\..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll - - - ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - \ No newline at end of file diff --git a/src/keypay-dotnet/keypay-dotnet.nuspec b/src/keypay-dotnet/keypay-dotnet.nuspec index 9b6445e..4d3d52e 100644 --- a/src/keypay-dotnet/keypay-dotnet.nuspec +++ b/src/keypay-dotnet/keypay-dotnet.nuspec @@ -15,7 +15,7 @@ Copyright 2022 keypay yourpayroll api payroll - + diff --git a/src/keypay-dotnet/packages.config b/src/keypay-dotnet/packages.config deleted file mode 100644 index 9c587ab..0000000 --- a/src/keypay-dotnet/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file From 1de13049cf78dc873cb0e5beec489718d1d3e4c8 Mon Sep 17 00:00:00 2001 From: Shaun Date: Tue, 11 Jul 2023 10:47:52 +1000 Subject: [PATCH 09/14] uplift nuspec --- src/keypay-dotnet/keypay-dotnet.nuspec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/keypay-dotnet/keypay-dotnet.nuspec b/src/keypay-dotnet/keypay-dotnet.nuspec index 4d3d52e..e750a65 100644 --- a/src/keypay-dotnet/keypay-dotnet.nuspec +++ b/src/keypay-dotnet/keypay-dotnet.nuspec @@ -14,15 +14,13 @@ Update RestSharp dependencies Copyright 2022 keypay yourpayroll api payroll - - - - - - - - - + + + + + + + From 0e74c28a3b65c283ba097461aecabadb8e6a03e6 Mon Sep 17 00:00:00 2001 From: Shaun Date: Tue, 11 Jul 2023 16:26:44 +1000 Subject: [PATCH 10/14] fix dep grouping --- src/keypay-dotnet/keypay-dotnet.nuspec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/keypay-dotnet/keypay-dotnet.nuspec b/src/keypay-dotnet/keypay-dotnet.nuspec index e750a65..0a97bcf 100644 --- a/src/keypay-dotnet/keypay-dotnet.nuspec +++ b/src/keypay-dotnet/keypay-dotnet.nuspec @@ -14,14 +14,16 @@ Update RestSharp dependencies Copyright 2022 keypay yourpayroll api payroll - - - - - - - - + + + + + + + + + + From ff708136c843a986f09f583e09d623bb8d0e9ed1 Mon Sep 17 00:00:00 2001 From: Shaun Date: Tue, 11 Jul 2023 19:08:52 +1000 Subject: [PATCH 11/14] remove system.jsoin dep --- src/keypay-dotnet/keypay-dotnet.nuspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/keypay-dotnet/keypay-dotnet.nuspec b/src/keypay-dotnet/keypay-dotnet.nuspec index 0a97bcf..b49107d 100644 --- a/src/keypay-dotnet/keypay-dotnet.nuspec +++ b/src/keypay-dotnet/keypay-dotnet.nuspec @@ -20,8 +20,7 @@ - - + From a8afc60eb017ce07a4c60eecaeec5f83fb87e7d1 Mon Sep 17 00:00:00 2001 From: Shaun Date: Wed, 12 Jul 2023 11:39:37 +1000 Subject: [PATCH 12/14] update deps --- src/keypay-dotnet/keypay-dotnet.csproj | 1 + src/keypay-dotnet/keypay-dotnet.nuspec | 1 + 2 files changed, 2 insertions(+) diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index cc0d8eb..26a7f39 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -29,5 +29,6 @@ + \ No newline at end of file diff --git a/src/keypay-dotnet/keypay-dotnet.nuspec b/src/keypay-dotnet/keypay-dotnet.nuspec index b49107d..ec147c6 100644 --- a/src/keypay-dotnet/keypay-dotnet.nuspec +++ b/src/keypay-dotnet/keypay-dotnet.nuspec @@ -20,6 +20,7 @@ + From b09322f7d1967aa4548ca8d36b5ec4b7bc76c81d Mon Sep 17 00:00:00 2001 From: Shaun Date: Wed, 12 Jul 2023 13:00:01 +1000 Subject: [PATCH 13/14] reimport --- src/keypay-dotnet/keypay-dotnet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index 26a7f39..c4dd0cb 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -24,10 +24,10 @@ + - From e0e5f1e78844a28e876c071e385fe676714f52f8 Mon Sep 17 00:00:00 2001 From: Shaun Date: Wed, 12 Jul 2023 18:54:21 +1000 Subject: [PATCH 14/14] roll back system.text.json --- src/keypay-dotnet/keypay-dotnet.csproj | 2 +- src/keypay-dotnet/keypay-dotnet.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/keypay-dotnet/keypay-dotnet.csproj b/src/keypay-dotnet/keypay-dotnet.csproj index c4dd0cb..53b9353 100644 --- a/src/keypay-dotnet/keypay-dotnet.csproj +++ b/src/keypay-dotnet/keypay-dotnet.csproj @@ -29,6 +29,6 @@ - + \ No newline at end of file diff --git a/src/keypay-dotnet/keypay-dotnet.nuspec b/src/keypay-dotnet/keypay-dotnet.nuspec index ec147c6..c601fa7 100644 --- a/src/keypay-dotnet/keypay-dotnet.nuspec +++ b/src/keypay-dotnet/keypay-dotnet.nuspec @@ -20,7 +20,7 @@ - +