refactor(SendMailHandler): remove TextToHtml

- create base EGDbContextBase to be able to add custom DbContextOptions

EnvelopeGenerator.Application/Common/Extensions/JsonExtensions.cs

@@ -0,0 +1,18 @@
+using System.Text.Json;
+
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class JsonExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public static string ToJson(this object obj, JsonSerializerOptions? options = null)
+        => JsonSerializer.Serialize(obj, options);
+}

EnvelopeGenerator.Application/Common/Extensions/StringExtension.cs

@@ -1,14 +1,30 @@
 using OtpNet;
 
-namespace EnvelopeGenerator.Application.Common.Extensions
+namespace EnvelopeGenerator.Application.Common.Extensions;
+
+/// <summary>
+/// 
+/// </summary>
+public static class StringExtension
 {
-    public static class StringExtension
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="totp"></param>
+    /// <param name="secret"></param>
+    /// <returns></returns>
+    public static bool IsValidTotp(this string totp, string secret)
     {
-        public static bool IsValidTotp(this string totp, string secret)
+        var secret_bytes = Base32Encoding.ToBytes(secret);
-        {
+        var secret_totp = new Totp(secret_bytes);
-            var secret_bytes = Base32Encoding.ToBytes(secret);
+        return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
-            var secret_totp = new Totp(secret_bytes);
-            return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
-        }
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="seperator"></param>
+    /// <param name="values"></param>
+    /// <returns></returns>
+    public static string Join(this IEnumerable<string> values, string seperator) => string.Join(seperator, values);
 }

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IConfigRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentReceiverElementRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 /// <summary>
 /// 
 /// </summary>

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentStatusRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEmailTemplateRepository.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeDocumentRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeHistoryRepository.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverReadOnlyRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverRepository.cs

@@ -3,7 +3,7 @@ using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeRepository.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Repositories/IReceiverRepository.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IDocumentExecutor.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeExecutor.cs

@@ -1,7 +1,7 @@
 using Dapper;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeReceiverExecutor.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IQuery.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Provides methods for executing common queries on a given entity type.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQL.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Represents a raw SQL query contract.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutor.cs

@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// Defines methods for executing raw SQL queries or custom SQL query classes and returning query executors for further operations.

EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutorBaseEntity.cs

@@ -1,6 +1,6 @@
 using Dapper;
 
-namespace EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IAuthenticator.cs

@@ -1,6 +1,6 @@
 using OtpNet;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IConfigService.cs

@@ -3,7 +3,7 @@ using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentStatusService.cs

@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application;
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEmailTemplateService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeDocumentService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeHistoryService.cs

@@ -5,7 +5,7 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeMailService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Constants;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverService.cs

@@ -10,7 +10,7 @@ using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeSmsHandler.cs

@@ -1,7 +1,7 @@
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs

@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/IReceiverService.cs

@@ -4,7 +4,7 @@ using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Domain.Entities;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 /// <summary>
 /// 

EnvelopeGenerator.Application/Common/Interfaces/Services/ISmsSender.cs

@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 
-namespace EnvelopeGenerator.Application.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 //TODO: move to DigitalData.Core
 /// <summary>

EnvelopeGenerator.Application/Common/Notifications/DocSigned/DocSignedNotification.cs

@@ -1,4 +1,5 @@
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 using Newtonsoft.Json;
@@ -27,7 +28,7 @@ public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeRece
     /// </summary>
     public string EmailAddress => Receiver?.EmailAddress
         ?? throw new InvalidOperationException($"Receiver is null." +
-            $"DocSignedNotification:\n{JsonConvert.SerializeObject(this, Format.Json.ForDiagnostics)}");
+            $"DocSignedNotification:\n{this.ToJson(Format.Json.ForDiagnostics)}");
 }
 
 /// <summary>

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs

@@ -1,8 +1,7 @@
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.DocStatus.Commands;
-using EnvelopeGenerator.Application.DocStatus.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 
@@ -34,7 +33,7 @@ public class AnnotationHandler : INotificationHandler<DocSignedNotification>
         {
             Envelope = new() { Id = notification.EnvelopeId },
             Receiver = new() { Id = notification.ReceiverId},
-            Value = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
+            Value = JsonSerializer.Serialize(notification.Annotations, Format.Json.ForAnnotations)
         }, cancel);
     }
 }

EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/HistoryHandler.cs

@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
@@ -30,16 +30,14 @@ public class HistoryHandler : INotificationHandler<DocSignedNotification>
     /// <returns></returns>
     public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
     {
-        if(notification.Receiver is null)
+        if (notification.Receiver is null)
-            if (notification.Receiver is null)
+            throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
-                throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
 
         await _sender.Send(new CreateHistoryCommand()
         {
             EnvelopeId = notification.EnvelopeId,
             UserReference = notification.Receiver.EmailAddress,
             Status = EnvelopeStatus.DocumentSigned,
-            Comment = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
         }, cancel);
     }
 }

EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs

@@ -1,6 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
+using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
@@ -98,10 +99,10 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
         var placeHolders = CreatePlaceHolders(notification);
 
         var temp = await TempRepo
-            .ReadOnly()
+            .Where(x => x.Name == notification.TemplateType.ToString())
-            .SingleOrDefaultAsync(x => x.Name == notification.TemplateType.ToString(), cancel)
+            .SingleOrDefaultAsync(cancel)
                 ?? throw new InvalidOperationException($"Receiver information is missing in the notification." +
-                $"{typeof(TNotification)}:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
+                $"{typeof(TNotification)}:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
 
         temp.Subject = ReplacePlaceHolders(temp.Subject, placeHolders, MailParams.Placeholders);
 
@@ -110,7 +111,7 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
         var emailOut = new EmailOut
         {
             EmailAddress = notification.EmailAddress,
-            EmailBody = TextToHtml(temp.Body),
+            EmailBody = temp.Body,
             EmailSubj = temp.Subject,
             AddedWhen = DateTime.UtcNow,
             AddedWho = DispatcherParams.AddedWho,
@@ -131,22 +132,4 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
                 text = text.Replace(ph.Key, ph.Value);
         return text;
     }
-
-    private static string TextToHtml(string input)
-    {
-        if (string.IsNullOrEmpty(input)) return "";
-
-        // HTML encoding special characters
-        string encoded = System.Net.WebUtility.HtmlEncode(input);
-
-        // Convert tabs to &nbsp; (4 non-breaking spaces)
-        encoded = encoded.Replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
-
-        // Convert line breaks to <br />
-        encoded = encoded.Replace("\r\n", "<br />"); // Windows
-        encoded = encoded.Replace("\r", "<br />");   // Mac old
-        encoded = encoded.Replace("\n", "<br />");   // Unix/Linux
-
-        return encoded;
-    }
 }

EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs

@@ -20,4 +20,14 @@ public record ReceiverQueryBase
     /// Eindeutige Signatur des Empfängers
     /// </summary>
     public virtual string? Signature { get; set; }
+
+    /// <summary>
+    /// Checks whether any of the specified query criteria have a value.
+    /// </summary>
+    /// <remarks>
+    /// This property returns <c>true</c> if at least one of the fields 
+    /// <see cref="Id"/>, <see cref="EmailAddress"/>, or <see cref="Signature"/> is not null.
+    /// <para>Usage example: The query can be executed only if at least one criterion is specified.</para>
+    /// </remarks>
+    public bool HasAnyCriteria => Id is not null || EmailAddress is not null || Signature is not null;
 }

EnvelopeGenerator.Application/Common/SQL/DocumentCreateReadSQL.cs

@@ -1,7 +1,7 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.Common.SQL;
 

EnvelopeGenerator.Application/Common/SQL/EnvelopeCreateReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using System.Data;
 

EnvelopeGenerator.Application/Common/SQL/EnvelopeReceiverAddReadSQL.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Common.SQL;

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Client;
 using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Interfaces.Services;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

EnvelopeGenerator.Application/EmailTemplates/Queries/Read/ReadEmailTemplateQueryHandler.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
 using EnvelopeGenerator.Domain.Constants;
 using MediatR;
 

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -14,7 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.1.66" />
-		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.2.1" />
+		<PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.3.1" />
 		<PackageReference Include="DigitalData.Core.Application" Version="3.4.0" />
 		<PackageReference Include="DigitalData.Core.Client" Version="2.1.0" />
 		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />

EnvelopeGenerator.Application/EnvelopeReceivers/Commands/CreateEnvelopeReceiverCommandHandler.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.EnvelopeReceivers.Commands;
 

EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs

@@ -91,6 +91,8 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
 {
     private readonly IRepository<EnvelopeReceiver> _repo;
 
+    private readonly IRepository<Receiver> _rcvRepo;
+
     private readonly IMapper _mapper;
 
     /// <summary>
@@ -98,10 +100,11 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
     /// </summary>
     /// <param name="envelopeReceiver"></param>
     /// <param name="mapper"></param>
-    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IMapper mapper)
+    public ReadEnvelopeReceiverQueryHandler(IRepository<EnvelopeReceiver> envelopeReceiver, IRepository<Receiver> rcvRepo, IMapper mapper)
     {
         _repo = envelopeReceiver;
         _mapper = mapper;
+        _rcvRepo = rcvRepo;
     }
 
     /// <summary>
