chore(Abstraktion.Attribute): konfiguriert für die Verpackung

chore(Abstraktion.Attribute): Unterstützung für .net framework 4.6.2 hinzufügen
feat(Abstraction.Attributes): als separates Projekt erstellt, um .net framework als Ziel hinzuzufügen
2025-05-20 16:50:21 +02:00 · 2025-05-20 16:39:19 +02:00 · 2025-05-20 16:35:30 +02:00 · 2025-05-20 16:32:13 +02:00 · 2025-05-16 10:01:30 +02:00 · 2025-04-14 16:52:07 +02:00
11 changed files with 134 additions and 56 deletions
--- a/DigitalData.EmailProfilerDispatcher/Assets/icon.png
+++ b/DigitalData.EmailProfilerDispatcher/Assets/icon.png
--- a/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes.csproj
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net462;net7.0;net8.0;net9.0</TargetFrameworks>
+    <PackageId>DigitalData.EmailProfilerDispatcher.Abstraction.Attributes</PackageId>
+    <Company>Digital Data GmbH</Company>
+    <Copyright>Copyright 2025</Copyright>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageTags>digital data email dispatcher</PackageTags>
+    <Description>This package provides the necessary ‘Attributes’ for the DigitalData.EmailProfilerDispatcher.Abstractions library to support the .NET Framrwork.</Description>
+    <Authors>Digital Data GmbH</Authors>
+    <RepositoryUrl>http://git.dd:3000/AppStd/EmailProfilerDispatcher.git</RepositoryUrl>
+    <Version>1.0.0</Version>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
+  </PropertyGroup>
+	
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+	<ImplicitUsings>disable</ImplicitUsings>
+	<LangVersion>7.3</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net462'">
+	<ImplicitUsings>enable</ImplicitUsings>
+	<LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+	  <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\Assets\icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
+</Project>
--- a/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes/TemplatePlaceholderAttribute.cs
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction.Attributes/TemplatePlaceholderAttribute.cs
@@ -1,4 +1,8 @@
-namespace DigitalData.EmailProfilerDispatcher.Abstraction.Attributes
+#if NETFRAMEWORK
+using System;
+#endif
+
+namespace DigitalData.EmailProfilerDispatcher.Abstraction.Attributes
 {
 	[AttributeUsage(AttributeTargets.Property)]
 	public class TemplatePlaceholderAttribute : Attribute
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/Assets/icon.png
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/Assets/icon.png
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutRepository.cs
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutRepository.cs
@@ -1,9 +1,8 @@
 using DigitalData.Core.Abstractions.Infrastructure;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;

-namespace DigitalData.EmailProfilerDispatcher.Abstraction.Contracts
+namespace DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
+
+public interface IEmailOutRepository : ICRUDRepository<EmailOut, int>
 {
-    public interface IEmailOutRepository : ICRUDRepository<EmailOut, int>
-    {
-    }
 }
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutService.cs
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/Contracts/IEmailOutService.cs
@@ -3,10 +3,9 @@ using DigitalData.Core.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;

-namespace DigitalData.EmailProfilerDispatcher.Abstraction.Contracts
+namespace DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
+
+public interface IEmailOutService : ICRUDService<EmailOutCreateDto, EmailOutDto, EmailOut, int>
 {
-    public interface IEmailOutService : ICRUDService<EmailOutCreateDto, EmailOutDto, EmailOutDto, EmailOut, int>
-    {
-        Task<DataResult<int>> CreateWithTemplateAsync(EmailOutCreateDto createDto, params object[] models);
-	}
+    Task<DataResult<int>> CreateWithTemplateAsync(EmailOutCreateDto createDto, params object[] models);
 }
--- a/DigitalData.EmailProfilerDispatcher.Abstraction/DigitalData.EmailProfilerDispatcher.Abstraction.csproj
+++ b/DigitalData.EmailProfilerDispatcher.Abstraction/DigitalData.EmailProfilerDispatcher.Abstraction.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <PackageId>DigitalData.EmailProfilerDispatcher.Abstraction</PackageId>
@@ -9,21 +9,27 @@
    <Company>Digital Data GmbH</Company>
    <Description>This package provides the necessary abstractions and interfaces for the DigitalData.EmailProfilerDispatcher library, facilitating a clean and decoupled architecture.</Description>
    <Copyright>Copyright 2024</Copyright>
-    <PackageIcon>Assets\icon.png</PackageIcon>
+    <PackageIcon>icon.png</PackageIcon>
    <RepositoryUrl>http://git.dd:3000/AppStd/EmailProfilerDispatcher.git</RepositoryUrl>
    <PackageTags>digital data email dispatcher abstraction</PackageTags>
-    <Version>2.0.0</Version>
+    <Version>3.0.0</Version>
+    <FileVersion>3.0.0</FileVersion>
+    <AssemblyVersion>3.0.0</AssemblyVersion>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Assets\icon.png">
+    <None Include="..\Assets\icon.png">
      <Pack>True</Pack>
      <PackagePath>\</PackagePath>
    </None>
  </ItemGroup>

+  <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DigitalData.EmailProfilerDispatcher.Abstraction.Attributes\DigitalData.EmailProfilerDispatcher.Abstraction.Attributes.csproj" />
+  </ItemGroup>
+
 </Project>
--- a/DigitalData.EmailProfilerDispatcher.sln
+++ b/DigitalData.EmailProfilerDispatcher.sln
@@ -11,6 +11,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.EmailProfilerDi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.EmailProfilerDispatcher", "DigitalData.EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.csproj", "{DF202B1D-6C6F-4354-9B73-20F03486D020}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assest", "Assest", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+	ProjectSection(SolutionItems) = preProject
+		Assets\icon.png = Assets\icon.png
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DigitalData.EmailProfilerDispatcher.Abstraction.Attributes", "DigitalData.EmailProfilerDispatcher.Abstraction.Attributes\DigitalData.EmailProfilerDispatcher.Abstraction.Attributes.csproj", "{16785881-75BA-4721-9A0C-B469FAA95D95}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,10 +42,17 @@ Global
 		{DF202B1D-6C6F-4354-9B73-20F03486D020}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{DF202B1D-6C6F-4354-9B73-20F03486D020}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF202B1D-6C6F-4354-9B73-20F03486D020}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16785881-75BA-4721-9A0C-B469FAA95D95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16785881-75BA-4721-9A0C-B469FAA95D95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16785881-75BA-4721-9A0C-B469FAA95D95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16785881-75BA-4721-9A0C-B469FAA95D95}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CB0B8122-D532-4A7F-87CC-760B959A433C}
 	EndGlobalSection
