Merge pull request #22 from netcorepal/update-framework

使用最新的框架版本，修复一些break change的影响
netcorepal · Nov 12, 2024 · 7432491 · 7432491
2 parents a487022 + 210ad1e
commit 7432491
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/template/Directory.Build.targets b/template/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <NetCorePalVersion>2.0.0-preview.1.2409071627</NetCorePalVersion>
+    <NetCorePalVersion>2.0.0-preview.1.2411120955</NetCorePalVersion>
     <FrameworkVersion>8.0.0</FrameworkVersion>
     <ExtensionsVersion>8.0.0</ExtensionsVersion>
     <EntityFrameworkVersion>8.0.0</EntityFrameworkVersion>

diff --git a/template/src/ABC.Template.Web/Controllers/DemoController.cs b/template/src/ABC.Template.Web/Controllers/DemoController.cs
@@ -7,6 +7,7 @@
 using NetCorePal.Extensions.DistributedLocks;
 using NetCorePal.Extensions.DistributedTransactions;
 using NetCorePal.Extensions.Domain;
+using NetCorePal.Extensions.Dto;
 using NetCorePal.Extensions.Primitives;
 
 namespace ABC.Template.Web.Controllers

diff --git a/template/src/ABC.Template.Web/Controllers/OrderController.cs b/template/src/ABC.Template.Web/Controllers/OrderController.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using NetCorePal.Extensions.DistributedTransactions.Sagas;
 using NetCorePal.Extensions.Domain;
+using NetCorePal.Extensions.Dto;
 
 namespace ABC.Template.Web.Controllers;
 

diff --git a/template/src/ABC.Template.Web/Program.cs b/template/src/ABC.Template.Web/Program.cs
@@ -130,7 +130,7 @@
         .AddIIntegrationEventConverter(typeof(Program))
         .UseCap(typeof(Program))
         .AddContextIntegrationFilters()
-        .AddEnvIntegrationFilters();
+        .AddEnvIntegrationFilters(envOption => envOption.ServiceName = "Abc.Template");
     builder.Services.AddCap(x =>
     {
         x.JsonSerializerOptions.Converters.Add(new EntityIdJsonConverterFactory());
@@ -140,7 +140,7 @@
     });
 
     #endregion
-    
+
     builder.Services.AddMediatR(cfg =>
         cfg.RegisterServicesFromAssemblies(Assembly.GetExecutingAssembly())
             .AddKnownExceptionValidationBehavior()

diff --git a/template/test/ABC.Template.Web.Tests/DemoTests.cs b/template/test/ABC.Template.Web.Tests/DemoTests.cs
@@ -1,9 +1,11 @@
 using ABC.Template.Infrastructure;
 using ABC.Template.Web.Controllers;
+using ABC.Template.Web.Tests.Extensions;
 using Microsoft.EntityFrameworkCore;
 using Moq;
 using NetCorePal.Context;
 using NetCorePal.Extensions.AspNetCore;
+using NetCorePal.Extensions.Dto;
 
 namespace ABC.Template.Web.Tests
 {