Merge pull request #60 from NerosoftDev/develop

Develop
NerosoftDev · Dec 13, 2023 · 6ff4bc4 · 6ff4bc4
2 parents 77dc50f + 39a82f5
commit 6ff4bc4
Show file tree

Hide file tree

Showing 36 changed files with 84 additions and 26 deletions.
diff --git a/Euonia.sln b/Euonia.sln
@@ -21,6 +21,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{E57A56F3-7BAB-4DB5-9CE8-EC91985A6586}"
 	ProjectSection(SolutionItems) = preProject
 		Source\common.props = Source\common.props
+		Source\resource.props = Source\resource.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bus", "Bus", "{273D1F47-F6AF-4ED5-AAB5-977BD9906B2E}"

diff --git a/Source/Euonia.Application/Euonia.Application.csproj b/Source/Euonia.Application/Euonia.Application.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Bus.ActiveMq/Euonia.Bus.ActiveMq.csproj b/Source/Euonia.Bus.ActiveMq/Euonia.Bus.ActiveMq.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props"/>
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Bus.InMemory/Euonia.Bus.InMemory.csproj b/Source/Euonia.Bus.InMemory/Euonia.Bus.InMemory.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props"/>
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Bus.RabbitMq/Euonia.Bus.RabbitMq.csproj b/Source/Euonia.Bus.RabbitMq/Euonia.Bus.RabbitMq.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props"/>
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Bus/Euonia.Bus.csproj b/Source/Euonia.Bus/Euonia.Bus.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Business/Euonia.Business.csproj b/Source/Euonia.Business/Euonia.Business.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
 	<PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Caching.Memory/Euonia.Caching.Memory.csproj b/Source/Euonia.Caching.Memory/Euonia.Caching.Memory.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Caching.Redis/Euonia.Caching.Redis.csproj b/Source/Euonia.Caching.Redis/Euonia.Caching.Redis.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Caching.Runtime/Euonia.Caching.Runtime.csproj b/Source/Euonia.Caching.Runtime/Euonia.Caching.Runtime.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Caching/Euonia.Caching.csproj b/Source/Euonia.Caching/Euonia.Caching.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Core/Euonia.Core.csproj b/Source/Euonia.Core/Euonia.Core.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Domain/Euonia.Domain.csproj b/Source/Euonia.Domain/Euonia.Domain.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Grpc/Euonia.Grpc.csproj b/Source/Euonia.Grpc/Euonia.Grpc.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Hosting/Euonia.Hosting.csproj b/Source/Euonia.Hosting/Euonia.Hosting.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Linq/Euonia.Linq.csproj b/Source/Euonia.Linq/Euonia.Linq.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Mapping.Automapper/AutomapperModule.cs b/Source/Euonia.Mapping.Automapper/AutomapperModule.cs
@@ -8,19 +8,30 @@ namespace Nerosoft.Euonia.Mapping;
 /// </summary>
 public class AutomapperModule : ModuleContextBase
 {
-	private const string SERVICE_INJECTION_KEY = "automapper";
+#if NET8_0_OR_GREATER
+	private const string SERVICE_INJECTION_KEY = "automapper"; 
+#endif
 
 	/// <inheritdoc />
 	public override void ConfigureServices(ServiceConfigurationContext context)
 	{
 		context.Services.AddAutomapper();
+#if NET8_0_OR_GREATER
 		context.Services.AddKeyedSingleton<ITypeAdapterFactory, AutomapperTypeAdapterFactory>(SERVICE_INJECTION_KEY);
+#else
+		context.Services.AddSingleton<ITypeAdapterFactory, AutomapperTypeAdapterFactory>();	
+#endif
 	}
 
 	/// <inheritdoc />
 	public override void OnApplicationInitialization(ApplicationInitializationContext context)
 	{
-		var factory = context.ServiceProvider.GetKeyedService<ITypeAdapterFactory>(SERVICE_INJECTION_KEY);
+		ITypeAdapterFactory factory;
+#if NET8_0_OR_GREATER
+		factory = context.ServiceProvider.GetKeyedService<ITypeAdapterFactory>(SERVICE_INJECTION_KEY);
+#else
+		factory = context.ServiceProvider.GetService<ITypeAdapterFactory>();
+#endif
 		if (factory != null)
 		{
 			TypeAdapterFactory.SetCurrent(factory);

diff --git a/Source/Euonia.Mapping.Automapper/Euonia.Mapping.Automapper.csproj b/Source/Euonia.Mapping.Automapper/Euonia.Mapping.Automapper.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Mapping.Mapster/Euonia.Mapping.Mapster.csproj b/Source/Euonia.Mapping.Mapster/Euonia.Mapping.Mapster.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Mapping.Mapster/MapsterModule.cs b/Source/Euonia.Mapping.Mapster/MapsterModule.cs
@@ -8,19 +8,30 @@ namespace Nerosoft.Euonia.Mapping;
 /// </summary>
 public class MapsterModule : ModuleContextBase
 {
-	private const string SERVICE_INJECTION_KEY = "mapster";
+#if NET8_0_OR_GREATER
+	private const string SERVICE_INJECTION_KEY = "mapster"; 
+#endif
 
 	/// <inheritdoc />
 	public override void ConfigureServices(ServiceConfigurationContext context)
 	{
 		context.Services.AddMapster();
+#if NET8_0_OR_GREATER
 		context.Services.AddKeyedSingleton<ITypeAdapterFactory, MapsterTypeAdapterFactory>(SERVICE_INJECTION_KEY);
+#else
+		context.Services.AddSingleton<ITypeAdapterFactory, MapsterTypeAdapterFactory>();
+#endif
 	}
 
 	/// <inheritdoc />
 	public override void OnApplicationInitialization(ApplicationInitializationContext context)
 	{
-		var factory = context.ServiceProvider.GetKeyedService<ITypeAdapterFactory>(SERVICE_INJECTION_KEY);
+		ITypeAdapterFactory factory;
+#if NET8_0_OR_GREATER
+		factory = context.ServiceProvider.GetKeyedService<ITypeAdapterFactory>(SERVICE_INJECTION_KEY);
+#else
+		factory = context.ServiceProvider.GetService<ITypeAdapterFactory>();
+#endif
 		if (factory != null)
 		{
 			TypeAdapterFactory.SetCurrent(factory);

diff --git a/Source/Euonia.Mapping/Euonia.Mapping.csproj b/Source/Euonia.Mapping/Euonia.Mapping.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Modularity/Euonia.Modularity.csproj b/Source/Euonia.Modularity/Euonia.Modularity.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Pipeline/Euonia.Pipeline.csproj b/Source/Euonia.Pipeline/Euonia.Pipeline.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Quartz/Euonia.Quartz.csproj b/Source/Euonia.Quartz/Euonia.Quartz.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Repository.EfCore/Euonia.Repository.EfCore.csproj b/Source/Euonia.Repository.EfCore/Euonia.Repository.EfCore.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Repository.Mongo/Euonia.Repository.Mongo.csproj b/Source/Euonia.Repository.Mongo/Euonia.Repository.Mongo.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Repository/Euonia.Repository.csproj b/Source/Euonia.Repository/Euonia.Repository.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Threading.Azure/Euonia.Threading.Azure.csproj b/Source/Euonia.Threading.Azure/Euonia.Threading.Azure.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Threading.FileSystem/Euonia.Threading.FileSystem.csproj b/Source/Euonia.Threading.FileSystem/Euonia.Threading.FileSystem.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Threading.Redis/Euonia.Threading.Redis.csproj b/Source/Euonia.Threading.Redis/Euonia.Threading.Redis.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Threading.ZooKeeper/Euonia.Threading.ZooKeeper.csproj b/Source/Euonia.Threading.ZooKeeper/Euonia.Threading.ZooKeeper.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <Nullable>disable</Nullable>

diff --git a/Source/Euonia.Threading/Euonia.Threading.csproj b/Source/Euonia.Threading/Euonia.Threading.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/Euonia.Validation/Euonia.Validation.csproj b/Source/Euonia.Validation/Euonia.Validation.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <Import Project="..\common.props" />
+    <Import Project="..\resource.props" />
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;$(TargetFrameworks)</TargetFrameworks>

diff --git a/Source/common.props b/Source/common.props
@@ -40,26 +40,6 @@
         <Using Include="System.Text"/>
         <Using Include="System.Threading"/>
         <Using Include="System.Threading.Tasks"/>
-        <Using Include="$(RootNamespace).Properties"/>
     </ItemGroup>
-
-    <!-- See Microsoft.Common.CurrentVersion.targets -->
-
-    <Target Name="GenerateResx" BeforeTargets="PrepareForBuild">
-
-        <GenerateResource Sources="@(EmbeddedResource)"
-                          ExecuteAsTool="false"
-                          StronglyTypedLanguage="C#"
-                          StronglyTypedClassName="%(Filename)"
-                          StronglyTypedNamespace="@(EmbeddedResource->'$(RootNamespace).Properties')"
-                          StronglyTypedFileName="@(EmbeddedResource->'%(RootDir)%(Directory)%(Filename).Designer.cs')"
-                          Condition="'%(EmbeddedResource.GenerateResource)' != 'false' and '%(EmbeddedResource.FileName)' == 'Resources'"
-                          PublicClass="false"
-                          MinimalRebuildFromTracking="false">
-            <Output TaskParameter="FilesWritten" ItemName="FileWrites"/>
-            <Output TaskParameter="StronglyTypedFileName" ItemName="Compile"/>
-            <Output TaskParameter="Sources" ItemName="_Temporary"/>
-        </GenerateResource>
-
-    </Target>
+
 </Project>
diff --git a/Source/resource.props b/Source/resource.props
@@ -0,0 +1,25 @@
+<Project>
+
+    <ItemGroup>
+        <Using Include="$(RootNamespace).Properties"/>
+    </ItemGroup>
+
+    <!-- See Microsoft.Common.CurrentVersion.targets -->
+
+    <Target Name="GenerateResx" BeforeTargets="PrepareForBuild">
+
+        <GenerateResource Sources="@(EmbeddedResource)"
+                          ExecuteAsTool="false"
+                          StronglyTypedLanguage="C#"
+                          StronglyTypedClassName="%(Filename)"
+                          StronglyTypedNamespace="@(EmbeddedResource->'$(RootNamespace).Properties')"
+                          StronglyTypedFileName="@(EmbeddedResource->'%(RootDir)%(Directory)%(Filename).Designer.cs')"
+                          Condition="'%(EmbeddedResource.GenerateResource)' != 'false' and '%(EmbeddedResource.FileName)' == 'Resources'"
+                          PublicClass="false"
+                          MinimalRebuildFromTracking="false">
+            <Output TaskParameter="FilesWritten" ItemName="FileWrites"/>
+            <Output TaskParameter="StronglyTypedFileName" ItemName="Compile"/>
+            <Output TaskParameter="Sources" ItemName="_Temporary"/>
+        </GenerateResource>
+    </Target>
+</Project>
diff --git a/project.props b/project.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>8.1.9</Version>
+        <Version>8.1.10</Version>
         <Authors>damon</Authors>
         <Company>Nerosoft Ltd.</Company>
         <Product>Euonia</Product>