v3.2.696 #1510 #1515 #1519 #1427 #1521 #1393

Author: 2881099

Directory.Build.props

@@ -11,7 +11,7 @@
 	<!--
 	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
 	<PropertyGroup>
-		<Version>3.2.696-preview20230524</Version>
+		<Version>3.2.696</Version>
 	</PropertyGroup>
 	-->
 

Examples/aspnetcore_transaction/Controllers/HomeController.cs

@@ -34,12 +34,12 @@ public async Task<object> Get([FromServices] BaseRepository<Song> repoSong, [Fro
         }
 
         [HttpGet("2")]
-        //[Transactional]
+        [Transactional]
         public async Task<object> GetAsync([FromServices] BaseRepository<Song> repoSong, [FromServices] BaseRepository<Detail> repoDetail, [FromServices] SongRepository repoSong2,
            [FromServices] SongService serviceSong)
         {
-            await serviceSong.Test2();
-            await serviceSong.Test3();
+            await repoSong.InsertAsync(new Song());
+            await repoDetail.InsertAsync(new Detail());
             return "111";
         }
     }

Examples/aspnetcore_transaction/Program.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace aspnetcore_transaction
 {
@@ -12,6 +13,11 @@ public static void Main(string[] args)
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
+                .ConfigureLogging(loggerBuilder =>
+                {
+                    loggerBuilder.SetMinimumLevel(LogLevel.Critical);
+                    //loggerBuilder.ClearProviders();
+                })
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();

Examples/aspnetcore_transaction/Startup.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using aspnetcore_transaction.Controllers;
 using FreeSql;
 using Microsoft.AspNetCore.Builder;
@@ -17,21 +18,27 @@ public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
             Fsql = new FreeSqlBuilder()
-                 .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\test_trans.db")
+                .UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=50;TrustServerCertificate=true")
                  .UseAutoSyncStructure(true)
-                 .UseMonitorCommand(cmd => Trace.WriteLine(cmd.CommandText))
+                 //.UseMonitorCommand(cmd => Trace.WriteLine(cmd.CommandText))
                  .UseNoneCommandParameter(true)
                  .Build();
 
-            Fsql.Aop.TraceBefore += (_, e) => Trace.WriteLine($"----TraceBefore---{e.Identifier} {e.Operation}");
-            Fsql.Aop.TraceAfter += (_, e) => Trace.WriteLine($"----TraceAfter---{e.Identifier} {e.Operation} {e.Remark} {e.Exception?.Message} {e.ElapsedMilliseconds}ms\r\n");
+            //Fsql.Aop.TraceBefore += (_, e) => Trace.WriteLine($"----TraceBefore---{e.Identifier} {e.Operation}");
+            Fsql.Aop.TraceAfter += (_, e) =>
+            {
+                //Trace.WriteLine($"----TraceAfter---{e.Identifier} {e.Operation} {e.Remark} {e.Exception?.Message} {e.ElapsedMilliseconds}ms\r\n");
+                if (e.Exception != null && e.Exception.Message.StartsWith("【主库】状态不可用，等待后台检查程序恢复方可使用。") == false) Console.WriteLine(e.Exception.Message + "    ===   " + Fsql.Ado.MasterPool.Statistics);
+            };
         }
 
         public IConfiguration Configuration { get; }
         public static IFreeSql Fsql { get; private set; }
 
         public void ConfigureServices(IServiceCollection services)
         {
+            ThreadPool.SetMinThreads(1000, 1000);
+            
             services.AddControllersWithViews();
 
             services.AddSingleton<IFreeSql>(Fsql);

Examples/aspnetcore_transaction/TransactionalAttribute.cs

@@ -38,6 +38,7 @@ void _OnExit()
                     if (context.Exception == null) _uow.Commit();
                     else _uow.Rollback();
                 }
+                catch { }
                 finally
                 {
                     _uow.Dispose();

Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.696-preview20230524</Version>
+		<Version>3.2.696</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

@@ -19,7 +19,7 @@
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
 		<LangVersion>latest</LangVersion>
-		<Version>3.2.696-preview20230524</Version>
+		<Version>3.2.696</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.696-preview20230524</Version>
+		<Version>3.2.696</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.696-preview20230524</Version>
+		<Version>3.2.696</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.696-preview20230524</Version>
+		<Version>3.2.696</Version>
 	</PropertyGroup>
 
 	<ItemGroup>