Merge remote-tracking branch 'upstream/master'

Author: densen2014

.editorconfig

@@ -5,3 +5,8 @@ dotnet_analyzer_diagnostic.category-Style.severity = none
 
 # CS0649: 从未对字段“TransactionalAttribute._uowManager”赋值，字段将一直保持其默认值 null
 dotnet_diagnostic.CS0649.severity = none
+
+# CS8618: 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑声明为可以为 null。
+dotnet_diagnostic.CS8618.severity = none
+
+charset = utf-8-bom

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,31 @@
+---
+name: "Bug Report 🐛"
+about: 这里只能提交 Bug，提交其他无关信息会被关闭
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+<!-- 
+以下为必读项，不仔细阅读会导致你的 Issue 被关闭
+
+1. 该分类下只能提交 Bug，如果要询问使用方法等，请前往讨论区：https://github.com/dotnetcore/FreeSql/discussions
+2. FreeSql写了许多文档，在提问题前，麻烦先查看[常见问题](https://freesql.net/reference/faq.html) 
+3. 不完整的信息将不会得到任何回复！发布问题后，请保持对 issue 的关注，有时会有需要进一步沟通的信息，很长时间内没有得到答复的 issue 将被关闭。
+4. 提供可重现的代码，至少应描述以下信息 -->
+
+#### 问题描述及重现代码：
+
+```c#
+// c# code
+```
+
+#### 数据库版本
+
+
+#### 安装的Nuget包
+
+
+#### .net framework/. net core？ 及具体版本
+

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,33 @@
+---
+name: "Feature Request 🚀"
+about: 这里只能提交 Feature 请求，提交其他无关信息会被关闭
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+<!-- 
+以下为必读项，不仔细阅读会导致你的 Issue 被关闭
+
+1. 该分类下只能提交 Feature，如果要询问使用方法等，请前往讨论区：https://github.com/dotnetcore/FreeSql/discussions
+2. 请尽量详细的描述清楚你的需求
+-->
+
+#### Feature 特性
+
+```c#
+// c# code
+```
+
+#### 简要描述原因
+
+```c#
+// c# code
+```
+
+#### 使用场景
+
+```c#
+// c# code
+```

.github/workflows/docfx.yml

@@ -1,50 +1,33 @@
-name: .NET Core Deploy Docfx
+name: Docfx Deploy
 
 on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
+   workflow_dispatch:
+   push:
+     branches: [master]
+   
 jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.202
-    - name: Exclude example projects
-      run:  dotnet sln FreeSql.sln remove Examples/**/*.csproj FreeSql.Tests/**/*.csproj
-    - name: Install dependencies
-      run: dotnet restore
-    - name: Build solution
-      run: dotnet build --configuration Release --no-restore
-    
   generate-docs:
     runs-on: windows-latest
-    needs: build
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.202
+        with: 
+          dotnet-version: 7.0.x
       - name: Remove Examples
         run: dotnet sln FreeSql.sln remove (ls -r Examples/**/*.csproj)
       - name: Remove FreeSql.Tests 
         run:  dotnet sln FreeSql.sln remove (ls -r FreeSql.Tests/**/*.csproj)
       - name: Install dependencies
-        run:  dotnet restore
+        run:  dotnet restore .\FreeSql.sln
+      - name: Build solution
+        run: dotnet build --configuration Release --no-restore .\FreeSql.sln
       - name: Setup DocFX
         uses: crazy-max/ghaction-chocolatey@v1
         with:
-          args: install docfx --version 2.56.7
+          args: install docfx 
       - name: DocFX Build
         working-directory: docs
         run: docfx docfx.json

Directory.Build.props

@@ -1,12 +1,21 @@
-<Project>
-
+<Project>
 	<PropertyGroup>
 		<RepositoryUrl>https://github.com/dotnetcore/FreeSql</RepositoryUrl>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+		<NoWarn>1701;1702;CS1573;CS8600;CS8601;CS8602;CS8603;CS8604;CS8605;CS8618;CS8619;CS8620;CS8622;CS8625;CS8629;CS8714;CS1591;CS0649;CA2200</NoWarn>
 	</PropertyGroup>
 
+	<!--
+	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
+	<PropertyGroup>
+		<Version>3.5.210-preview20250626</Version>
+	</PropertyGroup>
+	-->
+	
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
 	</ItemGroup>

Examples/aspnetcore_transaction/123.db

@@ -1,13 +1,10 @@
-using FreeSql;
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using FreeSql;
 using FreeSql.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace aspnetcore_transaction.Controllers
 {
@@ -24,24 +21,25 @@ public HomeController(ILogger<HomeController> logger)
 
         [HttpGet("1")]
         //[Transactional]
-        virtual public object Get([FromServices] BaseRepository<Song> repoSong, [FromServices] BaseRepository<Detail> repoDetail, [FromServices] SongRepository repoSong2,
+        public async Task<object> Get([FromServices] BaseRepository<Song> repoSong, [FromServices] BaseRepository<Detail> repoDetail, [FromServices] SongRepository repoSong2,
             [FromServices] SongService serviceSong)
         {
             //repoSong.Insert(new Song());
             //repoDetail.Insert(new Detail());
             //repoSong2.Insert(new Song());
 
-            serviceSong.Test1();
+            //serviceSong.Test1();
+            await serviceSong.Test11();
             return "111";
         }
 
         [HttpGet("2")]
-        //[Transactional]
-        async virtual public Task<object> GetAsync([FromServices] BaseRepository<Song> repoSong, [FromServices] BaseRepository<Detail> repoDetail, [FromServices] SongRepository repoSong2,
+        [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";
         }
     }
@@ -61,23 +59,29 @@ public SongService(BaseRepository<Song> repoSong, BaseRepository<Detail> repoDet
         }
 
         [Transactional(Propagation = Propagation.Nested)] //sqlite 不能嵌套事务，会锁库的
-        public virtual void Test1()
+        public void Test1()
         {
             _repoSong.Insert(new Song());
             _repoDetail.Insert(new Detail());
             _repoSong2.Insert(new Song());
         }
+        [Transactional(Propagation = Propagation.Nested)] //sqlite 不能嵌套事务，会锁库的
+        public Task Test11()
+        {
+            return Task.Delay(TimeSpan.FromSeconds(1)).ContinueWith(t => 
+                _repoSong.InsertAsync(new Song()));
+        }
 
         [Transactional(Propagation = Propagation.Nested)] //sqlite 不能嵌套事务，会锁库的
-        async public virtual Task Test2()
+        public async Task Test2()
         {
             await _repoSong.InsertAsync(new Song());
             await _repoDetail.InsertAsync(new Detail());
             await _repoSong2.InsertAsync(new Song());
         }
 
         [Transactional(Propagation = Propagation.Nested)] //sqlite 不能嵌套事务，会锁库的
-        async public virtual Task<object> Test3()
+        public async Task<object> Test3()
         {
             await _repoSong.InsertAsync(new Song());
             await _repoDetail.InsertAsync(new Detail());
@@ -110,53 +114,4 @@ public class Detail
         public int SongId { get; set; }
         public string Title { get; set; }
     }
-
-    public static class IdleBusExtesions
-    {
-        static AsyncLocal<string> AsyncLocalTenantId = new AsyncLocal<string>();
-        public static IdleBus<IFreeSql> ChangeTenant(this IdleBus<IFreeSql> ib, string tenantId)
-        {
-            AsyncLocalTenantId.Value = tenantId;
-            return ib;
-        }
-        public static IFreeSql Get(this IdleBus<IFreeSql> ib) => ib.Get(AsyncLocalTenantId.Value ?? "default");
-        public static IBaseRepository<T> GetRepository<T>(this IdleBus<IFreeSql> ib) where T : class => ib.Get().GetRepository<T>();
-
-        static void test()
-        {
-            IdleBus<IFreeSql> ib = null; //单例注入
-
-            var fsql = ib.Get(); //获取当前租户对应的 IFreeSql
-
-            var fsql00102 = ib.ChangeTenant("00102").Get(); //切换租户，后面的操作都是针对 00102
-
-            var songRepository = ib.GetRepository<Song>();
-            var detailRepository = ib.GetRepository<Detail>();
-        }
-
-        public static IServiceCollection AddRepository(this IServiceCollection services, params Assembly[] assemblies)
-        {
-            services.AddScoped(typeof(IBaseRepository<>), typeof(YourDefaultRepository<>));
-            services.AddScoped(typeof(BaseRepository<>), typeof(YourDefaultRepository<>));
-
-            services.AddScoped(typeof(IBaseRepository<,>), typeof(YourDefaultRepository<,>));
-            services.AddScoped(typeof(BaseRepository<,>), typeof(YourDefaultRepository<,>));
-
-            if (assemblies?.Any() == true)
-                foreach (var asse in assemblies)
-                    foreach (var repo in asse.GetTypes().Where(a => a.IsAbstract == false && typeof(IBaseRepository).IsAssignableFrom(a)))
-                        services.AddScoped(repo);
-
-            return services;
-        }
-    }
-
-    class YourDefaultRepository<T> : BaseRepository<T> where T : class
-    {
-        public YourDefaultRepository(IdleBus<IFreeSql> ib) : base(ib.Get(), null, null) { }
-    }
-    class YourDefaultRepository<T, TKey> : BaseRepository<T, TKey> where T : class
-    {
-        public YourDefaultRepository(IdleBus<IFreeSql> ib) : base(ib.Get(), null, null) { }
-    }
 }

Examples/aspnetcore_transaction/Controllers/HomeController.cs

@@ -0,0 +1,35 @@
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using FreeSql;
+using FreeSql.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+
+namespace aspnetcore_transaction.Domain
+{
+    public class SongRepository : DefaultRepository<Song, int>
+    {
+        public SongRepository(UnitOfWorkManager uowm) : base(uowm?.Orm, uowm) { }
+    }
+
+    [Description("123")]
+    public class Song
+    {
+        /// <summary>
+        /// 自增
+        /// </summary>
+        [Column(IsIdentity = true)]
+        [Description("自增id")]
+        public int Id { get; set; }
+        public string Title { get; set; }
+    }
+    public class Detail
+    {
+        [Column(IsIdentity = true)]
+        public int Id { get; set; }
+
+        public int SongId { get; set; }
+        public string Title { get; set; }
+    }
+}

Examples/aspnetcore_transaction/Domain/SongRepository.cs

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Rougamo />
+</Weavers>

Examples/aspnetcore_transaction/FodyWeavers.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="Rougamo" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>