--- a/DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj
+++ b/DigitalData.EmailProfilerDispatcher/DigitalData.EmailProfilerDispatcher.csproj
@@ -1,41 +1,57 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
    <PackageId>DigitalData.EmailProfilerDispatcher</PackageId>
-    <Version>2.0.0</Version>
+    <Version>3.0.0</Version>
    <Company>Digital Data GmbH</Company>
    <Copyright>Copyright 2024</Copyright>
-    <PackageIcon>Assets\icon.png</PackageIcon>
+    <PackageIcon>icon.png</PackageIcon>
    <PackageTags>digital data email dispatcher</PackageTags>
    <Description>DigitalData.EmailProfilerDispatcher enables adding data to the Email Profiler's SQL tables for systematic and batch email dispatching. It also supports dynamic and automatic template filling using attributes, allowing object property values to populate email templates.</Description>
    <Authors>Digital Data GmbH</Authors>
    <RepositoryUrl>http://git.dd:3000/AppStd/EmailProfilerDispatcher.git</RepositoryUrl>
+    <AssemblyVersion>3.0.0</AssemblyVersion>
+    <FileVersion>3.0.0</FileVersion>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
-    <PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.16" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.19" />
-    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.19" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DigitalData.EmailProfilerDispatcher.Abstraction\DigitalData.EmailProfilerDispatcher.Abstraction.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Assets\icon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Include="..\Assets\icon.png">
      <Pack>True</Pack>
      <PackagePath>\</PackagePath>
    </None>
  </ItemGroup>

+  <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="3.4.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.2.0" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.19" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.19" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+	<PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	<PackageReference Include="AutoMapper" Version="14.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.15" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	<PackageReference Include="AutoMapper" Version="14.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
+  </ItemGroup>
+	
+  <ItemGroup>
+    <ProjectReference Include="..\DigitalData.EmailProfilerDispatcher.Abstraction\DigitalData.EmailProfilerDispatcher.Abstraction.csproj" />
+  </ItemGroup>
+
 </Project>
--- a/DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs
+++ b/DigitalData.EmailProfilerDispatcher/Services/EmailOutService.cs
@@ -5,28 +5,27 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;

