diff --git a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj index abeab90e..27b74ee1 100644 --- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj +++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj @@ -19,6 +19,7 @@ + @@ -41,7 +42,6 @@ - diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs index 6e71bbc3..8279b81c 100644 --- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs +++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs @@ -3,7 +3,7 @@ using DigitalData.Core.Exceptions; using EnvelopeGenerator.Application.Model; using EnvelopeGenerator.Domain; using EnvelopeGenerator.Domain.Entities; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using MediatR; using Microsoft.EntityFrameworkCore; diff --git a/EnvelopeGenerator.Extensions/DecodingExtensions.cs b/EnvelopeGenerator.Application/Extensions/DecodingExtensions.cs similarity index 99% rename from EnvelopeGenerator.Extensions/DecodingExtensions.cs rename to EnvelopeGenerator.Application/Extensions/DecodingExtensions.cs index ad5e6800..0f43df21 100644 --- a/EnvelopeGenerator.Extensions/DecodingExtensions.cs +++ b/EnvelopeGenerator.Application/Extensions/DecodingExtensions.cs @@ -1,7 +1,7 @@ using System.Text; using static EnvelopeGenerator.Domain.Constants; -namespace EnvelopeGenerator.Extensions +namespace EnvelopeGenerator.Application.Extensions { public static class DecodingExtensions { diff --git a/EnvelopeGenerator.Extensions/EncodingExtensions.cs b/EnvelopeGenerator.Application/Extensions/EncodingExtensions.cs similarity index 95% rename from EnvelopeGenerator.Extensions/EncodingExtensions.cs rename to EnvelopeGenerator.Application/Extensions/EncodingExtensions.cs index e1acf0e9..0534cfd3 100644 --- a/EnvelopeGenerator.Extensions/EncodingExtensions.cs +++ b/EnvelopeGenerator.Application/Extensions/EncodingExtensions.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; using System.Text; -namespace EnvelopeGenerator.Extensions +namespace EnvelopeGenerator.Application.Extensions { /// /// Provides extension methods for decoding and extracting information from an envelope receiver ID. diff --git a/EnvelopeGenerator.Extensions/LoggerExtensions.cs b/EnvelopeGenerator.Application/Extensions/LoggerExtensions.cs similarity index 96% rename from EnvelopeGenerator.Extensions/LoggerExtensions.cs rename to EnvelopeGenerator.Application/Extensions/LoggerExtensions.cs index b1c56974..f37cb7dd 100644 --- a/EnvelopeGenerator.Extensions/LoggerExtensions.cs +++ b/EnvelopeGenerator.Application/Extensions/LoggerExtensions.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Logging; using System.Text; -namespace EnvelopeGenerator.Extensions +namespace EnvelopeGenerator.Application.Extensions { public static class LoggerExtensions { diff --git a/EnvelopeGenerator.Extensions/MemoryCacheExtensions.cs b/EnvelopeGenerator.Application/Extensions/MemoryCacheExtensions.cs similarity index 95% rename from EnvelopeGenerator.Extensions/MemoryCacheExtensions.cs rename to EnvelopeGenerator.Application/Extensions/MemoryCacheExtensions.cs index f9b0a1ac..97932921 100644 --- a/EnvelopeGenerator.Extensions/MemoryCacheExtensions.cs +++ b/EnvelopeGenerator.Application/Extensions/MemoryCacheExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Caching.Memory; -namespace EnvelopeGenerator.Extensions; +namespace EnvelopeGenerator.Application.Extensions; public static class MemoryCacheExtensions { diff --git a/EnvelopeGenerator.Extensions/StringExtension.cs b/EnvelopeGenerator.Application/Extensions/StringExtension.cs similarity index 88% rename from EnvelopeGenerator.Extensions/StringExtension.cs rename to EnvelopeGenerator.Application/Extensions/StringExtension.cs index b08a0f66..8df916f7 100644 --- a/EnvelopeGenerator.Extensions/StringExtension.cs +++ b/EnvelopeGenerator.Application/Extensions/StringExtension.cs @@ -1,6 +1,6 @@ using OtpNet; -namespace EnvelopeGenerator.Extensions +namespace EnvelopeGenerator.Application.Extensions { public static class StringExtension { diff --git a/EnvelopeGenerator.Extensions/XSSExtensions.cs b/EnvelopeGenerator.Application/Extensions/XSSExtensions.cs similarity index 93% rename from EnvelopeGenerator.Extensions/XSSExtensions.cs rename to EnvelopeGenerator.Application/Extensions/XSSExtensions.cs index 3649df9d..2c5dac80 100644 --- a/EnvelopeGenerator.Extensions/XSSExtensions.cs +++ b/EnvelopeGenerator.Application/Extensions/XSSExtensions.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.Localization; using System.Text.Encodings.Web; -namespace EnvelopeGenerator.Extensions +namespace EnvelopeGenerator.Application.Extensions { public static class XSSExtensions { diff --git a/EnvelopeGenerator.Application/Histories/MappingProfile.cs b/EnvelopeGenerator.Application/Histories/MappingProfile.cs index 8ce5c5bc..cbd8b3bd 100644 --- a/EnvelopeGenerator.Application/Histories/MappingProfile.cs +++ b/EnvelopeGenerator.Application/Histories/MappingProfile.cs @@ -1,6 +1,5 @@ using AutoMapper; using EnvelopeGenerator.Application.Histories.Commands; -using EnvelopeGenerator.Application.Histories.Queries.Read; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.Histories; @@ -15,7 +14,6 @@ public class MappingProfile: Profile /// public MappingProfile() { - CreateMap(); CreateMap(); } } diff --git a/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs b/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs index 6b00e9a1..d370b8cb 100644 --- a/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs +++ b/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs @@ -1,5 +1,5 @@ using DigitalData.Core.Exceptions; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; namespace EnvelopeGenerator.Application.Model; diff --git a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs index ed672d0c..54264b9f 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs @@ -6,7 +6,7 @@ using EnvelopeGenerator.Application.Dto.EnvelopeReceiver; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using static EnvelopeGenerator.Domain.Constants; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using EnvelopeGenerator.Application.Dto.EnvelopeReceiverReadOnly; using EnvelopeGenerator.Application.Configurations; using EnvelopeGenerator.Application.Extensions; diff --git a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs index c845dec6..b73337cd 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs @@ -7,7 +7,7 @@ using EnvelopeGenerator.Domain.Entities; using EnvelopeGenerator.Application.Interfaces.Repositories; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using EnvelopeGenerator.Application.Dto.Messaging; using EnvelopeGenerator.Application.Interfaces.Services; using EnvelopeGenerator.Application.Envelopes; diff --git a/EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj b/EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj deleted file mode 100644 index 5a855b8e..00000000 --- a/EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - net7.0 - enable - enable - Test - 1.0.0.1 - 1.0.0.2 - Versionshinweis xyz - 1.1 - - - - - - - - - - - - - - - diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs index abf15e52..e45a183d 100644 --- a/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs +++ b/EnvelopeGenerator.GeneratorAPI/Controllers/HistoryController.cs @@ -1,4 +1,4 @@ -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using MediatR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/EnvelopeGenerator.Web/Controllers/DocumentController.cs b/EnvelopeGenerator.Web/Controllers/DocumentController.cs index 619b6cbb..a0621ac2 100644 --- a/EnvelopeGenerator.Web/Controllers/DocumentController.cs +++ b/EnvelopeGenerator.Web/Controllers/DocumentController.cs @@ -2,7 +2,7 @@ using EnvelopeGenerator.CommonServices; using EnvelopeGenerator.Web.Services; using Microsoft.AspNetCore.Authorization; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using EnvelopeGenerator.Application.Interfaces.Services; using static EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs index f3438a11..6f0ade63 100644 --- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs @@ -3,7 +3,7 @@ using EnvelopeGenerator.Web.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System.Text.Encodings.Web; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using EnvelopeGenerator.Application.Interfaces.Services; using static EnvelopeGenerator.Domain.Constants; using EnvelopeGenerator.Domain.Entities; diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 4c306dcc..313f1379 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -6,7 +6,7 @@ using EnvelopeGenerator.Application.Dto.EnvelopeReceiver; using EnvelopeGenerator.Application.EnvelopeReceivers.Queries; using EnvelopeGenerator.Application.Interfaces.Services; using EnvelopeGenerator.Application.Resources; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using EnvelopeGenerator.Web.Extensions; using EnvelopeGenerator.Web.Models; using Ganss.Xss; diff --git a/EnvelopeGenerator.Web/Controllers/TFARegController.cs b/EnvelopeGenerator.Web/Controllers/TFARegController.cs index fb470df9..9225acf9 100644 --- a/EnvelopeGenerator.Web/Controllers/TFARegController.cs +++ b/EnvelopeGenerator.Web/Controllers/TFARegController.cs @@ -1,7 +1,7 @@ using EnvelopeGenerator.Web.Models; using Ganss.Xss; using Microsoft.AspNetCore.Mvc; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using Microsoft.Extensions.Localization; using EnvelopeGenerator.Application.Resources; using EnvelopeGenerator.Application.Extensions; diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs index d6533ec7..c820386d 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeController.cs @@ -1,7 +1,7 @@ using EnvelopeGenerator.Application.Dto; using EnvelopeGenerator.Domain.Entities; using Microsoft.AspNetCore.Mvc; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using EnvelopeGenerator.Application.Interfaces.Services; namespace EnvelopeGenerator.Web.Controllers.Test; diff --git a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs index 92cf808c..ba8a0569 100644 --- a/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs +++ b/EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeReceiverController.cs @@ -1,5 +1,5 @@ using DigitalData.Core.API; -using EnvelopeGenerator.Extensions; +using EnvelopeGenerator.Application.Extensions; using Microsoft.AspNetCore.Mvc; using EnvelopeGenerator.Application.Interfaces.Services; using DigitalData.Core.Abstraction.Application.DTO; diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj index 51a822fb..2bca6c19 100644 --- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj +++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj @@ -2136,7 +2136,6 @@ - diff --git a/EnvelopeGenerator.Web/Views/_ViewImports.cshtml b/EnvelopeGenerator.Web/Views/_ViewImports.cshtml index d35750f9..63b28eb0 100644 --- a/EnvelopeGenerator.Web/Views/_ViewImports.cshtml +++ b/EnvelopeGenerator.Web/Views/_ViewImports.cshtml @@ -1,7 +1,7 @@ @using EnvelopeGenerator.Web @using EnvelopeGenerator.Web.Models @using EnvelopeGenerator.Web.Sanitizers -@using EnvelopeGenerator.Extensions +@using EnvelopeGenerator.Application.Extensions @using Microsoft.Extensions.Localization @using EnvelopeGenerator.Application.Resources @using Microsoft.Extensions.Options diff --git a/EnvelopeGenerator.sln b/EnvelopeGenerator.sln index eb3d69e9..8b041a64 100644 --- a/EnvelopeGenerator.sln +++ b/EnvelopeGenerator.sln @@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvelopeGenerator.Applicati EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvelopeGenerator.GeneratorAPI", "EnvelopeGenerator.GeneratorAPI\EnvelopeGenerator.GeneratorAPI.csproj", "{E5E12BA4-60C1-48BA-9053-0F8B62B38124}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnvelopeGenerator.Extensions", "EnvelopeGenerator.Extensions\EnvelopeGenerator.Extensions.csproj", "{47F98812-4280-4D53-B04A-2AAEEA5EBC31}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{9943209E-1744-4944-B1BA-4F87FC1A0EEB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{134D4164-B291-4E19-99B9-E4FA3AFAB62C}" @@ -79,10 +77,6 @@ Global {E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Release|Any CPU.ActiveCfg = Debug|Any CPU {E5E12BA4-60C1-48BA-9053-0F8B62B38124}.Release|Any CPU.Build.0 = Debug|Any CPU - {47F98812-4280-4D53-B04A-2AAEEA5EBC31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47F98812-4280-4D53-B04A-2AAEEA5EBC31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47F98812-4280-4D53-B04A-2AAEEA5EBC31}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {47F98812-4280-4D53-B04A-2AAEEA5EBC31}.Release|Any CPU.Build.0 = Debug|Any CPU {A4D0DD1A-67BC-4E1A-AD29-BC4BC0D41399}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4D0DD1A-67BC-4E1A-AD29-BC4BC0D41399}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4D0DD1A-67BC-4E1A-AD29-BC4BC0D41399}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -105,7 +99,6 @@ Global {63E32615-0ECA-42DC-96E3-91037324B7C7} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} {5A9984F8-51A2-4558-A415-EC5FEED7CF7D} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB} {E5E12BA4-60C1-48BA-9053-0F8B62B38124} = {E3C758DC-914D-4B7E-8457-0813F1FDB0CB} - {47F98812-4280-4D53-B04A-2AAEEA5EBC31} = {9943209E-1744-4944-B1BA-4F87FC1A0EEB} {9943209E-1744-4944-B1BA-4F87FC1A0EEB} = {134D4164-B291-4E19-99B9-E4FA3AFAB62C} {A4D0DD1A-67BC-4E1A-AD29-BC4BC0D41399} = {0CBC2432-A561-4440-89BC-671B66A24146} {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {134D4164-B291-4E19-99B9-E4FA3AFAB62C}