feat(data): Add Global Configuration

Masa.Framework.sln

@@ -25,8 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution items", "solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E747043D-81E2-4A89-8B5B-1258ED45F941}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.EventBus.IntegrationTests", "test\Masa.EventBus.IntegrationTests\Masa.EventBus.IntegrationTests.csproj", "{BDA1DB4F-C408-445D-9391-EC9765CF7349}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication", "Authentication", "{585B9627-45AA-42C3-965D-03359F25786C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenIdConnect", "OpenIdConnect", "{CFC8DE12-A06F-46E2-890A-6EC9400F17DA}"
@@ -529,9 +527,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.UoW.EFCor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.UoW.EFCore.Tests", "src\Contrib\Data\UoW\Tests\Masa.Contrib.Data.UoW.EFCore.Tests\Masa.Contrib.Data.UoW.EFCore.Tests.csproj", "{8B19C9E6-002B-4DD4-8D80-9D092C3EA6E9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.IdGenerator.Snowflake.Tests.Perfs", "src\Contrib\Data\IdGenerator\Snowflake\Tests\Perfs\Tests.Perfs\Masa.Contrib.Data.IdGenerator.Snowflake.Tests.Perfs.csproj", "{B37640C5-3F96-4363-915C-0C2848004A05}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.IdGenerator.Snowflake.Tests.Perfs", "src\Contrib\Data\IdGenerator\Snowflake\Tests\Perfs\Tests.Perfs\Masa.Contrib.Data.IdGenerator.Snowflake.Tests.Perfs.csproj", "{B37640C5-3F96-4363-915C-0C2848004A05}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Contrib.Data.IdGenerator.Snowflake.Distributed.Redis.Tests.Perfs", "src\Contrib\Data\IdGenerator\Snowflake\Tests\Perfs\Distributed.Redis.Tests.Perfs\Masa.Contrib.Data.IdGenerator.Snowflake.Distributed.Redis.Tests.Perfs.csproj", "{9EA05A47-B28A-4CD1-8058-00A2098ED0C2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Data.IdGenerator.Snowflake.Distributed.Redis.Tests.Perfs", "src\Contrib\Data\IdGenerator\Snowflake\Tests\Perfs\Distributed.Redis.Tests.Perfs\Masa.Contrib.Data.IdGenerator.Snowflake.Distributed.Redis.Tests.Perfs.csproj", "{9EA05A47-B28A-4CD1-8058-00A2098ED0C2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Framework.IntegrationTests.EventBus", "test\Masa.Framework.IntegrationTests.EventBus\Masa.Framework.IntegrationTests.EventBus.csproj", "{A9EED08B-6C1E-4409-9874-AA7D34102519}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -541,14 +541,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349}.Debug|x64.Build.0 = Debug|Any CPU
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349}.Release|x64.ActiveCfg = Release|Any CPU
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349}.Release|x64.Build.0 = Release|Any CPU
 		{523EB315-1A01-4F13-9EDE-266FE8111AB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{523EB315-1A01-4F13-9EDE-266FE8111AB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{523EB315-1A01-4F13-9EDE-266FE8111AB6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1885,6 +1877,14 @@ Global
 		{9EA05A47-B28A-4CD1-8058-00A2098ED0C2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9EA05A47-B28A-4CD1-8058-00A2098ED0C2}.Release|x64.ActiveCfg = Release|Any CPU
 		{9EA05A47-B28A-4CD1-8058-00A2098ED0C2}.Release|x64.Build.0 = Release|Any CPU
+		{A9EED08B-6C1E-4409-9874-AA7D34102519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9EED08B-6C1E-4409-9874-AA7D34102519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9EED08B-6C1E-4409-9874-AA7D34102519}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A9EED08B-6C1E-4409-9874-AA7D34102519}.Debug|x64.Build.0 = Debug|Any CPU
+		{A9EED08B-6C1E-4409-9874-AA7D34102519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9EED08B-6C1E-4409-9874-AA7D34102519}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9EED08B-6C1E-4409-9874-AA7D34102519}.Release|x64.ActiveCfg = Release|Any CPU
+		{A9EED08B-6C1E-4409-9874-AA7D34102519}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1893,7 +1893,6 @@ Global
 		{DC578D74-98F0-4F19-A230-CFA8DAEE0AF1} = {B9256C4D-86F4-4E67-8774-C3EF971EC811}
 		{5944A182-13B8-4DA6-AEE2-0A01E64A9648} = {B9256C4D-86F4-4E67-8774-C3EF971EC811}
 		{950DA7D0-48C1-42BA-8E8F-F72C0DCE41C4} = {B9256C4D-86F4-4E67-8774-C3EF971EC811}
-		{BDA1DB4F-C408-445D-9391-EC9765CF7349} = {E747043D-81E2-4A89-8B5B-1258ED45F941}
 		{585B9627-45AA-42C3-965D-03359F25786C} = {DC578D74-98F0-4F19-A230-CFA8DAEE0AF1}
 		{CFC8DE12-A06F-46E2-890A-6EC9400F17DA} = {585B9627-45AA-42C3-965D-03359F25786C}
 		{87BBAEC2-1A18-4E5D-BDB3-91BF1CF3231B} = {DC578D74-98F0-4F19-A230-CFA8DAEE0AF1}
@@ -2048,6 +2047,7 @@ Global
 		{11B1DF36-97DC-4928-BED2-A51BDDFE0AEF} = {E676BB35-7888-4FCD-9AFA-E46848639074}
 		{D77D8E17-6D1C-4E44-AF18-D572F12745BA} = {E676BB35-7888-4FCD-9AFA-E46848639074}
 		{3167F949-F6F4-4440-97CD-2EC7B785D9E8} = {FFEF958B-DA21-4552-86B6-87D9592A3668}
+		{A00D752B-65C8-404A-8397-82DB5613884E} = {FFEF958B-DA21-4552-86B6-87D9592A3668}
 		{17B751BF-DB79-46B0-A61E-BB8A52919AC9} = {FFEF958B-DA21-4552-86B6-87D9592A3668}
 		{0457B5A1-02D7-44FF-8FE6-468A456E2909} = {17B751BF-DB79-46B0-A61E-BB8A52919AC9}
 		{55DCA34D-48CE-4D32-8515-B6583FA548AE} = {17B751BF-DB79-46B0-A61E-BB8A52919AC9}
@@ -2144,9 +2144,9 @@ Global
 		{979FBAA7-EC54-4183-B2A7-3C5BE5510F16} = {83E5A183-56D6-4CAC-95A6-FB280AA7AE3D}
 		{44DB6ED1-71DC-487B-8DD7-3F872CB23254} = {E8B3FB42-C450-4B12-9C2C-7B9A02B616BB}
 		{8B19C9E6-002B-4DD4-8D80-9D092C3EA6E9} = {627DAA58-5882-4C65-B7A1-AE16AA91E1DE}
-		{A00D752B-65C8-404A-8397-82DB5613884E} = {FFEF958B-DA21-4552-86B6-87D9592A3668}
 		{B37640C5-3F96-4363-915C-0C2848004A05} = {55DCA34D-48CE-4D32-8515-B6583FA548AE}
 		{9EA05A47-B28A-4CD1-8058-00A2098ED0C2} = {55DCA34D-48CE-4D32-8515-B6583FA548AE}
+		{A9EED08B-6C1E-4409-9874-AA7D34102519} = {E747043D-81E2-4A89-8B5B-1258ED45F941}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {40383055-CC50-4600-AD9A-53C14F620D03}

src/BuildingBlocks/Configuration/Masa.BuildingBlocks.Configuration/Options/MasaAppConfigureOptions.cs

@@ -0,0 +1,22 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.Configuration.Options;
+
+public class MasaAppConfigureOptions
+{
+    public string AppId { get => GetValue(nameof(AppId)); set => Data[nameof(AppId)] = value; }
+
+    public string Environment { get => GetValue(nameof(Environment)); set => Data[nameof(Environment)] = value; }
+
+    public string Cluster { get => GetValue(nameof(Cluster)); set => Data[nameof(Cluster)] = value; }
+
+    public Dictionary<string, string> Data { get; set; } = new();
+
+    private string GetValue(string key)
+    {
+        if (Data.ContainsKey(key)) return Data[key];
+
+        return string.Empty;
+    }
+}

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data.UoW/_Imports.cs

@@ -1,6 +1,5 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-global using Masa.BuildingBlocks.Data.Options;
 global using System.Data.Common;
 global using System.Text.Json.Serialization;

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Options/MasaDbContextConfigurationOptions.cs

@@ -1,7 +1,7 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.BuildingBlocks.Data.Options;
+namespace Masa.BuildingBlocks.Data;
 
 public class MasaDbContextConfigurationOptions
 {

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/_Imports.cs

@@ -1,5 +1,4 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-global using Masa.BuildingBlocks.Data.Options;
 global using System.Reflection;

src/Contrib/Configuration/Masa.Contrib.Configuration/MasaConfigurationExtensions.cs → src/Contrib/Configuration/Masa.Contrib.Configuration/Extensions/MasaConfigurationBuilderExtensions.cs

@@ -3,7 +3,7 @@
 
 namespace Masa.Contrib.Configuration;
 
-public static class MasaConfigurationExtensions
+public static class MasaConfigurationBuilderExtensions
 {
     public static void UseMasaOptions(this IMasaConfigurationBuilder builder, Action<MasaRelationOptions> options)
     {

src/Contrib/Configuration/Masa.Contrib.Configuration/WebApplicationBuilderExtensions.cs → src/Contrib/Configuration/Masa.Contrib.Configuration/Extensions/WebApplicationBuilderExtensions.cs

@@ -5,6 +5,46 @@ namespace Microsoft.AspNetCore.Builder;
 
 public static class WebApplicationBuilderExtensions
 {
+    public static WebApplicationBuilder InitializeAppConfiguration(this WebApplicationBuilder builder)
+        => builder.InitializeAppConfiguration(null);
+
+    public static WebApplicationBuilder InitializeAppConfiguration(
+        this WebApplicationBuilder builder,
+        Action<MasaAppConfigureOptionsRelation>? action)
+    {
+        if (builder.Services.Any(service => service.ImplementationType == typeof(InitializeAppConfigurationProvider)))
+            return builder;
+
+        builder.Services.AddSingleton<InitializeAppConfigurationProvider>();
+
+        MasaAppConfigureOptionsRelation optionsRelation = new();
+        action?.Invoke(optionsRelation);
+        IConfiguration configuration = builder.Configuration;
+        bool initialized = false;
+        builder.Services.Configure<MasaAppConfigureOptions>(options =>
+        {
+            if (!initialized)
+            {
+                var masaConfiguration = builder.Services.BuildServiceProvider().GetService<IMasaConfiguration>();
+                if (masaConfiguration != null) configuration = masaConfiguration.Local;
+                initialized = true;
+            }
+
+            if (string.IsNullOrWhiteSpace(options.AppId))
+                options.AppId = configuration.GetConfigurationValue(optionsRelation.Data[nameof(options.AppId)].Variable,
+                    () => optionsRelation.Data[nameof(options.AppId)].DefaultValue);
+
+            if (string.IsNullOrWhiteSpace(options.Environment))
+                options.Environment = configuration.GetConfigurationValue(optionsRelation.Data[nameof(options.Environment)].Variable,
+                    () => optionsRelation.Data[nameof(options.Environment)].DefaultValue);
+
+            if (string.IsNullOrWhiteSpace(options.Cluster))
+                options.Cluster = configuration.GetConfigurationValue(optionsRelation.Data[nameof(options.Cluster)].Variable,
+                    () => optionsRelation.Data[nameof(options.Cluster)].DefaultValue);
+        });
+        return builder;
+    }
+
     public static WebApplicationBuilder AddMasaConfiguration(
         this WebApplicationBuilder builder,
         Action<IMasaConfigurationBuilder>? configureDelegate = null)
@@ -38,6 +78,8 @@ public static WebApplicationBuilder AddMasaConfiguration(
         Action<IMasaConfigurationBuilder>? configureDelegate,
         Action<ConfigurationOptions>? action)
     {
+        builder.InitializeAppConfiguration();
+
         IConfigurationRoot masaConfiguration =
             builder.Services.CreateMasaConfiguration(
                 configureDelegate,
@@ -57,4 +99,9 @@ public static WebApplicationBuilder AddMasaConfiguration(
 
     public static IMasaConfiguration GetMasaConfiguration(this WebApplicationBuilder builder)
         => builder.Services.BuildServiceProvider().GetRequiredService<IMasaConfiguration>();
+
+    private class InitializeAppConfigurationProvider
+    {
+
+    }
 }

src/Contrib/Configuration/Masa.Contrib.Configuration/Internal/ConfigurationExtensions.cs

@@ -28,4 +28,10 @@ public static IConfigurationBuilder AddRange(this IConfigurationBuilder configur
             configurationBuilder.Add(configurationSource);
         return configurationBuilder;
     }
+
+    public static string GetConfigurationValue(this IConfiguration configuration, string key, Func<string> func)
+    {
+        var configurationValue = configuration[key];
+        return string.IsNullOrWhiteSpace(configurationValue) ? func() : configurationValue;
+    }
 }

src/Contrib/Configuration/Masa.Contrib.Configuration/Options/MasaAppConfigureOptionsRelation.cs

@@ -0,0 +1,29 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.Configuration.Options;
+
+public class MasaAppConfigureOptionsRelation
+{
+    public Dictionary<string, (string Variable, string DefaultValue)> Data { get; set; }
+
+    public MasaAppConfigureOptionsRelation()
+    {
+        Data = new Dictionary<string, (string Variable, string DefaultValue)>()
+        {
+            {
+                nameof(MasaAppConfigureOptions.AppId),
+                (nameof(MasaAppConfigureOptions.AppId),
+                    (Assembly.GetEntryAssembly() ?? Assembly.GetCallingAssembly()).GetName().Name!.Replace(".", "-"))
+            },
+            {
+                nameof(MasaAppConfigureOptions.Environment),
+                ("ASPNETCORE_ENVIRONMENT", "Production")
+            },
+            {
+                nameof(MasaAppConfigureOptions.Cluster),
+                (nameof(MasaAppConfigureOptions.Cluster), "Default")
+            }
+        };
+    }
+}

src/Contrib/Configuration/Tests/Masa.Contrib.Configuration.Tests/WebApplicationBuilderTest.cs

@@ -0,0 +1,26 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.Contrib.Configuration.Tests;
+
+[TestClass]
+public class WebApplicationBuilderTest
+{
+    [TestMethod]
+    public void TestInitializeAppConfiguration()
+    {
+        var builder = WebApplication.CreateBuilder();
+        string env = "Development";
+        builder.Services.Configure<MasaAppConfigureOptions>(options =>
+        {
+            options.Environment = env;
+        });
+        builder.InitializeAppConfiguration();
+        var serviceProvider = builder.Services.BuildServiceProvider();
+        var masaAppConfigureOptions = serviceProvider.GetService<IOptions<MasaAppConfigureOptions>>()!;
+
+        Assert.IsTrue(masaAppConfigureOptions.Value.Data.Count == 3);
+        Assert.IsTrue(masaAppConfigureOptions.Value.Environment == env);
+        Assert.IsTrue(masaAppConfigureOptions.Value.Data[nameof(MasaAppConfigureOptions.Environment)] == env);
+    }
+}

src/Contrib/Configuration/Tests/Masa.Contrib.Configuration.Tests/_Imports.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Configuration;
+global using Masa.BuildingBlocks.Configuration.Options;
 global using Masa.Contrib.Configuration.Tests.Config;
 global using Masa.Contrib.Configuration.Tests.Scenes.AutoMap;
 global using Masa.Contrib.Configuration.Tests.Scenes.NoLessConstructor;

src/Contrib/Data/Orm/EFCore/Masa.Contrib.Data.EFCore/_Imports.cs

@@ -5,7 +5,6 @@
 global using Masa.BuildingBlocks.Configuration;
 global using Masa.BuildingBlocks.Data;
 global using Masa.BuildingBlocks.Data.Contracts.DataFiltering;
-global using Masa.BuildingBlocks.Data.Options;
 global using Masa.BuildingBlocks.Ddd.Domain.Entities;
 global using Masa.BuildingBlocks.Ddd.Domain.Entities.Auditing;
 global using Masa.BuildingBlocks.Ddd.Domain.Events;

src/Contrib/Data/UoW/Masa.Contrib.Data.UoW.EFCore/_Imports.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Data;
-global using Masa.BuildingBlocks.Data.Options;
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Ddd.Domain.Events;
 global using Masa.BuildingBlocks.Dispatcher.Events;

src/Contrib/Data/UoW/Tests/Masa.Contrib.Data.UoW.EFCore.Tests/_Imports.cs

@@ -3,7 +3,6 @@
 
 global using Masa.BuildingBlocks.Configuration;
 global using Masa.BuildingBlocks.Data;
-global using Masa.BuildingBlocks.Data.Options;
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.Contrib.Data.EFCore;

src/Contrib/Dispatcher/IntegrationEvents/Tests/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests/_Imports.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Data;
-global using Masa.BuildingBlocks.Data.Options;
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Dispatcher.IntegrationEvents;

src/Contrib/Dispatcher/IntegrationEvents/Tests/Masa.Contrib.Dispatcher.IntegrationEvents.Tests/_Imports.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Data;
-global using Masa.BuildingBlocks.Data.Options;
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Dispatcher.IntegrationEvents;

src/Contrib/Isolation/Masa.Contrib.Isolation/_Imports.cs

@@ -3,7 +3,6 @@
 
 global using Masa.BuildingBlocks.Configuration;
 global using Masa.BuildingBlocks.Data;
-global using Masa.BuildingBlocks.Data.Options;
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Isolation;

src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.Tests/UnitOfWorkAccessor.cs

@@ -1,8 +1,6 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-using Masa.BuildingBlocks.Data.Options;
-
 namespace Masa.Contrib.Isolation.Tests;
 
 public class UnitOfWorkAccessor: IUnitOfWorkAccessor

src/Contrib/Isolation/Tests/Masa.Contrib.Isolation.Tests/_Imports.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 global using Masa.BuildingBlocks.Data;
-global using Masa.BuildingBlocks.Data.Options;
 global using Masa.BuildingBlocks.Data.UoW;
 global using Masa.BuildingBlocks.Dispatcher.Events;
 global using Masa.BuildingBlocks.Isolation.Environment;

src/Utils/Development/Dapr/Masa.Utils.Development.Dapr.AspNetCore/Masa.Utils.Development.Dapr.AspNetCore.csproj

@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App"/>
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Masa.Utils.Development.Dapr\Masa.Utils.Development.Dapr.csproj" />
+    <ProjectReference Include="..\Masa.Utils.Development.Dapr\Masa.Utils.Development.Dapr.csproj"/>
   </ItemGroup>
+
 </Project>

src/Utils/Models/Masa.Utils.Models.Config/AppConfig.cs

@@ -1,8 +1,8 @@
-
-// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 namespace Masa.Utils.Models.Config;
+
 public class AppConfig
 {
     public string AppId { get; set; } = string.Empty;

src/Utils/Models/Masa.Utils.Models.Config/_Imports.cs

@@ -0,0 +1,4 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+global using System.Reflection;

test/Masa.EventBus.IntegrationTests/Application/Command/RegisterUserCommand.cs → test/Masa.Framework.IntegrationTests.EventBus/Application/Command/RegisterUserCommand.cs

@@ -1,7 +1,7 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.EventBus.IntegrationTests.Application.Command;
+namespace Masa.Framework.IntegrationTests.EventBus.Application.Command;
 
 public record RegisterUserCommand : BuildingBlocks.ReadWriteSpliting.Cqrs.Commands.Command
 {

test/Masa.EventBus.IntegrationTests/Application/Events/AddGoodsIntegrationEvent.cs → test/Masa.Framework.IntegrationTests.EventBus/Application/Events/AddGoodsIntegrationEvent.cs

@@ -1,7 +1,7 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
-namespace Masa.EventBus.IntegrationTests.Application.Events;
+namespace Masa.Framework.IntegrationTests.EventBus.Application.Events;
 
 public record AddGoodsIntegrationEvent : IntegrationEvent
 {