From 0af0ec1e8b6f8f5f44c4767c9439dfccfa599e53 Mon Sep 17 00:00:00 2001 From: Paul Volavsek Date: Fri, 26 May 2023 13:45:03 +0200 Subject: [PATCH 1/5] update dependencies --- .../fiskaltrust.AndroidLauncher.Common.csproj | 4 ++-- .../fiskaltrust.AndroidLauncher.Grpc.csproj | 4 ++-- .../fiskaltrust.AndroidLauncher.Http.csproj | 4 ++-- version.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj index 6ce5b8f7..3e708ce1 100644 --- a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj +++ b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj @@ -116,10 +116,10 @@ 1.3.40 - 1.3.41 + 1.3.46 - 1.3.42 + 1.3.46 1.3.42 diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj index 8cbb022b..217827a3 100644 --- a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj +++ b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj @@ -122,13 +122,13 @@ 1.3.3 - 1.3.41 + 1.3.46 1.3.40 - 1.3.42 + 1.3.46 1.3.25 diff --git a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj index 2ae97785..c65e53bb 100644 --- a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj +++ b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj @@ -127,13 +127,13 @@ 1.3.3 - 1.3.41 + 1.3.46 1.3.40 - 1.3.42 + 1.3.46 1.3.25 diff --git a/version.json b/version.json index 13f073da..a7544e0e 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "1.3.42", + "version": "1.3.46", "releaseBranches": [ "^refs/heads/master$", "^refs/heads/release/\\d+(?:\\.\\d+)*(?:-.*)?$", From 1d426b7131e169d00fb2c8926abab8e265631498 Mon Sep 17 00:00:00 2001 From: Paul Volavsek Date: Wed, 31 May 2023 10:50:23 +0200 Subject: [PATCH 2/5] update dependendies --- .../fiskaltrust.AndroidLauncher.Common.csproj | 2 +- .../fiskaltrust.AndroidLauncher.Grpc.csproj | 2 +- .../fiskaltrust.AndroidLauncher.Http.csproj | 2 +- version.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj index 3e708ce1..cc93c9b2 100644 --- a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj +++ b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj @@ -119,7 +119,7 @@ 1.3.46 - 1.3.46 + 1.3.47 1.3.42 diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj index 217827a3..3e29107d 100644 --- a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj +++ b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj @@ -128,7 +128,7 @@ 1.3.40 - 1.3.46 + 1.3.47 1.3.25 diff --git a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj index c65e53bb..0d97a3e9 100644 --- a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj +++ b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj @@ -133,7 +133,7 @@ 1.3.40 - 1.3.46 + 1.3.47 1.3.25 diff --git a/version.json b/version.json index a7544e0e..305b1530 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "1.3.46", + "version": "1.3.47", "releaseBranches": [ "^refs/heads/master$", "^refs/heads/release/\\d+(?:\\.\\d+)*(?:-.*)?$", From e83b132eeb12a3208a2f965fea63a308ffd6cf48 Mon Sep 17 00:00:00 2001 From: Paul Volavsek Date: Wed, 31 May 2023 14:19:40 +0200 Subject: [PATCH 3/5] fix nuspec file --- .../fiskaltrust.AndroidLauncher.Common.csproj | 2 +- .../fiskaltrust.AndroidLauncher.Grpc.csproj | 2 +- .../fiskaltrust.AndroidLauncher.Http.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj index cc93c9b2..cc763d15 100644 --- a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj +++ b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj @@ -119,7 +119,7 @@ 1.3.46 - 1.3.47 + 1.3.47-ci-23151-63620 1.3.42 diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj index 3e29107d..27da8e26 100644 --- a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj +++ b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj @@ -128,7 +128,7 @@ 1.3.40 - 1.3.47 + 1.3.47-ci-23151-63620 1.3.25 diff --git a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj index 0d97a3e9..6f64b489 100644 --- a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj +++ b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj @@ -133,7 +133,7 @@ 1.3.40 - 1.3.47 + 1.3.47-ci-23151-63620 1.3.25 From 0c84db6c1b4ed87fe6f7bb0d39a9318ee974c68d Mon Sep 17 00:00:00 2001 From: Tom Schmiedlechner Date: Wed, 31 May 2023 17:21:46 +0200 Subject: [PATCH 4/5] Added and updated packages --- .../Resources/Resource.designer.cs | 2 +- .../Resources/Resource.designer.cs | 2 +- .../fiskaltrust.AndroidLauncher.Grpc.csproj | 10 +++++----- .../Resources/Resource.designer.cs | 2 +- .../fiskaltrust.AndroidLauncher.Http.csproj | 13 ++++++++----- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/fiskaltrust.AndroidLauncher.Common/Resources/Resource.designer.cs b/src/fiskaltrust.AndroidLauncher.Common/Resources/Resource.designer.cs index faeff2d9..018d560e 100644 --- a/src/fiskaltrust.AndroidLauncher.Common/Resources/Resource.designer.cs +++ b/src/fiskaltrust.AndroidLauncher.Common/Resources/Resource.designer.cs @@ -14,7 +14,7 @@ namespace fiskaltrust.AndroidLauncher.Common { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.1.0.5")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")] public partial class Resource { diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/Resources/Resource.designer.cs b/src/fiskaltrust.AndroidLauncher.Grpc/Resources/Resource.designer.cs index d5ccd668..36c5846b 100644 --- a/src/fiskaltrust.AndroidLauncher.Grpc/Resources/Resource.designer.cs +++ b/src/fiskaltrust.AndroidLauncher.Grpc/Resources/Resource.designer.cs @@ -14,7 +14,7 @@ namespace fiskaltrust.AndroidLauncher.Grpc { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.1.0.5")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")] public partial class Resource { diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj index 27da8e26..d6a1efb0 100644 --- a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj +++ b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj @@ -110,13 +110,13 @@ - 15.0.6 + 28.0.1 - 1.5.1 + 1.5.2 - 1.3.40 + 1.3.46-rc1 1.3.3 @@ -125,10 +125,10 @@ 1.3.46 - 1.3.40 + 1.3.46-rc1 - 1.3.47-ci-23151-63620 + 1.3.47 1.3.25 diff --git a/src/fiskaltrust.AndroidLauncher.Http/Resources/Resource.designer.cs b/src/fiskaltrust.AndroidLauncher.Http/Resources/Resource.designer.cs index e73fce74..3bdfd8ed 100644 --- a/src/fiskaltrust.AndroidLauncher.Http/Resources/Resource.designer.cs +++ b/src/fiskaltrust.AndroidLauncher.Http/Resources/Resource.designer.cs @@ -14,7 +14,7 @@ namespace fiskaltrust.AndroidLauncher.Http { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.1.0.5")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")] public partial class Resource { diff --git a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj index 6f64b489..7b06a253 100644 --- a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj +++ b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj @@ -115,13 +115,13 @@ - 15.0.6 + 28.0.1 - 1.5.1 + 1.5.2 - 1.3.40 + 1.3.46-rc1 1.3.3 @@ -130,10 +130,10 @@ 1.3.46 - 1.3.40 + 1.3.46-rc1 - 1.3.47-ci-23151-63620 + 1.3.47 1.3.25 @@ -165,6 +165,9 @@ 4.7.0 + + 7.0.0 + 1.1.0.1 From a4a35c11e15b7a2abc6269ec30be17379537b0fc Mon Sep 17 00:00:00 2001 From: Tom Schmiedlechner Date: Wed, 31 May 2023 17:32:18 +0200 Subject: [PATCH 5/5] Fixed build --- .../Hosting/DESSCDClientFactory.cs | 2 +- .../Hosting/Hosts/HttpDeSscdHost.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fiskaltrust.AndroidLauncher.Http/Hosting/DESSCDClientFactory.cs b/src/fiskaltrust.AndroidLauncher.Http/Hosting/DESSCDClientFactory.cs index 26dff598..0bc545bb 100644 --- a/src/fiskaltrust.AndroidLauncher.Http/Hosting/DESSCDClientFactory.cs +++ b/src/fiskaltrust.AndroidLauncher.Http/Hosting/DESSCDClientFactory.cs @@ -26,7 +26,7 @@ public IDESSCD CreateClient(ClientConfiguration configuration) Retries = configuration.RetryCount ?? DEFAULT_RETRIES }; - return HttpDESSCDFactory.CreateSSCDAsync(new ClientOptions { Url = new Uri(configuration.Url.Replace("rest://", "http://")), RetryPolicyOptions = retryPolicyoptions }).Result; + return HttpDESSCDFactory.CreateSSCDAsync(new HttpDESSCDClientOptions { Url = new Uri(configuration.Url.Replace("rest://", "http://")), RetryPolicyOptions = retryPolicyoptions }).Result; } } } \ No newline at end of file diff --git a/src/fiskaltrust.AndroidLauncher.Http/Hosting/Hosts/HttpDeSscdHost.cs b/src/fiskaltrust.AndroidLauncher.Http/Hosting/Hosts/HttpDeSscdHost.cs index 3c5c6876..424ee5a7 100644 --- a/src/fiskaltrust.AndroidLauncher.Http/Hosting/Hosts/HttpDeSscdHost.cs +++ b/src/fiskaltrust.AndroidLauncher.Http/Hosting/Hosts/HttpDeSscdHost.cs @@ -14,7 +14,7 @@ public class HttpDeSscdHost : HttpHost public override async Task GetProxyAsync() { - return await HttpDESSCDFactory.CreateSSCDAsync(new ClientOptions + return await HttpDESSCDFactory.CreateSSCDAsync(new HttpDESSCDClientOptions { Url = new Uri(Url) });