Merge pull request #75 from WeihanLi/dev

WeihanLi · web-flow · commit 99824aa9c8f8 · 2025-03-21T23:02:28.000+08:00
10.0.0 preview 1
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "CodeSpace",
-    "image": "mcr.microsoft.com/dotnet/sdk:8.0",
+    "image": "mcr.microsoft.com/dotnet/sdk:10.0-preview",
     // Install needed extensions
     "extensions": [
         "ms-dotnettools.csharp",
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: dotnet info
       run: dotnet --info
     - name: build
diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml
@@ -10,7 +10,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: build
       run: dotnet build
     - name: format
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Build
       shell: pwsh
       run: .\build.ps1 --stable=true
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,12 +2,12 @@
   <Import Project="./build/version.props" />
   
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <CommonVersion>1.0.74</CommonVersion>
-    <EFVersion>9.0.0</EFVersion>
+    <CommonVersion>1.0.76</CommonVersion>
+    <EFVersion>10.0.0-preview.2.25163.8</EFVersion>
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,7 +11,7 @@ steps:
   displayName: 'Use .NET sdk'
   inputs:
     packageType: sdk
-    version: 9.0.x
+    version: 10.0.x
     includePreviewVersions: true
 
 - script: dotnet --info
diff --git a/build/version.props b/build/version.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <VersionMajor>9</VersionMajor>
-    <VersionMinor>1</VersionMinor>
+    <VersionMajor>10</VersionMajor>
+    <VersionMinor>0</VersionMinor>
     <VersionPatch>0</VersionPatch>
     <VersionRevision>0</VersionRevision>
     <VersionPrefix Condition="'$(VersionRevision)'=='0' or '$(VersionRevision)'==''">$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
diff --git a/samples/WeihanLi.EntityFramework.Sample/DbContextInterceptorSamples.cs b/samples/WeihanLi.EntityFramework.Sample/DbContextInterceptorSamples.cs
@@ -48,13 +48,13 @@ private static async Task InterceptorTest2()
 
 file sealed class FileTestDbContext(DbContextOptions<FileTestDbContext> options) : DbContext(options)
 {
-    public DbSet<TestEntity> Entities { get; set; }
+    public DbSet<TestEntity> Entities { get; set; } = null!;
 }
 
 file sealed class TestEntity
 {
     public int Id { get; set; }
-    public string Name { get; set; }
+    public string? Name { get; set; }
 }
 
 file sealed class SavingInterceptor : SaveChangesInterceptor
diff --git a/samples/WeihanLi.EntityFramework.Sample/WeihanLi.EntityFramework.Sample.csproj b/samples/WeihanLi.EntityFramework.Sample/WeihanLi.EntityFramework.Sample.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WeihanLi.EntityFramework.SourceGenerator\WeihanLi.EntityFramework.SourceGenerator.csproj" OutputItemType="analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\WeihanLi.EntityFramework.SourceGenerator\WeihanLi.EntityFramework.SourceGenerator.csproj" OutputItemType="analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
 </Project>
diff --git a/src/WeihanLi.EntityFramework.SourceGenerator/EFExtensionsGenerator.cs b/src/WeihanLi.EntityFramework.SourceGenerator/EFExtensionsGenerator.cs
@@ -13,7 +13,7 @@ public sealed class EFExtensionsGenerator : IIncrementalGenerator
                                      namespace WeihanLi.EntityFramework
                                      {
                                          [AttributeUsage(System.AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
-                                         public sealed class EFExtensionsAttribute;    
+                                         public sealed class EFExtensionsAttribute;
                                      }
                                      """;
 
@@ -39,7 +39,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             var dbContextName = dbContextDeclaration!.Identifier.Text;
             var repositoryNamespace = dbContextDeclaration.Parent!.GetNamespace();
             var generatedCode = GenerateRepositoryCode(dbContextName, repositoryNamespace, templates);
-            spc.AddSource($"{dbContextName}Repository.g.cs", SourceText.From(generatedCode, Encoding.UTF8));
+            // spc.AddSource($"{dbContextName}Repository.g.cs", SourceText.From(generatedCode, Encoding.UTF8));
         });
     }
 
diff --git a/src/WeihanLi.EntityFramework/EFRepository.cs b/src/WeihanLi.EntityFramework/EFRepository.cs
@@ -260,15 +260,15 @@ public virtual int Update(Expression<Func<TEntity, bool>> whereExpression, IDict
         return DbContext.SaveChanges();
     }
 
-    public int Update(Expression<Func<SetPropertyCalls<TEntity>, SetPropertyCalls<TEntity>>> setExpression,
+    public int Update(Action<UpdateSettersBuilder<TEntity>> setExpression,
         Action<EFRepositoryQueryBuilder<TEntity>>? queryBuilderAction = null)
     {
         var queryBuilder = new EFRepositoryQueryBuilder<TEntity>(DbContext.Set<TEntity>());
         queryBuilderAction?.Invoke(queryBuilder);
         return queryBuilder.Build().ExecuteUpdate(setExpression);
     }
 
-    public Task<int> UpdateAsync(Expression<Func<SetPropertyCalls<TEntity>, SetPropertyCalls<TEntity>>> setExpression,
+    public Task<int> UpdateAsync(Action<UpdateSettersBuilder<TEntity>> setExpression,
         Action<EFRepositoryQueryBuilder<TEntity>>? queryBuilderAction = null,
         CancellationToken cancellationToken = default)
     {
diff --git a/src/WeihanLi.EntityFramework/IEFRepository.cs b/src/WeihanLi.EntityFramework/IEFRepository.cs
@@ -32,10 +32,10 @@ public interface IEFRepository<out TDbContext, TEntity> : IRepository<TEntity>
     /// <returns>the entity founded, if not found, null returned</returns>
     ValueTask<TEntity?> FindAsync(object[] keyValues, CancellationToken cancellationToken);
 
-    int Update(Expression<Func<SetPropertyCalls<TEntity>, SetPropertyCalls<TEntity>>> setExpression, Action<EFRepositoryQueryBuilder<TEntity>>? queryBuilderAction = null);
+    int Update(Action<UpdateSettersBuilder<TEntity>> setExpression, Action<EFRepositoryQueryBuilder<TEntity>>? queryBuilderAction = null);
 
     Task<int> UpdateAsync(
-        Expression<Func<SetPropertyCalls<TEntity>, SetPropertyCalls<TEntity>>> setExpression,
+        Action<UpdateSettersBuilder<TEntity>> setExpression,
         Action<EFRepositoryQueryBuilder<TEntity>>? queryBuilderAction = null,
         CancellationToken cancellationToken = default);
 
diff --git a/src/WeihanLi.EntityFramework/WeihanLi.EntityFramework.csproj b/src/WeihanLi.EntityFramework/WeihanLi.EntityFramework.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Title>WeihanLi.EntityFramework</Title>
     <PackageId>WeihanLi.EntityFramework</PackageId>
     <PackageIconUrl>https://avatars3.githubusercontent.com/u/7604648</PackageIconUrl>    
diff --git a/test/WeihanLi.EntityFramework.Test/EFRepositoryTest.cs b/test/WeihanLi.EntityFramework.Test/EFRepositoryTest.cs
@@ -3,7 +3,6 @@
 using WeihanLi.Common;
 using WeihanLi.Common.Helpers;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace WeihanLi.EntityFramework.Test;
 
@@ -40,7 +39,7 @@ public void InsertTest()
     [Fact]
     public async Task InsertAsyncTest()
     {
-        using (await _lock.LockAsync())
+        using (await _lock.LockAsync(cancellationToken: TestContext.Current.CancellationToken))
         {
             await DependencyResolver.TryInvokeAsync<IEFRepository<TestDbContext, TestEntity>>(async repo =>
             {
diff --git a/test/WeihanLi.EntityFramework.Test/EFUnitOfWorkTest.cs b/test/WeihanLi.EntityFramework.Test/EFUnitOfWorkTest.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using WeihanLi.Common.Data;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace WeihanLi.EntityFramework.Test;
 
@@ -26,7 +25,7 @@ public void TransactionTest()
         IServiceScope scope1 = null;
         try
         {
-            _semaphore.Wait();
+            _semaphore.Wait(TestContext.Current.CancellationToken);
             scope1 = Services.CreateScope();
             var repository = scope1.ServiceProvider.GetRequiredService<IEFRepository<TestDbContext, TestEntity>>();
 
@@ -116,7 +115,7 @@ public async Task TransactionAsyncTest()
         IServiceScope scope1 = null;
         try
         {
-            await _semaphore.WaitAsync();
+            await _semaphore.WaitAsync(TestContext.Current.CancellationToken);
             scope1 = Services.CreateScope();
             var repository = scope1.ServiceProvider.GetRequiredService<IEFRepositoryFactory<TestDbContext>>()
                 .GetRepository<TestEntity>();
@@ -151,7 +150,7 @@ await repository.InsertAsync(new[]
                         CreatedAt = DateTime.UtcNow,
                         Name = "xss3",
                     }
-                });
+                }, TestContext.Current.CancellationToken);
 
             using (var scope = Services.CreateScope())
             {
@@ -160,10 +159,10 @@ await repo.InsertAsync(new TestEntity()
                 {
                     CreatedAt = DateTime.UtcNow,
                     Name = "xxxxxx"
-                });
+                }, TestContext.Current.CancellationToken);
             }
 
-            var beforeCount = await repository.CountAsync();
+            var beforeCount = await repository.CountAsync(cancellationToken: TestContext.Current.CancellationToken);
             using var uow = repository.GetUnitOfWork();
             uow.DbContext.Update(new TestEntity()
             {
@@ -188,18 +187,18 @@ await repo.InsertAsync(new TestEntity()
                 Name = "xyy1",
             });
 
-            var beforeCommitCount = await repository.CountAsync();
+            var beforeCommitCount = await repository.CountAsync(cancellationToken: TestContext.Current.CancellationToken);
             Assert.Equal(beforeCount, beforeCommitCount);
 
-            await uow.CommitAsync();
+            await uow.CommitAsync(TestContext.Current.CancellationToken);
 
-            var committedCount = await repository.CountAsync();
+            var committedCount = await repository.CountAsync(cancellationToken: TestContext.Current.CancellationToken);
             Assert.Equal(committedCount, beforeCount + 1);
 
-            entity = await repository.DbContext.FindAsync<TestEntity>(3);
+            entity = await repository.DbContext.FindAsync<TestEntity>(new object[] { 3 }, TestContext.Current.CancellationToken);
             Assert.Equal(new string('3', 6), entity.Name);
 
-            entity = await repository.DbContext.FindAsync<TestEntity>(new object[] { 4 }, CancellationToken.None);
+            entity = await repository.DbContext.FindAsync<TestEntity>(new object[] { 4 }, cancellationToken: TestContext.Current.CancellationToken);
             Assert.Equal(new string('4', 6), entity.Name);
 
             Assert.Equal(1, await Repository.DeleteAsync(1));
@@ -219,7 +218,7 @@ public void RollbackTest()
     {
         try
         {
-            _semaphore.Wait();
+            _semaphore.Wait(TestContext.Current.CancellationToken);
 
             using (var scope = Services.CreateScope())
             {
@@ -258,7 +257,7 @@ public async Task RollbackAsyncTest()
     {
         try
         {
-            await _semaphore.WaitAsync();
+            await _semaphore.WaitAsync(TestContext.Current.CancellationToken);
 
             using (var scope = Services.CreateScope())
             {
@@ -268,7 +267,7 @@ public async Task RollbackAsyncTest()
                     .Add(new TestEntity() { CreatedAt = DateTime.UtcNow, Name = "saa" });
                 unitOfWork.DbContext.TestEntities
                     .Add(new TestEntity() { CreatedAt = DateTime.UtcNow, Name = "saa" });
-                await unitOfWork.CommitAsync();
+                await unitOfWork.CommitAsync(TestContext.Current.CancellationToken);
             }
             using (var scope = Services.CreateScope())
             {
@@ -280,7 +279,7 @@ public async Task RollbackAsyncTest()
                 unitOfWork.DbContext.TestEntities.Add(new TestEntity() { Name = "xxx", CreatedAt = DateTime.UtcNow });
                 unitOfWork.DbContext.TestEntities.Add(new TestEntity() { Name = "xxx", CreatedAt = DateTime.UtcNow });
 
-                await unitOfWork.RollbackAsync();
+                await unitOfWork.RollbackAsync(TestContext.Current.CancellationToken);
 
                 var count2 = unitOfWork.DbContext.TestEntities.Count();
                 Assert.Equal(count, count2);
@@ -302,7 +301,7 @@ public void HybridTest()
         }
         try
         {
-            _semaphore.Wait();
+            _semaphore.Wait(TestContext.Current.CancellationToken);
 
             using (var scope = Services.CreateScope())
             {
diff --git a/test/WeihanLi.EntityFramework.Test/WeihanLi.EntityFramework.Test.csproj b/test/WeihanLi.EntityFramework.Test/WeihanLi.EntityFramework.Test.csproj
@@ -3,14 +3,17 @@
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
+    <OutputType>exe</OutputType>
     <Nullable>disable</Nullable>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EFVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit.v3" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "CodeSpace",`
`3`		`- "image": "mcr.microsoft.com/dotnet/sdk:8.0",`
	`3`	`+ "image": "mcr.microsoft.com/dotnet/sdk:10.0-preview",`
`4`	`4`	`// Install needed extensions`
`5`	`5`	`"extensions": [`
`6`	`6`	`"ms-dotnettools.csharp",`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,13 @@ private static async Task InterceptorTest2()`
`48`	`48`
`49`	`49`	`file sealed class FileTestDbContext(DbContextOptions<FileTestDbContext> options) : DbContext(options)`
`50`	`50`	`{`
`51`		`- public DbSet<TestEntity> Entities { get; set; }`
	`51`	`+ public DbSet<TestEntity> Entities { get; set; } = null!;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`file sealed class TestEntity`
`55`	`55`	`{`
`56`	`56`	`public int Id { get; set; }`
`57`		`- public string Name { get; set; }`
	`57`	`+ public string? Name { get; set; }`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`file sealed class SavingInterceptor : SaveChangesInterceptor`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public sealed class EFExtensionsGenerator : IIncrementalGenerator`
`13`	`13`	`namespace WeihanLi.EntityFramework`
`14`	`14`	`{`
`15`	`15`	`[AttributeUsage(System.AttributeTargets.Class, Inherited = false, AllowMultiple = false)]`
`16`		`- public sealed class EFExtensionsAttribute;`
	`16`	`+ public sealed class EFExtensionsAttribute;`
`17`	`17`	`}`
`18`	`18`	`""";`
`19`	`19`
`@@ -39,7 +39,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)`
`39`	`39`	`var dbContextName = dbContextDeclaration!.Identifier.Text;`
`40`	`40`	`var repositoryNamespace = dbContextDeclaration.Parent!.GetNamespace();`
`41`	`41`	`var generatedCode = GenerateRepositoryCode(dbContextName, repositoryNamespace, templates);`
`42`		`- spc.AddSource($"{dbContextName}Repository.g.cs", SourceText.From(generatedCode, Encoding.UTF8));`
	`42`	`+ // spc.AddSource($"{dbContextName}Repository.g.cs", SourceText.From(generatedCode, Encoding.UTF8));`
`43`	`43`	`});`
`44`	`44`	`}`
`45`	`45`