-namespace DigitalData.EmailProfilerDispatcher.Abstraction.Services
-{
-    public class EmailOutService : CRUDService<IEmailOutRepository, EmailOutCreateDto, EmailOutDto, EmailOutDto, EmailOut, int>, IEmailOutService
+namespace DigitalData.EmailProfilerDispatcher.Abstraction.Services;
+
+    public class EmailOutService : CRUDService<IEmailOutRepository, EmailOutCreateDto, EmailOutDto, EmailOut, int>, IEmailOutService
    {
        public EmailOutService(IEmailOutRepository repository, IMapper mapper) : base(repository, mapper)
        {
        }

-		public async Task<DataResult<int>> CreateWithTemplateAsync(EmailOutCreateDto createDto, params object[] models)
-		{
-			createDto.EmailSubj = createDto.EmailSubj.FillTemplate(models);
-			createDto.EmailBody = createDto.EmailBody.FillTemplate(models);
+	public async Task<DataResult<int>> CreateWithTemplateAsync(EmailOutCreateDto createDto, params object[] models)
+	{
+		createDto.EmailSubj = createDto.EmailSubj.FillTemplate(models);
+		createDto.EmailBody = createDto.EmailBody.FillTemplate(models);

-			return await base.CreateAsync(createDto);
-		}
+		return await base.CreateAsync(createDto);
+	}

-		public async Task<DataResult<int>> CreateWithTemplateAsync(EmailOutCreateDto createDto, Dictionary<string, string> placeholders, params object[] models)
-		{
-			createDto.EmailSubj = createDto.EmailSubj.FillTemplate(placeholders);
-			createDto.EmailBody = createDto.EmailBody.FillTemplate(placeholders);
+	public async Task<DataResult<int>> CreateWithTemplateAsync(EmailOutCreateDto createDto, Dictionary<string, string> placeholders, params object[] models)
+	{
+		createDto.EmailSubj = createDto.EmailSubj.FillTemplate(placeholders);
+		createDto.EmailBody = createDto.EmailBody.FillTemplate(placeholders);

-			return await CreateWithTemplateAsync(createDto, models: models);
-		}
+		return await CreateWithTemplateAsync(createDto, models: models);
 	}
 }
--- a/EmailProfilerDispatcher.Tests/EmailProfilerDispatcher.Tests.csproj
+++ b/EmailProfilerDispatcher.Tests/EmailProfilerDispatcher.Tests.csproj
@@ -11,7 +11,7 @@

  <ItemGroup>
    <PackageReference Include="coverlet.collector" Version="3.2.0" />
-    <PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="3.3.1" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
Author	SHA1	Message	Date
Developer 02	fd698e7a5d	chore(Abstraktion.Attribute): konfiguriert für die Verpackung	2025-05-20 16:50:21 +02:00
Developer 02	a54ec39df7	chore(Abstraktion.Attribute): Unterstützung für .net framework 4.6.2 hinzufügen	2025-05-20 16:39:19 +02:00
Developer 02	8fc23b0055	feat(Abstraction.Attributes): als separates Projekt erstellt, um .net framework als Ziel hinzuzufügen	2025-05-20 16:35:30 +02:00
Developer 02	e372a5a5b2	chore: Pakete aktualisieren und Konflikte lösen	2025-05-20 16:32:13 +02:00
Developer 02	bb9a64a85b	Remove old icon and update project references - Deleted the binary file `icon.png`. - Updated `PackageIcon` paths in project files to remove dependency on `Assets\icon.png`. - Added a new `None` item in `DigitalData.EmailProfilerDispatcher.Abstraction.csproj` to include `..\Assets\icon.png`. - Created a new project section for "Solution Items" in `DigitalData.EmailProfilerDispatcher.sln` to include `icon.png`. - Removed the previous `ItemGroup` for `None` that updated `Assets\icon.png`. - The binary file `icon.png` was replaced with a new version.	2025-05-16 10:01:30 +02:00
Developer 02	ab40ce9205	chore: Version auf 3.0.0 für EmailProfilerDispatcher Aktualisiert die Versionsnummer von 2.0.0 auf 3.0.0 sowohl in `DigitalData.EmailProfilerDispatcher.Abstraction.csproj` als auch in `DigitalData.EmailProfilerDispatcher.csproj`. Setzen Sie `FileVersion` und `AssemblyVersion` auf 3.0.0, , um eine wesentliche Aktualisierung des Pakets anzuzeigen.	2025-04-14 16:52:07 +02:00
Developer 02	863bf43873	chore: Zielframeworks für Kompatibilität aktualisieren Aktualisierte das Zielframework von `net7.0` auf mehrere Frameworks (`net7.0;net8.0;net9.0`). Diese Änderung verbessert die Kompatibilität und macht die Projekte zukunftssicher für die .NET-Versionen 7.0, 8.0 und 9.0.	2025-04-14 16:49:05 +02:00
Developer 02	b953e3afaa	Refactor email repository and service interfaces - Die Schnittstelle `IEmailOutRepository` wurde durch Entfernen unnötiger Klammern gestrafft. - Aktualisierte `IEmailOutService` Schnittstelle, um generische Parameter zu korrigieren und Redundanz zu entfernen. - Aktualisierte Paketversionen in Projektdateien auf `DigitalData.Core.Abstractions` (3.4.0) und `DigitalData.Core.Application` (3.2.0). - Verbesserte `CreateWithTemplateAsync` Methoden in `EmailOutService.cs` für bessere Implementierung. - Das Testprojekt wurde aktualisiert, um die neue Paketversion für `DigitalData.Core.Application` zu berücksichtigen.	2025-04-14 16:38:52 +02:00