@@ -138,6 +141,14 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
                         .Include(er => er.Receiver)
                         .ToListAsync(cancel);
 
+        if (request.Receiver.HasAnyCriteria && envRcvs.Any())
+        {
+            var receiver = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
+
+            foreach (var envRcv in envRcvs)
+                envRcv.Envelope?.Documents?.First().Elements.RemoveAll(s => s.ReceiverId != receiver.Id);
+        }
+
         return _mapper.Map<List<EnvelopeReceiverDto>>(envRcvs);
     }
 } 

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs

@@ -1,6 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 using MediatR;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
 
 namespace EnvelopeGenerator.Application.Envelopes.Commands;
 

EnvelopeGenerator.Application/Services/Authenticator.cs

@@ -1,5 +1,5 @@
 using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Interfaces.Services;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using Microsoft.Extensions.Options;
 using OtpNet;
 using QRCoder;

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using DigitalData.Core.Abstraction.Application.DTO;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto.History;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -5,13 +5,13 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -3,17 +3,17 @@ using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Common;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeSmsHandler.cs

@@ -1,10 +1,10 @@
-using EnvelopeGenerator.Application.Interfaces.Services;
+using Microsoft.Extensions.Caching.Distributed;
-using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
 using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using DigitalData.Core.Abstraction.Application.DTO;
 using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/GTXSmsSender.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
 using DigitalData.Core.Client.Interface;
 using DigitalData.Core.Client;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using Microsoft.Extensions.Options;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Application.Common.Dto.Messaging;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Interfaces.Repositories;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Interfaces.Services;
 using EnvelopeGenerator.Application.Receivers.Commands;
 using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+using EnvelopeGenerator.Application.Common.Interfaces.Services;
 
 namespace EnvelopeGenerator.Application.Services;
 

EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj

@@ -1,5 +1,5 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
+  <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -92,13 +92,13 @@
       <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="EnvelopeGenerator.CommonServices">
       <HintPath>..\EnvelopeGenerator.CommonServices\bin\Debug\EnvelopeGenerator.CommonServices.dll</HintPath>
@@ -176,11 +176,11 @@
     <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Identity.Client, Version=4.77.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
+      <HintPath>..\packages\Microsoft.Identity.Client.4.77.0\lib\net462\Microsoft.Identity.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=8.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.8.14.0\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -222,6 +222,9 @@
     <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
     </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
     </Reference>
@@ -386,10 +389,10 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.targets'))" />
   </Target>
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -104,7 +104,7 @@ Public Class frmFinalizePDF
 
 
         Catch ex As Exception
-
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
 End Class

EnvelopeGenerator.BBTests/packages.config

@@ -10,7 +10,7 @@
   <package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
   <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
-  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
+  <package id="EntityFramework" version="6.5.1" targetFramework="net462" />
   <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
   <package id="GdPicture" version="14.3.3" targetFramework="net462" />
@@ -19,8 +19,8 @@
   <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client" version="4.77.0" targetFramework="net462" />
-  <package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Abstractions" version="8.14.0" targetFramework="net462" />
   <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />

EnvelopeGenerator.Domain/Constants/Format.cs

@@ -1,5 +1,7 @@
-using Newtonsoft.Json;
+#if NET
-using Newtonsoft.Json.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+#endif
 
 namespace EnvelopeGenerator.Domain.Constants
 {
@@ -8,18 +10,21 @@ namespace EnvelopeGenerator.Domain.Constants
         #region Json Serializer Settings
         public static class Json
         {
-            public static readonly JsonSerializerSettings ForDiagnostics = new JsonSerializerSettings()
+#if NET
+            public static readonly JsonSerializerOptions ForDiagnostics = new()
             {
-                ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                Formatting = Formatting.Indented,
+                WriteIndented = true,
-                NullValueHandling = NullValueHandling.Include
+                DefaultIgnoreCondition = JsonIgnoreCondition.Never
             };
-            public static readonly JsonSerializerSettings ForAnnotations = new JsonSerializerSettings()
+
+            public static readonly JsonSerializerOptions ForAnnotations = new()
             {
-                ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                Formatting = Formatting.None,                
+                WriteIndented = false,
-                NullValueHandling = NullValueHandling.Ignore
+                DefaultIgnoreCondition = JsonIgnoreCondition.Never,
             };
+#endif
         }
         #endregion
     }

EnvelopeGenerator.Domain/Entities/Document.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Drawing;
 #if NETFRAMEWORK
+using System.Drawing;
 using System.Collections.Generic;
 using System.Linq;
 #endif
