Merge pull request #10 from fiskaltrust/user/tsc/fix-build

Update Queue to 1.3.8 and fix build
fiskaltrust · Oct 5, 2020 · 0aa3900 · 0aa3900
2 parents 38e249f + cd8b7d2
commit 0aa3900
Show file tree

Hide file tree

Showing 53 changed files with 678 additions and 2,446 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,6 +7,7 @@ pool:
 variables:
   buildConfiguration: 'Release'
   outputDirectory: '$(build.binariesDirectory)/$(buildConfiguration)'
+  projectFile: fiskaltrust.AndroidLauncher.csproj
 
 steps:
 - task: NuGetToolInstaller@1
@@ -25,7 +26,7 @@ steps:
 
 - task: XamarinAndroid@1
   inputs:
-    projectFile: '**/*droid*.csproj'
+    projectFile: '**/$(projectFile)'
     outputDirectory: '$(outputDirectory)'
     configuration: '$(buildConfiguration)'
     msbuildVersionOption: 'latest'

diff --git a/fiskaltrust.AndroidLauncher.sln b/fiskaltrust.AndroidLauncher.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30323.103
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E797E02A-F527-4ADE-9FD9-6B9342E1A10E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "fiskaltrust.AndroidLauncher.Common", "src\fiskaltrust.AndroidLauncher.Common\fiskaltrust.AndroidLauncher.Common.csproj", "{270E6179-A397-40C8-89FF-7A39EC415BC7}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{43D6435D-9067-4AE2-976B-FB6E565713F6}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
@@ -28,18 +26,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Debug|x64.Build.0 = Debug|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Debug|x86.Build.0 = Debug|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Release|x64.ActiveCfg = Release|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Release|x64.Build.0 = Release|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Release|x86.ActiveCfg = Release|Any CPU
-		{270E6179-A397-40C8-89FF-7A39EC415BC7}.Release|x86.Build.0 = Release|Any CPU
 		{03CDEBBD-8FF0-4AC6-BA3E-649C8CADFF49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{03CDEBBD-8FF0-4AC6-BA3E-649C8CADFF49}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{03CDEBBD-8FF0-4AC6-BA3E-649C8CADFF49}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -63,7 +49,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{270E6179-A397-40C8-89FF-7A39EC415BC7} = {E797E02A-F527-4ADE-9FD9-6B9342E1A10E}
 		{03CDEBBD-8FF0-4AC6-BA3E-649C8CADFF49} = {E797E02A-F527-4ADE-9FD9-6B9342E1A10E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/src/fiskaltrust.AndroidLauncher.Common/Resources/AboutResources.txt b/src/fiskaltrust.AndroidLauncher.Common/Resources/AboutResources.txt
diff --git a/src/fiskaltrust.AndroidLauncher.Common/Resources/values/strings.xml b/src/fiskaltrust.AndroidLauncher.Common/Resources/values/strings.xml
diff --git a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
diff --git a/src/fiskaltrust.AndroidLauncher.Common/lib/x64/libcom.fiskaly.client-v1.2.000.so b/src/fiskaltrust.AndroidLauncher.Common/lib/x64/libcom.fiskaly.client-v1.2.000.so
diff --git a/...auncher/StartLauncherBroadcastReceiver.cs → ...casting/StartLauncherBroadcastReceiver.cs b/...auncher/StartLauncherBroadcastReceiver.cs → ...casting/StartLauncherBroadcastReceiver.cs
@@ -3,11 +3,11 @@
 using Android.OS;
 using Android.Util;
 using Android.Widget;
-using fiskaltrust.AndroidLauncher.Common;
-using fiskaltrust.AndroidLauncher.Common.Exceptions;
+using fiskaltrust.AndroidLauncher.Enums;
+using fiskaltrust.AndroidLauncher.Exceptions;
 using System.Threading.Tasks;
 
-namespace fiskaltrust.AndroidLauncher
+namespace fiskaltrust.AndroidLauncher.AndroidService.Broadcasting
 {
     [BroadcastReceiver(Enabled = true, Exported = true, Name = "eu.fiskaltrust.androidlauncher.Start")]
     [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault })]

diff --git a/...Launcher/StopLauncherBroadcastReceiver.cs → ...dcasting/StopLauncherBroadcastReceiver.cs b/...Launcher/StopLauncherBroadcastReceiver.cs → ...dcasting/StopLauncherBroadcastReceiver.cs
@@ -1,9 +1,8 @@
 using Android.App;
 using Android.Content;
 using Android.Widget;
-using fiskaltrust.AndroidLauncher.Common;
 
-namespace fiskaltrust.AndroidLauncher
+namespace fiskaltrust.AndroidLauncher.AndroidService.Broadcasting
 {
     [BroadcastReceiver(Enabled = true, Exported = true, Name = "eu.fiskaltrust.androidlauncher.Stop")]
     [IntentFilter(new[] { Intent.ActionSend }, Categories = new[] { Intent.CategoryDefault })]

diff --git a/...er.Common/IMiddlewareServiceConnection.cs → ...idService/IMiddlewareServiceConnection.cs b/...er.Common/IMiddlewareServiceConnection.cs → ...idService/IMiddlewareServiceConnection.cs
@@ -1,6 +1,6 @@
 using Android.Content;
 
-namespace fiskaltrust.AndroidLauncher.Common
+namespace fiskaltrust.AndroidLauncher.AndroidService
 {
     public interface IMiddlewareServiceConnection : IServiceConnection
     {

diff --git a/...ncher.Common/MiddlewareLauncherService.cs → ...droidService/MiddlewareLauncherService.cs b/...ncher.Common/MiddlewareLauncherService.cs → ...droidService/MiddlewareLauncherService.cs
@@ -2,13 +2,14 @@
 using Android.Content;
 using Android.OS;
 using Android.Runtime;
-using fiskaltrust.AndroidLauncher.Common.Extensions;
-using fiskaltrust.AndroidLauncher.Common.Services;
+using fiskaltrust.AndroidLauncher.Enums;
+using fiskaltrust.AndroidLauncher.Extensions;
+using fiskaltrust.AndroidLauncher.Services;
 using fiskaltrust.ifPOS.v1;
 using System;
 using System.Threading.Tasks;
 
-namespace fiskaltrust.AndroidLauncher.Common
+namespace fiskaltrust.AndroidLauncher.AndroidService
 {
     [Service(Name = "eu.fiskaltrust.MiddlewareLauncherService")]
     public class MiddlewareLauncherService : Service, IPOSProvider

diff --git a/...her.Common/MiddlewareServiceConnection.cs → ...oidService/MiddlewareServiceConnection.cs b/...her.Common/MiddlewareServiceConnection.cs → ...oidService/MiddlewareServiceConnection.cs
@@ -1,12 +1,12 @@
 using Android.Content;
 using Android.OS;
 using Android.Util;
-using fiskaltrust.AndroidLauncher.Common.Services;
+using fiskaltrust.AndroidLauncher.Services;
 using fiskaltrust.ifPOS.v1;
 using System;
 using System.Threading.Tasks;
 
-namespace fiskaltrust.AndroidLauncher.Common
+namespace fiskaltrust.AndroidLauncher.AndroidService
 {
     public class MiddlewareServiceConnection : Java.Lang.Object, IMiddlewareServiceConnection, IPOSProvider
     {

diff --git a/...roidLauncher/ServiceConnectionProvider.cs → ...droidService/ServiceConnectionProvider.cs b/...roidLauncher/ServiceConnectionProvider.cs → ...droidService/ServiceConnectionProvider.cs
@@ -1,7 +1,6 @@
-using fiskaltrust.AndroidLauncher.Common;
-using System;
+using System;
 
-namespace fiskaltrust.AndroidLauncher
+namespace fiskaltrust.AndroidLauncher.AndroidService
 {
     internal class ServiceConnectionProvider
     {

diff --git a/...t.AndroidLauncher.Common/LauncherState.cs → ...st.AndroidLauncher/Enums/LauncherState.cs b/...t.AndroidLauncher.Common/LauncherState.cs → ...st.AndroidLauncher/Enums/LauncherState.cs
@@ -1,4 +1,4 @@
-namespace fiskaltrust.AndroidLauncher.Common
+namespace fiskaltrust.AndroidLauncher.Enums
 {
     public enum LauncherState
     {

diff --git a/...eptions/ConfigurationNotFoundException.cs → ...eptions/ConfigurationNotFoundException.cs b/...eptions/ConfigurationNotFoundException.cs → ...eptions/ConfigurationNotFoundException.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace fiskaltrust.AndroidLauncher.Common.Exceptions
+namespace fiskaltrust.AndroidLauncher.Exceptions
 {
     [Serializable]
     public class ConfigurationNotFoundException : Exception

diff --git a/...on/Exceptions/RemountRequiredException.cs → ...er/Exceptions/RemountRequiredException.cs b/...on/Exceptions/RemountRequiredException.cs → ...er/Exceptions/RemountRequiredException.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace fiskaltrust.AndroidLauncher.Common.Exceptions
+namespace fiskaltrust.AndroidLauncher.Exceptions
 {
     [Serializable]
     public class RemountRequiredException : Exception

diff --git a/...er.Common/Extensions/ContextExtensions.cs → ...dLauncher/Extensions/ContextExtensions.cs b/...er.Common/Extensions/ContextExtensions.cs → ...dLauncher/Extensions/ContextExtensions.cs
@@ -2,7 +2,7 @@
 using Android.Content;
 using Android.OS;
 
-namespace fiskaltrust.AndroidLauncher.Common.Extensions
+namespace fiskaltrust.AndroidLauncher.Extensions
 {
     public static class ContextExtensions
     {

diff --git a/...Extensions/ServiceCollectionExtensions.cs → ...Extensions/ServiceCollectionExtensions.cs b/...Extensions/ServiceCollectionExtensions.cs → ...Extensions/ServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using fiskaltrust.AndroidLauncher.Common.Helpers.Logging;
+using fiskaltrust.AndroidLauncher.Helpers.Logging;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace fiskaltrust.AndroidLauncher.Common.Extensions
+namespace fiskaltrust.AndroidLauncher.Extensions
 {
     public static class ServiceCollectionExtensions
     {

diff --git a/...on/Helpers/Hosting/DESSCDClientFactory.cs → ...er/Helpers/Hosting/DESSCDClientFactory.cs b/...on/Helpers/Hosting/DESSCDClientFactory.cs → ...er/Helpers/Hosting/DESSCDClientFactory.cs
@@ -4,7 +4,7 @@
 using fiskaltrust.Middleware.Interface.Client.Grpc;
 using System;
 
-namespace fiskaltrust.AndroidLauncher.Common.Helpers.Hosting
+namespace fiskaltrust.AndroidLauncher.Helpers.Hosting
 {
     internal class DESSCDClientFactory : IClientFactory<IDESSCD>
     {

diff --git a/...cher.Common/Helpers/Hosting/GrpcHelper.cs → ...oidLauncher/Helpers/Hosting/GrpcHelper.cs b/...cher.Common/Helpers/Hosting/GrpcHelper.cs → ...oidLauncher/Helpers/Hosting/GrpcHelper.cs
@@ -4,7 +4,7 @@
 using ProtoBuf.Grpc.Configuration;
 using System.Reflection;
 
-namespace fiskaltrust.AndroidLauncher.Common.Helpers.Hosting
+namespace fiskaltrust.AndroidLauncher.Helpers.Hosting
 {
     public static class GrpcHelper
     {

diff --git a/...uncher.Common/Helpers/Hosting/GrpcHost.cs → ...droidLauncher/Helpers/Hosting/GrpcHost.cs b/...uncher.Common/Helpers/Hosting/GrpcHost.cs → ...droidLauncher/Helpers/Hosting/GrpcHost.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace fiskaltrust.AndroidLauncher.Common.Helpers.Hosting
+namespace fiskaltrust.AndroidLauncher.Helpers.Hosting
 {
     public class GrpcHost : IDisposable
     {

diff --git a/...ommon/Helpers/Hosting/POSClientFactory.cs → ...ncher/Helpers/Hosting/POSClientFactory.cs b/...ommon/Helpers/Hosting/POSClientFactory.cs → ...ncher/Helpers/Hosting/POSClientFactory.cs
@@ -4,7 +4,7 @@
 using fiskaltrust.Middleware.Interface.Client.Grpc;
 using System;
 
-namespace fiskaltrust.AndroidLauncher.Common.Helpers.Hosting
+namespace fiskaltrust.AndroidLauncher.Helpers.Hosting
 {
     internal class POSClientFactory : IClientFactory<IPOS>
     {

diff --git a/...r.Common/Helpers/Logging/AndroidLogger.cs → ...Launcher/Helpers/Logging/AndroidLogger.cs b/...r.Common/Helpers/Logging/AndroidLogger.cs → ...Launcher/Helpers/Logging/AndroidLogger.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 
-namespace fiskaltrust.AndroidLauncher.Common.Helpers.Logging
+namespace fiskaltrust.AndroidLauncher.Helpers.Logging
 {
     public class AndroidLogger : ILogger
     {

diff --git a/.../Helpers/Logging/AndroidLoggerProvider.cs → .../Helpers/Logging/AndroidLoggerProvider.cs b/.../Helpers/Logging/AndroidLoggerProvider.cs → .../Helpers/Logging/AndroidLoggerProvider.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace fiskaltrust.AndroidLauncher.Common.Helpers.Logging
+namespace fiskaltrust.AndroidLauncher.Helpers.Logging
 {
     public class AndroidLoggerProvider : ILoggerProvider
     {

diff --git a/...er.Common/Migrations/000_ftSchema.sqlite3 → ...dLauncher/Migrations/000_ftSchema.sqlite3 b/...er.Common/Migrations/000_ftSchema.sqlite3 → ...dLauncher/Migrations/000_ftSchema.sqlite3
diff --git a/...uncher.Common/Migrations/001_Init.sqlite3 → ...droidLauncher/Migrations/001_Init.sqlite3 b/...uncher.Common/Migrations/001_Init.sqlite3 → ...droidLauncher/Migrations/001_Init.sqlite3
diff --git a/...ations/002_TransactionPersistence.sqlite3 → ...ations/002_TransactionPersistence.sqlite3 b/...ations/002_TransactionPersistence.sqlite3 → ...ations/002_TransactionPersistence.sqlite3
diff --git a/...TseInfoJsonSignaturCreationUnitDE.sqlite3 → ...TseInfoJsonSignaturCreationUnitDE.sqlite3 b/...TseInfoJsonSignaturCreationUnitDE.sqlite3 → ...TseInfoJsonSignaturCreationUnitDE.sqlite3
diff --git a/...04_FailedFinishTransactionRequest.sqlite3 → ...04_FailedFinishTransactionRequest.sqlite3 b/...04_FailedFinishTransactionRequest.sqlite3 → ...04_FailedFinishTransactionRequest.sqlite3
diff --git a/....Common/Migrations/005_MasterData.sqlite3 → ...auncher/Migrations/005_MasterData.sqlite3 b/....Common/Migrations/005_MasterData.sqlite3 → ...auncher/Migrations/005_MasterData.sqlite3
diff --git a/src/fiskaltrust.AndroidLauncher/Migrations/006_DailyClosingNumber.sqlite3 b/src/fiskaltrust.AndroidLauncher/Migrations/006_DailyClosingNumber.sqlite3
@@ -0,0 +1,9 @@
+ALTER TABLE ftQueueDE ADD COLUMN DailyClosingNumber INT NOT NULL DEFAULT 0;
+
+UPDATE ftQueueDE SET DailyClosingNumber =
+(
+    SELECT COUNT(*) from ftActionJournal
+    WHERE ftActionJournal.ftQueueId = ftQueueDE.ftQueueDEId 
+    AND (ftActionJournal.Type = '4445000008000007' OR ftActionJournal.Type = '4445000000000007')
+)
+WHERE DailyClosingNumber = 0;