From a02a4f6e7914c3540f611b249528b7f35ae25835 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Mon, 20 May 2024 15:35:16 -0400 Subject: [PATCH] initial configuration --- EShopOnAbp.Aspire.sln | 92 ++++++++++++++ .../EShopOnAbp.PublicWeb.csproj | 4 + .../Properties/launchSettings.json | 1 - aspire/AppHost/Program.cs | 14 +++ aspire/AppHost/Properties/launchSettings.json | 30 +++++ aspire/AppHost/appsettings.Development.json | 8 ++ aspire/AppHost/appsettings.json | 9 ++ aspire/AppHost/eShopOnAbp.AppHost.csproj | 27 ++++ aspire/ServiceDefaults/Extensions.cs | 115 ++++++++++++++++++ .../eShopOnAbp.ServiceDefaults.csproj | 22 ++++ ....AdministrationService.HttpApi.Host.csproj | 4 + .../EShopOnAbp.BasketService.csproj | 10 +- ...opOnAbp.CatalogService.HttpApi.Host.csproj | 6 +- ...Abp.CmskitService.HttpApi.Host.abppkg.json | 1 - ...hopOnAbp.CmskitService.HttpApi.Host.csproj | 7 +- .../Properties/launchSettings.json | 1 - ...pOnAbp.IdentityService.HttpApi.Host.csproj | 4 + ...pOnAbp.OrderingService.HttpApi.Host.csproj | 4 + ...opOnAbp.PaymentService.HttpApi.Host.csproj | 4 + 19 files changed, 354 insertions(+), 9 deletions(-) create mode 100644 EShopOnAbp.Aspire.sln create mode 100644 aspire/AppHost/Program.cs create mode 100644 aspire/AppHost/Properties/launchSettings.json create mode 100644 aspire/AppHost/appsettings.Development.json create mode 100644 aspire/AppHost/appsettings.json create mode 100644 aspire/AppHost/eShopOnAbp.AppHost.csproj create mode 100644 aspire/ServiceDefaults/Extensions.cs create mode 100644 aspire/ServiceDefaults/eShopOnAbp.ServiceDefaults.csproj delete mode 100644 services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.abppkg.json diff --git a/EShopOnAbp.Aspire.sln b/EShopOnAbp.Aspire.sln new file mode 100644 index 00000000..cbd218da --- /dev/null +++ b/EShopOnAbp.Aspire.sln @@ -0,0 +1,92 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.0.0 +MinimumVisualStudioVersion = 17.8.0.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnAbp.AppHost", "aspire\AppHost\eShopOnAbp.AppHost.csproj", "{83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnAbp.ServiceDefaults", "aspire\ServiceDefaults\eShopOnAbp.ServiceDefaults.csproj", "{25F596CB-734B-4D22-BB9B-BF3FE4ED645C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "apps", "apps", "{224361D2-3869-4F9A-A882-2554036A98AF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "services", "services", "{0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.PublicWeb", "apps\public-web\src\EShopOnAbp.PublicWeb\EShopOnAbp.PublicWeb.csproj", "{FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.AdministrationService.HttpApi.Host", "services\administration\src\EShopOnAbp.AdministrationService.HttpApi.Host\EShopOnAbp.AdministrationService.HttpApi.Host.csproj", "{A630417B-1C25-4BAB-B1D3-22C627DF0008}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.IdentityService.HttpApi.Host", "services\identity\src\EShopOnAbp.IdentityService.HttpApi.Host\EShopOnAbp.IdentityService.HttpApi.Host.csproj", "{582CE0DB-2B91-4978-9AF8-B18C732D08B5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.BasketService", "services\basket\src\EShopOnAbp.BasketService\EShopOnAbp.BasketService.csproj", "{C6516D98-035B-4742-B3C8-B031455546DE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.CatalogService.HttpApi.Host", "services\catalog\src\EShopOnAbp.CatalogService.HttpApi.Host\EShopOnAbp.CatalogService.HttpApi.Host.csproj", "{E41F937A-0FE1-4E55-B449-CABF5D42A093}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.CmskitService.HttpApi.Host", "services\cmskit\src\EShopOnAbp.CmskitService.HttpApi.Host\EShopOnAbp.CmskitService.HttpApi.Host.csproj", "{C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.OrderingService.HttpApi.Host", "services\ordering\src\EShopOnAbp.OrderingService.HttpApi.Host\EShopOnAbp.OrderingService.HttpApi.Host.csproj", "{89A65776-2367-4855-8956-53322C2BF70B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EShopOnAbp.PaymentService.HttpApi.Host", "services\payment\src\EShopOnAbp.PaymentService.HttpApi.Host\EShopOnAbp.PaymentService.HttpApi.Host.csproj", "{2C55D527-4E09-4FD6-B4C6-7EFDD457358F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83E18AE5-35EF-4E3E-AB6F-C5A96F1FE7CF}.Release|Any CPU.Build.0 = Release|Any CPU + {25F596CB-734B-4D22-BB9B-BF3FE4ED645C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {25F596CB-734B-4D22-BB9B-BF3FE4ED645C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {25F596CB-734B-4D22-BB9B-BF3FE4ED645C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {25F596CB-734B-4D22-BB9B-BF3FE4ED645C}.Release|Any CPU.Build.0 = Release|Any CPU + {FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD9ECE3E-487B-4961-BEE9-3C26F866EAB2}.Release|Any CPU.Build.0 = Release|Any CPU + {A630417B-1C25-4BAB-B1D3-22C627DF0008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A630417B-1C25-4BAB-B1D3-22C627DF0008}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A630417B-1C25-4BAB-B1D3-22C627DF0008}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A630417B-1C25-4BAB-B1D3-22C627DF0008}.Release|Any CPU.Build.0 = Release|Any CPU + {582CE0DB-2B91-4978-9AF8-B18C732D08B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {582CE0DB-2B91-4978-9AF8-B18C732D08B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {582CE0DB-2B91-4978-9AF8-B18C732D08B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {582CE0DB-2B91-4978-9AF8-B18C732D08B5}.Release|Any CPU.Build.0 = Release|Any CPU + {C6516D98-035B-4742-B3C8-B031455546DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6516D98-035B-4742-B3C8-B031455546DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6516D98-035B-4742-B3C8-B031455546DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6516D98-035B-4742-B3C8-B031455546DE}.Release|Any CPU.Build.0 = Release|Any CPU + {E41F937A-0FE1-4E55-B449-CABF5D42A093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E41F937A-0FE1-4E55-B449-CABF5D42A093}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E41F937A-0FE1-4E55-B449-CABF5D42A093}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E41F937A-0FE1-4E55-B449-CABF5D42A093}.Release|Any CPU.Build.0 = Release|Any CPU + {C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C08FF8C8-354D-40EC-A80C-AFCE36A88DF9}.Release|Any CPU.Build.0 = Release|Any CPU + {89A65776-2367-4855-8956-53322C2BF70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89A65776-2367-4855-8956-53322C2BF70B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89A65776-2367-4855-8956-53322C2BF70B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89A65776-2367-4855-8956-53322C2BF70B}.Release|Any CPU.Build.0 = Release|Any CPU + {2C55D527-4E09-4FD6-B4C6-7EFDD457358F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C55D527-4E09-4FD6-B4C6-7EFDD457358F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C55D527-4E09-4FD6-B4C6-7EFDD457358F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C55D527-4E09-4FD6-B4C6-7EFDD457358F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9E214FFD-834E-4F69-ADAA-F97C7C74B243} + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {FD9ECE3E-487B-4961-BEE9-3C26F866EAB2} = {224361D2-3869-4F9A-A882-2554036A98AF} + {A630417B-1C25-4BAB-B1D3-22C627DF0008} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B} + {582CE0DB-2B91-4978-9AF8-B18C732D08B5} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B} + {C6516D98-035B-4742-B3C8-B031455546DE} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B} + {E41F937A-0FE1-4E55-B449-CABF5D42A093} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B} + {C08FF8C8-354D-40EC-A80C-AFCE36A88DF9} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B} + {89A65776-2367-4855-8956-53322C2BF70B} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B} + {2C55D527-4E09-4FD6-B4C6-7EFDD457358F} = {0B9A1A27-E4AC-4228-AE7A-FC2CEBE2AD7B} + EndGlobalSection +EndGlobal diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj index f65f7fa5..c20bebec 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbp.PublicWeb.csproj @@ -23,6 +23,10 @@ + + + + diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Properties/launchSettings.json b/apps/public-web/src/EShopOnAbp.PublicWeb/Properties/launchSettings.json index ae1648c0..77f72ea5 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Properties/launchSettings.json +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Properties/launchSettings.json @@ -17,7 +17,6 @@ }, "EShopOnAbp.PublicWeb": { "commandName": "Project", - "dotnetRunMessages": "true", "launchBrowser": true, "applicationUrl": "https://localhost:44335", "environmentVariables": { diff --git a/aspire/AppHost/Program.cs b/aspire/AppHost/Program.cs new file mode 100644 index 00000000..c6756e5e --- /dev/null +++ b/aspire/AppHost/Program.cs @@ -0,0 +1,14 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var administrationService = + builder.AddProject("administrationService"); +var identityService = builder.AddProject("identityService"); +var basketService = builder.AddProject("basketService"); +var catalogService = builder.AddProject("catalogService"); +var cmsKitService = builder.AddProject("cmsKitService"); +var orderingService = builder.AddProject("orderingService"); +var paymentService = builder.AddProject("paymentService"); + +// var publicWebApp = builder.AddProject("public-web"); + +builder.Build().Run(); diff --git a/aspire/AppHost/Properties/launchSettings.json b/aspire/AppHost/Properties/launchSettings.json new file mode 100644 index 00000000..d696dcc3 --- /dev/null +++ b/aspire/AppHost/Properties/launchSettings.json @@ -0,0 +1,30 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17286;http://localhost:15011", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21296", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22033" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15011", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19089", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20048", + "ASPIRE_ALLOW_UNSECURED_TRANSPORT": "true" + } + } + } +} diff --git a/aspire/AppHost/appsettings.Development.json b/aspire/AppHost/appsettings.Development.json new file mode 100644 index 00000000..0c208ae9 --- /dev/null +++ b/aspire/AppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/aspire/AppHost/appsettings.json b/aspire/AppHost/appsettings.json new file mode 100644 index 00000000..31c092aa --- /dev/null +++ b/aspire/AppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning", + "Aspire.Hosting.Dcp": "Warning" + } + } +} diff --git a/aspire/AppHost/eShopOnAbp.AppHost.csproj b/aspire/AppHost/eShopOnAbp.AppHost.csproj new file mode 100644 index 00000000..bfba2e20 --- /dev/null +++ b/aspire/AppHost/eShopOnAbp.AppHost.csproj @@ -0,0 +1,27 @@ + + + + Exe + net8.0 + enable + enable + true + 40d1d3f9-6593-4f5a-9d74-ff6ea82eb14e + + + + + + + + + + + + + + + + + + diff --git a/aspire/ServiceDefaults/Extensions.cs b/aspire/ServiceDefaults/Extensions.cs new file mode 100644 index 00000000..b6e80000 --- /dev/null +++ b/aspire/ServiceDefaults/Extensions.cs @@ -0,0 +1,115 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Diagnostics.HealthChecks; +using Microsoft.Extensions.Logging; +using OpenTelemetry; +using OpenTelemetry.Metrics; +using OpenTelemetry.Trace; + +namespace Microsoft.Extensions.Hosting; + +public static class Extensions +{ + public static IHostApplicationBuilder AddServiceDefaults(this IHostApplicationBuilder builder) + { + builder.ConfigureOpenTelemetry(); + + builder.AddDefaultHealthChecks(); + + builder.Services.AddServiceDiscovery(); + + builder.Services.ConfigureHttpClientDefaults(http => + { + // Turn on resilience by default + http.AddStandardResilienceHandler(); + + // Turn on service discovery by default + http.AddServiceDiscovery(); + }); + + return builder; + } + + public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicationBuilder builder) + { + builder.Logging.AddOpenTelemetry(logging => + { + logging.IncludeFormattedMessage = true; + logging.IncludeScopes = true; + }); + + builder.Services.AddOpenTelemetry() + .WithMetrics(metrics => + { + metrics.AddAspNetCoreInstrumentation() + .AddHttpClientInstrumentation() + .AddRuntimeInstrumentation(); + }) + .WithTracing(tracing => + { + tracing.AddAspNetCoreInstrumentation() + // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package) + //.AddGrpcClientInstrumentation() + .AddHttpClientInstrumentation(); + }); + + builder.AddOpenTelemetryExporters(); + + return builder; + } + + private static IHostApplicationBuilder AddOpenTelemetryExporters(this IHostApplicationBuilder builder) + { + var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]); + + if (useOtlpExporter) + { + builder.Services.AddOpenTelemetry().UseOtlpExporter(); + } + + // Uncomment the following lines to enable the Prometheus exporter (requires the OpenTelemetry.Exporter.Prometheus.AspNetCore package) + // builder.Services.AddOpenTelemetry() + // .WithMetrics(metrics => metrics.AddPrometheusExporter()); + + // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package) + //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"])) + //{ + // builder.Services.AddOpenTelemetry() + // .UseAzureMonitor(); + //} + + return builder; + } + + public static IHostApplicationBuilder AddDefaultHealthChecks(this IHostApplicationBuilder builder) + { + builder.Services.AddHealthChecks() + // Add a default liveness check to ensure app is responsive + .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); + + return builder; + } + + public static WebApplication MapDefaultEndpoints(this WebApplication app) + { + // Adding health checks endpoints to applications in non-development environments has security implications. + // See https://aka.ms/dotnet/aspire/healthchecks for details before enabling these endpoints in non-development environments. + if (app.Environment.IsDevelopment()) + { + // All health checks must pass for app to be considered ready to accept traffic after starting + app.MapHealthChecks("/health"); + + // Only health checks tagged with the "live" tag must pass for app to be considered alive + app.MapHealthChecks("/alive", new HealthCheckOptions + { + Predicate = r => r.Tags.Contains("live") + }); + + // Uncomment the following line to enable the Prometheus endpoint (requires the OpenTelemetry.Exporter.Prometheus.AspNetCore package) + // app.MapPrometheusScrapingEndpoint(); + } + + return app; + } +} diff --git a/aspire/ServiceDefaults/eShopOnAbp.ServiceDefaults.csproj b/aspire/ServiceDefaults/eShopOnAbp.ServiceDefaults.csproj new file mode 100644 index 00000000..f48299bb --- /dev/null +++ b/aspire/ServiceDefaults/eShopOnAbp.ServiceDefaults.csproj @@ -0,0 +1,22 @@ + + + + net8.0 + enable + enable + true + + + + + + + + + + + + + + + diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj index 394141c4..3186d290 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/EShopOnAbp.AdministrationService.HttpApi.Host.csproj @@ -17,6 +17,10 @@ + + + + diff --git a/services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj b/services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj index 866a430d..bdc90fe9 100644 --- a/services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj +++ b/services/basket/src/EShopOnAbp.BasketService/EShopOnAbp.BasketService.csproj @@ -9,9 +9,9 @@ - - - + + + @@ -24,6 +24,10 @@ + + + + diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj index 706f800e..3ffabfa3 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/EShopOnAbp.CatalogService.HttpApi.Host.csproj @@ -9,6 +9,10 @@ EShopOnAbp.CatalogService-4681b4fd-151f-4221-84a4-929d86723e4c + + + + @@ -20,7 +24,7 @@ - + diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.abppkg.json b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.abppkg.json deleted file mode 100644 index 9e26dfee..00000000 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj index 856c7143..6419e969 100644 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj +++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/EShopOnAbp.CmskitService.HttpApi.Host.csproj @@ -1,10 +1,9 @@  - - net8.0 EShopOnAbp.CmskitService + true @@ -14,6 +13,10 @@ + + + + diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json index 78cec03e..5c65b715 100644 --- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json +++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/Properties/launchSettings.json @@ -17,7 +17,6 @@ }, "EShopOnAbp.CmskitService.HttpApi.Host": { "commandName": "Project", - "dotnetRunMessages": "true", "launchBrowser": true, "applicationUrl": "https://localhost:44358", "environmentVariables": { diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj index 03de9037..a9abb121 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/EShopOnAbp.IdentityService.HttpApi.Host.csproj @@ -13,6 +13,10 @@ + + + + diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj index 5415c2bd..09445ca2 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/EShopOnAbp.OrderingService.HttpApi.Host.csproj @@ -14,6 +14,10 @@ + + + + diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj index b4607f89..bbd140c4 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj @@ -9,6 +9,10 @@ EShopOnAbp.PaymentService-c2d31439-b723-48e2-b061-5ebd7aeb6010 + + + +