@@ -41,7 +41,7 @@ public class Document
     [NotMapped]
     public string Filepath { get; set; }
 
-    #region NETFRAMEWORK
+#if NETFRAMEWORK
     [NotMapped]
     public string FileNameOriginal { get; set; }
 
@@ -56,7 +56,7 @@ public class Document
 
     [NotMapped]
     public int PageCount { get; set; }
-    #endregion
+#endif
 }
 
 #if NETFRAMEWORK

EnvelopeGenerator.Domain/Entities/EmailTemplate.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using DigitalData.Core.Abstractions.Interfaces;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 #if NETFRAMEWORK
@@ -13,7 +14,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #endif
 
 [Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
-public class EmailTemplate
+public class EmailTemplate : IEntity
 {
     [Key]
     [DatabaseGenerated(DatabaseGeneratedOption.Identity)]

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -153,12 +153,10 @@ public class Envelope
 #if NETFRAMEWORK
     [NotMapped]
     public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
-#endif
 
-    #region FORM
     [NotMapped]
     public bool IsAlreadySent => Status > EnvelopeStatus.EnvelopeSaved;
-    #endregion
+#endif
 
     public List<Document>
 #if NET

EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using DigitalData.Core.Abstractions.Interfaces;
 using EnvelopeGenerator.Domain.Interfaces;
 
 #if NETFRAMEWORK
@@ -14,7 +15,7 @@ namespace EnvelopeGenerator.Domain.Entities
 #endif
 
 [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-public class EnvelopeReceiver : IHasEnvelope, IHasReceiver
+public class EnvelopeReceiver : IHasEnvelope, IHasReceiver, IEntity
 {
     public EnvelopeReceiver()
     {

EnvelopeGenerator.Domain/Entities/Signature.cs

@@ -108,13 +108,13 @@ public class Signature
     [ForeignKey("ReceiverId")]
     public virtual Receiver Receiver { get; set; }
 
-    #region FORM
+#if NETFRAMEWORK
     [NotMapped]
     public double Top => Math.Round(Y, 5);
 
     [NotMapped]
     public double Left => Math.Round(X, 5);
-    #endregion
+#endif
 }
 
 #if NETFRAMEWORK

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -37,6 +37,7 @@
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction.Attributes" Version="1.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="UserManager.Domain" Version="3.2.3" />
+	<PackageReference Include="DigitalData.Core.Abstractions" Version="4.1.1" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -1,6 +1,4 @@
-Imports System.Data
+Imports System.Data.SqlClient
-Imports System.Data.SqlClient
-Imports System.Drawing
 Imports System.IO
 Imports DevExpress.XtraBars.Docking
 Imports DigitalData.Modules.Logging

EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb

@@ -1,6 +1,4 @@
-Imports System.Data
+Imports DevExpress.XtraCharts
-Imports System.Windows.Forms
-Imports DevExpress.XtraCharts
 Imports EnvelopeGenerator.CommonServices
 Imports EnvelopeGenerator.Domain
 

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -1,163 +1,549 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+  <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" />
-	<PropertyGroup>
+  <PropertyGroup>
-		<OutputType>WinExe</OutputType>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<TargetFramework>net8.0-windows</TargetFramework>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-		<UseWindowsForms>true</UseWindowsForms>
+    <ProductVersion>8.0.30703</ProductVersion>
-		<MyType>WindowsForms</MyType>
+    <SchemaVersion>2.0</SchemaVersion>
-		<RootNamespace>EnvelopeGenerator.Form</RootNamespace>
+    <ProjectGuid>{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}</ProjectGuid>
-		<AssemblyName>EnvelopeGenerator.Form</AssemblyName>
+    <OutputType>WinExe</OutputType>
-		<StartupObject>EnvelopeGenerator.Form.My.MyApplication</StartupObject>
+    <RootNamespace>EnvelopeGenerator.Form</RootNamespace>
-		<ApplicationIcon>DD_signFLOW_ICON.ico</ApplicationIcon>
+    <AssemblyName>EnvelopeGenerator.Form</AssemblyName>
-		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-
+    <FileAlignment>512</FileAlignment>
-		<!-- Assembly Info -->
+    <OptionExplicit>On</OptionExplicit>
-		<AssemblyTitle>Envelope Generator</AssemblyTitle>
+    <OptionCompare>Binary</OptionCompare>
-		<AssemblyDescription></AssemblyDescription>
+    <OptionStrict>Off</OptionStrict>
-		<AssemblyConfiguration></AssemblyConfiguration>
+    <OptionInfer>On</OptionInfer>
-		<AssemblyCompany>Digital Data</AssemblyCompany>
+    <NuGetPackageImportStamp>
-		<AssemblyProduct>Envelope Generator</AssemblyProduct>
+    </NuGetPackageImportStamp>
-		<AssemblyCopyright>Copyright © 2024</AssemblyCopyright>
+  </PropertyGroup>
-		<AssemblyTrademark>2.9.0.0</AssemblyTrademark>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<AssemblyCulture></AssemblyCulture>
+    <PlatformTarget>AnyCPU</PlatformTarget>
-
+    <DebugSymbols>true</DebugSymbols>
-		<!-- ComVisible and GUID -->
+    <DebugType>full</DebugType>
-		<ComVisible>false</ComVisible>
+    <Optimize>false</Optimize>
-		<AssemblyGuid>9006f149-aa49-4b8e-ba69-386d945fa738</AssemblyGuid>
+    <OutputPath>bin\Debug\</OutputPath>
-
+    <DefineDebug>true</DefineDebug>
-		<!-- Version Information -->
+    <DefineTrace>true</DefineTrace>
-		<AssemblyVersion>2.9.1.0</AssemblyVersion>
+    <ErrorReport>prompt</ErrorReport>
-		<FileVersion>1.0.0.0</FileVersion>
+  </PropertyGroup>
-
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<!-- Optional: Modern .NET features -->
+    <PlatformTarget>AnyCPU</PlatformTarget>
-		<Nullable>enable</Nullable>
+    <DebugType>pdbonly</DebugType>
-		<ImplicitUsings>enable</ImplicitUsings>
+    <Optimize>true</Optimize>
-		<NeutralLanguage>en</NeutralLanguage>
+    <OutputPath>bin\Release\</OutputPath>
-	</PropertyGroup>
+    <DefineDebug>false</DefineDebug>
-
+    <DefineTrace>true</DefineTrace>
-	<ItemGroup>
+    <ErrorReport>prompt</ErrorReport>
-		<!-- Framework reference: System.*, WinForms, Drawing -->
+  </PropertyGroup>
-		<FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms" />
+  <PropertyGroup>
-	</ItemGroup>
+    <MyType>WindowsForms</MyType>
-
+  </PropertyGroup>
-	<ItemGroup>
+  <PropertyGroup>
-		<!-- DevExpress References -->
+    <StartupObject>EnvelopeGenerator.Form.My.MyApplication</StartupObject>
-		<Reference Include="DevExpress.BonusSkins.v21.2">
+  </PropertyGroup>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.BonusSkins.v21.2.dll</HintPath>
+  <PropertyGroup>
-		</Reference>
+    <ApplicationIcon>DD_signFLOW_ICON.ico</ApplicationIcon>
-		<Reference Include="DevExpress.Charts.v21.2.Core">
+  </PropertyGroup>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Charts.v21.2.Core.dll</HintPath>
+  <PropertyGroup>
-		</Reference>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<Reference Include="DevExpress.Data.v21.2">
+  </PropertyGroup>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll</HintPath>
+  <ItemGroup>
-		</Reference>
+    <Reference Include="Accessibility" />
-		<Reference Include="DevExpress.Data.Desktop.v21.2">
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.Desktop.v21.2.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
-		</Reference>
+    </Reference>
-		<Reference Include="DevExpress.Dialogs.v21.2.Core">
+    <Reference Include="DevExpress.BonusSkins.v21.2" />
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Dialogs.v21.2.Core.dll</HintPath>
+    <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-		</Reference>
+    <Reference Include="DevExpress.Data.v21.2" />
-		<Reference Include="DevExpress.Utils.v21.2">
+    <Reference Include="DevExpress.Data.Desktop.v21.2" />
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Utils.v21.2.dll</HintPath>
+    <Reference Include="DevExpress.Dialogs.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-		</Reference>
+    <Reference Include="DevExpress.Utils.v21.2" />
-		<Reference Include="DevExpress.Sparkline.v21.2.Core">
+    <Reference Include="DevExpress.Sparkline.v21.2.Core" />
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Sparkline.v21.2.Core.dll</HintPath>
+    <Reference Include="DevExpress.Utils.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-		</Reference>
+    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-		<Reference Include="DevExpress.Utils.v21.2.UI">
+    <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Utils.v21.2.UI.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
-		</Reference>
+      <HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraCharts.v21.2.dll</HintPath>
-		<Reference Include="DevExpress.XtraBars.v21.2">
+    </Reference>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraBars.v21.2.dll</HintPath>
+    <Reference Include="DevExpress.XtraCharts.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-		</Reference>
+    <Reference Include="DevExpress.XtraCharts.v21.2.Wizard, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-		<Reference Include="DevExpress.XtraCharts.v21.2">
+    <Reference Include="DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraCharts.v21.2.dll</HintPath>
+    <Reference Include="DevExpress.XtraEditors.v21.2" />
-		</Reference>
+    <Reference Include="DevExpress.Printing.v21.2.Core" />
-		<Reference Include="DevExpress.XtraCharts.v21.2.UI">
+    <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraCharts.v21.2.UI.dll</HintPath>
+    <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-		</Reference>
+    <Reference Include="DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-		<Reference Include="DevExpress.XtraCharts.v21.2.Wizard">
+    <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraCharts.v21.2.Wizard.dll</HintPath>
+    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-		</Reference>
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
-		<Reference Include="DevExpress.XtraDialogs.v21.2">
+      <HintPath>..\packages\DigitalData.Controls.DocumentViewer.1.9.8\lib\net462\DigitalData.Controls.DocumentViewer.dll</HintPath>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraDialogs.v21.2.dll</HintPath>
+    </Reference>
-		</Reference>
+    <Reference Include="DigitalData.GUIs.Common">
-		<Reference Include="DevExpress.XtraEditors.v21.2">
+      <HintPath>..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraEditors.v21.2.dll</HintPath>
+    </Reference>
-		</Reference>
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
-		<Reference Include="DevExpress.Printing.v21.2.Core">
+      <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Printing.v21.2.Core.dll</HintPath>
+    </Reference>
-		</Reference>
+    <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-		<Reference Include="DevExpress.XtraGrid.v21.2">
+      <HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraGrid.v21.2.dll</HintPath>
+    </Reference>
-		</Reference>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
-		<Reference Include="DevExpress.XtraLayout.v21.2">
+      <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraLayout.v21.2.dll</HintPath>
+    </Reference>
-		</Reference>
+    <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-		<Reference Include="DevExpress.XtraNavBar.v21.2">
+      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraNavBar.v21.2.dll</HintPath>
+    </Reference>
-		</Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
-		<Reference Include="DevExpress.XtraPrinting.v21.2">
+      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraPrinting.v21.2.dll</HintPath>
+    </Reference>
-		</Reference>
+    <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
-		<Reference Include="DevExpress.XtraTreeList.v21.2">
+      <HintPath>..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll</HintPath>
-			<HintPath>D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraTreeList.v21.2.dll</HintPath>
+    </Reference>
-		</Reference>
+    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-	</ItemGroup>
+      <HintPath>..\packages\UserManager.Domain.3.2.3\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
-
+    </Reference>
-	<ItemGroup>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-		<PackageReference Include="EntityFramework" Version="6.4.4" />
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
-		<PackageReference Include="EntityFramework.Firebird" Version="6.4.0" />
+    </Reference>
-		<PackageReference Include="BouncyCastle.Cryptography" Version="2.5.0" />
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
-		<PackageReference Include="DigitalData.Controls.DocumentViewer" Version="1.9.8" />
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
-		<PackageReference Include="DigitalData.Modules.Base" Version="1.3.8" />
+    </Reference>
-		<PackageReference Include="DigitalData.Modules.Config" Version="1.3.0" />
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-		<PackageReference Include="DigitalData.Modules.Database" Version="2.3.5.4" />
+      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.dll</HintPath>
-		<PackageReference Include="DigitalData.Modules.Encryption" Version="1.3.1" />
+      <Private>True</Private>
-		<PackageReference Include="DigitalData.Modules.Logging" Version="2.6.5" />
+    </Reference>
-		<PackageReference Include="DigitalData.Modules.Messaging" Version="1.9.8" />
+    <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
-		<PackageReference Include="UserManager.Domain" Version="3.2.3" />
+      <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
-		<PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
+    </Reference>
-		<PackageReference Include="DocumentFormat.OpenXml.Framework" Version="3.2.0" />
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-		<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="7.5.0" />
+      <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
+      <Private>True</Private>
-		<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0" />
+    </Reference>
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
-		<PackageReference Include="Microsoft.Identity.Client" Version="4.55.0" />
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
-		<PackageReference Include="Microsoft.IdentityModel.Abstractions" Version="6.22.0" />
+    </Reference>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
-		<PackageReference Include="NLog" Version="5.0.5" />
+    </Reference>
-		<PackageReference Include="OpenMcdf" Version="2.4.1" />
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="protobuf-net" Version="3.2.46" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
-		<PackageReference Include="protobuf-net.Core" Version="3.2.46" />
+    </Reference>
-		<PackageReference Include="Quartz" Version="3.8.0" />
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="RtfPipe" Version="2.0.7677.4303" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
-		<PackageReference Include="S22.Imap" Version="3.6.0" />
+    </Reference>
-		<PackageReference Include="System.Buffers" Version="4.6.0" />
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="System.CodeDom" Version="9.0.0" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
-		<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
+    </Reference>
-		<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="System.Data.Odbc" Version="6.0.1" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
-		<PackageReference Include="System.Drawing.Common" Version="9.0.9" />
+    </Reference>
-		<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="System.IO.Packaging" Version="9.0.0" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
-		<PackageReference Include="System.IO.Pipelines" Version="9.0.0" />
+    </Reference>
-		<PackageReference Include="System.Memory" Version="4.6.0" />
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="System.Numerics.Vectors" Version="4.6.0" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
-		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
+    </Reference>
-		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0" />
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
-		<PackageReference Include="System.Text.Json" Version="9.0.0" />
+    </Reference>
-		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="System.ValueTuple" Version="4.5.0" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
-		<PackageReference Include="DigitalData.GUIs.Common" Version="2.6.2" />
+    </Reference>
-		<PackageReference Include="GdPicture" Version="14.3.14" />
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<PackageReference Include="GdPicture.runtimes.windows" Version="14.3.14" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
-	</ItemGroup>
+    </Reference>
-	
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-	<ItemGroup>
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
-		<!-- Project references -->
+    </Reference>
-		<ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj" />
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-		<ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
-	</ItemGroup>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Mail">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.4.77.0\lib\net462\Microsoft.Identity.Client.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.8.14.0\lib\net462\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Quartz, Version=3.8.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Quartz.3.8.0\lib\net462\Quartz.dll</HintPath>
+    </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
+    <Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Drawing.Common, Version=4.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Drawing.Common.4.7.3\lib\net461\System.Drawing.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Data" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
+    <Compile Include="Controllers\EnvelopeEditorController.vb" />
+    <Compile Include="Controllers\EnvelopeListController.vb" />
+    <Compile Include="Controllers\FieldEditorController.vb" />
+    <Compile Include="Controllers\BaseController.vb" />
+    <Compile Include="frm2Factor_Properties.Designer.vb">
+      <DependentUpon>frm2Factor_Properties.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frm2Factor_Properties.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmEnvelopeEditor.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmEnvelopeEditor.Designer.vb">
+      <DependentUpon>frmEnvelopeEditor.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmEnvelopeMainData.Designer.vb">
+      <DependentUpon>frmEnvelopeMainData.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmEnvelopeMainData.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmFieldEditor.Designer.vb">
+      <DependentUpon>frmFieldEditor.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmFieldEditor.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmGhostMode.Designer.vb">
+      <DependentUpon>frmGhostMode.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmGhostMode.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmMain.Designer.vb">
+      <DependentUpon>frmMain.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmMain.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmOrderFiles.Designer.vb">
+      <DependentUpon>frmOrderFiles.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmOrderFiles.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmRueckruf.Designer.vb">
+      <DependentUpon>frmRueckruf.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmRueckruf.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmSplashScreen.Designer.vb">
+      <DependentUpon>frmSplashScreen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmSplashScreen.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Helper\Encryption.vb" />
+    <Compile Include="Helper\FixPageRotation.vb" />
+    <Compile Include="Helper\FlattenFormFields.vb" />
+    <Compile Include="Helper\RefreshHelper.vb" />
+    <Compile Include="Helper\TempFiles.vb" />
+    <Compile Include="Helper\Thumbnail.vb" />
+    <Compile Include="Helper\Validator.vb" />
+    <Compile Include="ModuleSettings.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <EmbeddedResource Include="frm2Factor_Properties.resx">
+      <DependentUpon>frm2Factor_Properties.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmEnvelopeEditor.en.resx">
+      <DependentUpon>frmEnvelopeEditor.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmEnvelopeEditor.resx">
+      <DependentUpon>frmEnvelopeEditor.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmEnvelopeMainData.en.resx">
+      <DependentUpon>frmEnvelopeMainData.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmEnvelopeMainData.resx">
+      <DependentUpon>frmEnvelopeMainData.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmFieldEditor.en.resx">
+      <DependentUpon>frmFieldEditor.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmFieldEditor.resx">
+      <DependentUpon>frmFieldEditor.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmGhostMode.en-US.resx">
+      <DependentUpon>frmGhostMode.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmGhostMode.en.resx">
+      <DependentUpon>frmGhostMode.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmGhostMode.fr.resx">
+      <DependentUpon>frmGhostMode.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmGhostMode.resx">
+      <DependentUpon>frmGhostMode.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmMain.en.resx">
+      <DependentUpon>frmMain.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmMain.resx">
+      <DependentUpon>frmMain.vb</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmOrderFiles.resx">
+      <DependentUpon>frmOrderFiles.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmRueckruf.resx">
+      <DependentUpon>frmRueckruf.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmSplashScreen.resx">
+      <DependentUpon>frmSplashScreen.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="My Project\DataSources\EnvelopeReceiver.datasource" />
+    <None Include="My Project\DataSources\frmEditor.datasource" />
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="app.config" />
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="DD_signFLOW_ICON.ico" />
+    <Content Include="DD_signFLOW_icon_256.ico" />
+    <Content Include="DD_signFLOW_Preloader.png" />
+    <Content Include="GdPicture.NET.14.barcode.1d.reader.64.dll" />
+    <Content Include="GdPicture.NET.14.barcode.1d.reader.dll" />
+    <Content Include="GdPicture.NET.14.barcode.2d.reader.64.dll" />
+    <Content Include="GdPicture.NET.14.barcode.2d.reader.dll" />
+    <Content Include="GdPicture.NET.14.filters.64.dll" />
+    <Content Include="GdPicture.NET.14.filters.dll" />
+    <Content Include="GdPicture.NET.14.image.gdimgplug.64.dll" />
+    <Content Include="GdPicture.NET.14.image.gdimgplug.dll" />
+    <Content Include="GdPicture.NET.14.Imaging.ML.64.dll" />
+    <Content Include="GdPicture.NET.14.Imaging.ML.dll" />
+    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
+    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
+    <Content Include="GdPicture.NET.14.machine.vision.64.dll" />
+    <Content Include="GdPicture.NET.14.machine.vision.dll" />
+    <Content Include="GdPicture.NET.14.twain.client.64.dll" />
+    <Content Include="GdPicture.NET.14.twain.client.dll" />
+    <Content Include="MailLicense.xml" />
+    <Content Include="README.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj">
+      <Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
+      <Name>EnvelopeGenerator.CommonServices</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj">
+      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
+      <Name>EnvelopeGenerator.CommonServices</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj">
+      <Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
+      <Name>EnvelopeGenerator.Domain</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.targets'))" />
+  </Target>
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

EnvelopeGenerator.Form/Helper/Thumbnail.vb

@@ -1,5 +1,4 @@
 Imports System.ComponentModel
-Imports System.Drawing
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports GdPicture14

EnvelopeGenerator.Form/ModuleSettings.vb

@@ -1,5 +1,4 @@
-Imports System.Data
+Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.CommonServices
 Imports EnvelopeGenerator.Domain.Entities

EnvelopeGenerator.Form/My Project/AssemblyInfo.vb

@@ -0,0 +1,36 @@
+Imports System.Reflection
+Imports System.Runtime.CompilerServices
+Imports 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("Envelope Generator")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyConfiguration("")>
+<Assembly: AssemblyCompany("Digital Data")>
+<Assembly: AssemblyProduct("Envelope Generator")>
+<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyTrademark("2.9.0.0")>
+<Assembly: AssemblyCulture("")>
+
+' Setting ComVisible to false makes the types in this assembly not visible 
+' to COM components.  If you need to access a type in this assembly from 
+' COM, set the ComVisible attribute to true on that type.
+<Assembly: ComVisible(False)>
+
+' The following GUID is for the ID of the typelib if this project is exposed to COM
+<Assembly: Guid("9006f149-aa49-4b8e-ba69-386d945fa738")>
+
+' 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: AssemblyVersion("2.9.1.0")>
+<Assembly: AssemblyFileVersion("1.0.0.0")>

EnvelopeGenerator.Form/app.config

@@ -101,7 +101,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -121,15 +121,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

EnvelopeGenerator.Form/frm2Factor_Properties.Designer.vb

@@ -1,6 +1,4 @@
-Imports System.Windows.Forms
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frm2Factor_Properties
     Inherits System.Windows.Forms.Form
 

EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb

@@ -1,5 +1,4 @@
-Imports System.Windows.Forms
+Imports DevExpress.XtraEditors
-Imports DevExpress.XtraEditors
 Imports DevExpress.XtraLayout
 
 Partial Public Class frmEnvelopeEditor

EnvelopeGenerator.Form/frmEnvelopeEditor.vb

@@ -14,8 +14,6 @@ Imports EnvelopeGenerator.CommonServices.My
 Imports GdPicture14
 Imports EnvelopeGenerator.Domain.Constants
 Imports EnvelopeGenerator.Domain.Entities
-Imports System.Windows.Forms
-Imports System.Drawing
 
 Partial Public Class frmEnvelopeEditor
     Public Property Envelope As Envelope