diff --git a/Atomx.Admin.Tests/Atomx.Admin.Tests.csproj b/Atomx.Admin.Tests/Atomx.Admin.Tests.csproj index 4156292..cfa8147 100644 --- a/Atomx.Admin.Tests/Atomx.Admin.Tests.csproj +++ b/Atomx.Admin.Tests/Atomx.Admin.Tests.csproj @@ -7,4 +7,16 @@ enable + + + + + + + + + + + + diff --git a/Atomx.Admin/Atomx.Admin.Client/Atomx.Admin.Client.csproj b/Atomx.Admin/Atomx.Admin.Client/Atomx.Admin.Client.csproj index 9a1ffb5..0c18632 100644 --- a/Atomx.Admin/Atomx.Admin.Client/Atomx.Admin.Client.csproj +++ b/Atomx.Admin/Atomx.Admin.Client/Atomx.Admin.Client.csproj @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/Atomx.Admin/Atomx.Admin/Atomx.Admin.csproj b/Atomx.Admin/Atomx.Admin/Atomx.Admin.csproj index 367211d..75396aa 100644 --- a/Atomx.Admin/Atomx.Admin/Atomx.Admin.csproj +++ b/Atomx.Admin/Atomx.Admin/Atomx.Admin.csproj @@ -21,21 +21,20 @@ - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - - - diff --git a/Atomx.Core/Atomx.Core.csproj b/Atomx.Core/Atomx.Core.csproj new file mode 100644 index 0000000..4457545 --- /dev/null +++ b/Atomx.Core/Atomx.Core.csproj @@ -0,0 +1,23 @@ + + + + net10.0 + enable + enable + + + + + + + + + + + + + + + + + diff --git a/Atomx.Core/Class1.cs b/Atomx.Core/Class1.cs new file mode 100644 index 0000000..6fdbcd0 --- /dev/null +++ b/Atomx.Core/Class1.cs @@ -0,0 +1,7 @@ +namespace Atomx.Core +{ + public class Class1 + { + + } +} diff --git a/Atomx.Core/Extensions/CoreServiceCollectionExtensions.cs b/Atomx.Core/Extensions/CoreServiceCollectionExtensions.cs new file mode 100644 index 0000000..18e1a22 --- /dev/null +++ b/Atomx.Core/Extensions/CoreServiceCollectionExtensions.cs @@ -0,0 +1,15 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; + +namespace Atomx.Core.Extensions +{ + public static class CoreServiceCollectionExtensions + { + public static IServiceCollection AddCoreServices( + this IServiceCollection services, + IConfiguration configuration) + { // Add core services here + return services; + } + } +} diff --git a/Atomx.WebAPI/Grains/UserGrain.cs b/Atomx.Core/Grains/UserGrain.cs similarity index 90% rename from Atomx.WebAPI/Grains/UserGrain.cs rename to Atomx.Core/Grains/UserGrain.cs index 7d9d1ff..bb9dd9c 100644 --- a/Atomx.WebAPI/Grains/UserGrain.cs +++ b/Atomx.Core/Grains/UserGrain.cs @@ -1,8 +1,10 @@ using Atomx.Common.Entities; using Atomx.Data; +using Microsoft.Extensions.Logging; -namespace Atomx.WebAPI.Grains +namespace Atomx.Core.Grains { + public interface IUserGrain : IGrainWithIntegerKey { Task GetUserByName(string name); diff --git a/Atomx.Core/Jos/LocalizationJobs.cs b/Atomx.Core/Jos/LocalizationJobs.cs new file mode 100644 index 0000000..4f0226c --- /dev/null +++ b/Atomx.Core/Jos/LocalizationJobs.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Atomx.Core.Jos +{ + /// + /// 多语言本地化任务 + /// + public class LocalizationJobs + { + } +} diff --git a/Atomx.Data/Atomx.Data.csproj b/Atomx.Data/Atomx.Data.csproj index 3167e2d..b77772c 100644 --- a/Atomx.Data/Atomx.Data.csproj +++ b/Atomx.Data/Atomx.Data.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/Atomx.Storage/Atomx.Storage.csproj b/Atomx.Storage/Atomx.Storage.csproj index 75611c9..9f0f648 100644 --- a/Atomx.Storage/Atomx.Storage.csproj +++ b/Atomx.Storage/Atomx.Storage.csproj @@ -8,7 +8,7 @@ - + diff --git a/Atomx.Utils/Atomx.Utils.csproj b/Atomx.Utils/Atomx.Utils.csproj index b26e6b8..67e6c50 100644 --- a/Atomx.Utils/Atomx.Utils.csproj +++ b/Atomx.Utils/Atomx.Utils.csproj @@ -9,7 +9,7 @@ - + diff --git a/Atomx.WebAPI/Atomx.WebAPI.csproj b/Atomx.WebAPI/Atomx.WebAPI.csproj index e5179f2..5f20210 100644 --- a/Atomx.WebAPI/Atomx.WebAPI.csproj +++ b/Atomx.WebAPI/Atomx.WebAPI.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -7,9 +7,10 @@ - - - + + + + diff --git a/Atomx.sln b/Atomx.sln index 2ab5c18..2bb393d 100644 --- a/Atomx.sln +++ b/Atomx.sln @@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atomx.WebAPI", "Atomx.WebAP EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atomx.Admin.Tests", "Atomx.Admin.Tests\Atomx.Admin.Tests.csproj", "{23D52214-1385-4268-AC99-9853E15E7A91}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atomx.Core", "Atomx.Core\Atomx.Core.csproj", "{84D9BE1C-0077-452A-BE7E-EA25FC38FE70}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,6 +59,10 @@ Global {23D52214-1385-4268-AC99-9853E15E7A91}.Debug|Any CPU.Build.0 = Debug|Any CPU {23D52214-1385-4268-AC99-9853E15E7A91}.Release|Any CPU.ActiveCfg = Release|Any CPU {23D52214-1385-4268-AC99-9853E15E7A91}.Release|Any CPU.Build.0 = Release|Any CPU + {84D9BE1C-0077-452A-BE7E-EA25FC38FE70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84D9BE1C-0077-452A-BE7E-EA25FC38FE70}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84D9BE1C-0077-452A-BE7E-EA25FC38FE70}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84D9BE1C-0077-452A-BE7E-EA25FC38FE70}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE