From 3091ceaf725d8c2ec2f630617536f3cc262f9408 Mon Sep 17 00:00:00 2001 From: Gmij Date: Fri, 26 Jan 2024 12:30:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=83=BD=E5=8D=87=E7=9A=84=E4=BE=9D=E8=B5=96=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E5=88=B0net8=E7=8E=AF=E5=A2=83=E3=80=82=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84=EF=BC=8C=20=E4=B8=BB?= =?UTF-8?q?=E8=A6=81=E6=98=AFOracle=E5=92=8CRabbitMQ=EF=BC=8C=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=8E=A5=E5=8F=A3=E4=B8=8D=E4=B8=80=E8=87=B4=E6=83=85?= =?UTF-8?q?=E5=86=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SmartSql.Sample.AspNetCore.csproj | 6 +++- sample/SmartSql.Sample.AspNetCore/Startup.cs | 2 +- src/SmartSql.AOP/SmartSql.AOP.csproj | 6 +++- .../SmartSql.Bulk.MsSqlServer.csproj | 6 +++- .../SmartSql.Bulk.MySql.csproj | 6 +++- .../SmartSql.Bulk.MySqlConnector.csproj | 6 +++- .../SmartSql.Bulk.PostgreSql.csproj | 6 +++- .../SmartSql.Bulk.SqlServer.csproj | 6 +++- src/SmartSql.Bulk/SmartSql.Bulk.csproj | 4 +++ .../SmartSql.Cache.Redis.csproj | 6 +++- .../SmartSql.Cache.Sync.csproj | 4 +++ .../SmartSql.DIExtension.csproj | 8 +++-- .../SmartSql.DataConnector.csproj | 33 +++++++++++-------- .../SmartSql.DyRepository.csproj | 4 +++ .../SmartSql.Extensions.csproj | 4 +++ .../SmartSql.InvokeSync.Kafka.csproj | 6 +++- .../SmartSql.InvokeSync.RabbitMQ.csproj | 4 +++ .../SmartSql.InvokeSync.csproj | 4 +++ src/SmartSql.Options/SmartSql.Options.csproj | 6 +++- src/SmartSql.Oracle/SmartSql.Oracle.csproj | 7 +++- .../SmartSql.ScriptTag.csproj | 4 +++ .../SmartSql.Test.Performance.csproj | 10 ++++-- .../ColumnAnnotationRepositoryTest.cs | 6 ++-- .../SmartSql.Test.Unit.csproj | 24 +++++++------- src/SmartSql.Test/SmartSql.Test.csproj | 6 +++- .../SmartSql.TypeHandler.PostgreSql.csproj | 6 +++- .../SmartSql.TypeHandler.csproj | 4 +++ src/SmartSql/SmartSql.csproj | 8 +++-- 28 files changed, 153 insertions(+), 49 deletions(-) diff --git a/sample/SmartSql.Sample.AspNetCore/SmartSql.Sample.AspNetCore.csproj b/sample/SmartSql.Sample.AspNetCore/SmartSql.Sample.AspNetCore.csproj index bee45350..2bcface0 100644 --- a/sample/SmartSql.Sample.AspNetCore/SmartSql.Sample.AspNetCore.csproj +++ b/sample/SmartSql.Sample.AspNetCore/SmartSql.Sample.AspNetCore.csproj @@ -5,7 +5,7 @@ - + @@ -42,4 +42,8 @@ + + + + diff --git a/sample/SmartSql.Sample.AspNetCore/Startup.cs b/sample/SmartSql.Sample.AspNetCore/Startup.cs index 8434d1c5..44982bea 100644 --- a/sample/SmartSql.Sample.AspNetCore/Startup.cs +++ b/sample/SmartSql.Sample.AspNetCore/Startup.cs @@ -69,7 +69,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services) // }); services.AddSingleton(); RegisterConfigureSwagger(services); - return services.BuildAspectInjectorProvider(); + return services.BuildDynamicProxyProvider();//.BuildAspectInjectorProvider(); } private void RegisterConfigureSwagger(IServiceCollection services) diff --git a/src/SmartSql.AOP/SmartSql.AOP.csproj b/src/SmartSql.AOP/SmartSql.AOP.csproj index 53abbd9e..22804b33 100644 --- a/src/SmartSql.AOP/SmartSql.AOP.csproj +++ b/src/SmartSql.AOP/SmartSql.AOP.csproj @@ -5,7 +5,7 @@ - + @@ -13,4 +13,8 @@ + + + + diff --git a/src/SmartSql.Bulk.MsSqlServer/SmartSql.Bulk.MsSqlServer.csproj b/src/SmartSql.Bulk.MsSqlServer/SmartSql.Bulk.MsSqlServer.csproj index 67524328..3fdf3789 100644 --- a/src/SmartSql.Bulk.MsSqlServer/SmartSql.Bulk.MsSqlServer.csproj +++ b/src/SmartSql.Bulk.MsSqlServer/SmartSql.Bulk.MsSqlServer.csproj @@ -9,7 +9,7 @@ - + @@ -21,4 +21,8 @@ BulkInsert.cs + + + + diff --git a/src/SmartSql.Bulk.MySql/SmartSql.Bulk.MySql.csproj b/src/SmartSql.Bulk.MySql/SmartSql.Bulk.MySql.csproj index 8b998772..1185200a 100644 --- a/src/SmartSql.Bulk.MySql/SmartSql.Bulk.MySql.csproj +++ b/src/SmartSql.Bulk.MySql/SmartSql.Bulk.MySql.csproj @@ -9,11 +9,15 @@ - + + + + + diff --git a/src/SmartSql.Bulk.MySqlConnector/SmartSql.Bulk.MySqlConnector.csproj b/src/SmartSql.Bulk.MySqlConnector/SmartSql.Bulk.MySqlConnector.csproj index 78c78577..096b8175 100644 --- a/src/SmartSql.Bulk.MySqlConnector/SmartSql.Bulk.MySqlConnector.csproj +++ b/src/SmartSql.Bulk.MySqlConnector/SmartSql.Bulk.MySqlConnector.csproj @@ -13,10 +13,14 @@ - + + + + + diff --git a/src/SmartSql.Bulk.PostgreSql/SmartSql.Bulk.PostgreSql.csproj b/src/SmartSql.Bulk.PostgreSql/SmartSql.Bulk.PostgreSql.csproj index ce78d999..59fb49f4 100644 --- a/src/SmartSql.Bulk.PostgreSql/SmartSql.Bulk.PostgreSql.csproj +++ b/src/SmartSql.Bulk.PostgreSql/SmartSql.Bulk.PostgreSql.csproj @@ -5,11 +5,15 @@ - + + + + + diff --git a/src/SmartSql.Bulk.SqlServer/SmartSql.Bulk.SqlServer.csproj b/src/SmartSql.Bulk.SqlServer/SmartSql.Bulk.SqlServer.csproj index 1397dcb7..6a76499d 100644 --- a/src/SmartSql.Bulk.SqlServer/SmartSql.Bulk.SqlServer.csproj +++ b/src/SmartSql.Bulk.SqlServer/SmartSql.Bulk.SqlServer.csproj @@ -5,11 +5,15 @@ - + + + + + diff --git a/src/SmartSql.Bulk/SmartSql.Bulk.csproj b/src/SmartSql.Bulk/SmartSql.Bulk.csproj index a1b9324f..f1fdc1bd 100644 --- a/src/SmartSql.Bulk/SmartSql.Bulk.csproj +++ b/src/SmartSql.Bulk/SmartSql.Bulk.csproj @@ -8,4 +8,8 @@ + + + + diff --git a/src/SmartSql.Cache.Redis/SmartSql.Cache.Redis.csproj b/src/SmartSql.Cache.Redis/SmartSql.Cache.Redis.csproj index 4fb38ccd..2534483a 100644 --- a/src/SmartSql.Cache.Redis/SmartSql.Cache.Redis.csproj +++ b/src/SmartSql.Cache.Redis/SmartSql.Cache.Redis.csproj @@ -6,11 +6,15 @@ - + + + + + diff --git a/src/SmartSql.Cache.Sync/SmartSql.Cache.Sync.csproj b/src/SmartSql.Cache.Sync/SmartSql.Cache.Sync.csproj index 6f75c782..01249297 100644 --- a/src/SmartSql.Cache.Sync/SmartSql.Cache.Sync.csproj +++ b/src/SmartSql.Cache.Sync/SmartSql.Cache.Sync.csproj @@ -8,4 +8,8 @@ + + + + diff --git a/src/SmartSql.DIExtension/SmartSql.DIExtension.csproj b/src/SmartSql.DIExtension/SmartSql.DIExtension.csproj index 630cdb9c..b2fb890d 100644 --- a/src/SmartSql.DIExtension/SmartSql.DIExtension.csproj +++ b/src/SmartSql.DIExtension/SmartSql.DIExtension.csproj @@ -5,8 +5,8 @@ - - + + @@ -14,4 +14,8 @@ + + + + diff --git a/src/SmartSql.DataConnector/SmartSql.DataConnector.csproj b/src/SmartSql.DataConnector/SmartSql.DataConnector.csproj index 6b93cc1a..bcf70faf 100644 --- a/src/SmartSql.DataConnector/SmartSql.DataConnector.csproj +++ b/src/SmartSql.DataConnector/SmartSql.DataConnector.csproj @@ -17,21 +17,22 @@ - - - - - - - - - - - + + + + + + + + + + + + - - - + + + @@ -47,4 +48,8 @@ + + + + diff --git a/src/SmartSql.DyRepository/SmartSql.DyRepository.csproj b/src/SmartSql.DyRepository/SmartSql.DyRepository.csproj index 268ac93b..f0d3f1de 100644 --- a/src/SmartSql.DyRepository/SmartSql.DyRepository.csproj +++ b/src/SmartSql.DyRepository/SmartSql.DyRepository.csproj @@ -8,4 +8,8 @@ + + + + diff --git a/src/SmartSql.Extensions/SmartSql.Extensions.csproj b/src/SmartSql.Extensions/SmartSql.Extensions.csproj index a1b9324f..f1fdc1bd 100644 --- a/src/SmartSql.Extensions/SmartSql.Extensions.csproj +++ b/src/SmartSql.Extensions/SmartSql.Extensions.csproj @@ -8,4 +8,8 @@ + + + + diff --git a/src/SmartSql.InvokeSync.Kafka/SmartSql.InvokeSync.Kafka.csproj b/src/SmartSql.InvokeSync.Kafka/SmartSql.InvokeSync.Kafka.csproj index 01fb4a79..b5aba914 100644 --- a/src/SmartSql.InvokeSync.Kafka/SmartSql.InvokeSync.Kafka.csproj +++ b/src/SmartSql.InvokeSync.Kafka/SmartSql.InvokeSync.Kafka.csproj @@ -9,8 +9,12 @@ - + + + + + diff --git a/src/SmartSql.InvokeSync.RabbitMQ/SmartSql.InvokeSync.RabbitMQ.csproj b/src/SmartSql.InvokeSync.RabbitMQ/SmartSql.InvokeSync.RabbitMQ.csproj index ff34ea38..e71c06b8 100644 --- a/src/SmartSql.InvokeSync.RabbitMQ/SmartSql.InvokeSync.RabbitMQ.csproj +++ b/src/SmartSql.InvokeSync.RabbitMQ/SmartSql.InvokeSync.RabbitMQ.csproj @@ -13,4 +13,8 @@ + + + + diff --git a/src/SmartSql.InvokeSync/SmartSql.InvokeSync.csproj b/src/SmartSql.InvokeSync/SmartSql.InvokeSync.csproj index 2cf57c5b..44184b53 100644 --- a/src/SmartSql.InvokeSync/SmartSql.InvokeSync.csproj +++ b/src/SmartSql.InvokeSync/SmartSql.InvokeSync.csproj @@ -8,4 +8,8 @@ + + + + diff --git a/src/SmartSql.Options/SmartSql.Options.csproj b/src/SmartSql.Options/SmartSql.Options.csproj index 1f31405f..32cd8d75 100644 --- a/src/SmartSql.Options/SmartSql.Options.csproj +++ b/src/SmartSql.Options/SmartSql.Options.csproj @@ -6,7 +6,11 @@ - + + + + + diff --git a/src/SmartSql.Oracle/SmartSql.Oracle.csproj b/src/SmartSql.Oracle/SmartSql.Oracle.csproj index d7c9fda1..cad74f69 100644 --- a/src/SmartSql.Oracle/SmartSql.Oracle.csproj +++ b/src/SmartSql.Oracle/SmartSql.Oracle.csproj @@ -9,7 +9,12 @@ - + + + + + + diff --git a/src/SmartSql.ScriptTag/SmartSql.ScriptTag.csproj b/src/SmartSql.ScriptTag/SmartSql.ScriptTag.csproj index 3692c9b0..5dbb090e 100644 --- a/src/SmartSql.ScriptTag/SmartSql.ScriptTag.csproj +++ b/src/SmartSql.ScriptTag/SmartSql.ScriptTag.csproj @@ -12,4 +12,8 @@ + + + + diff --git a/src/SmartSql.Test.Performance/SmartSql.Test.Performance.csproj b/src/SmartSql.Test.Performance/SmartSql.Test.Performance.csproj index ea56e0b4..ca2d4254 100644 --- a/src/SmartSql.Test.Performance/SmartSql.Test.Performance.csproj +++ b/src/SmartSql.Test.Performance/SmartSql.Test.Performance.csproj @@ -5,11 +5,11 @@ - - + + - + @@ -28,4 +28,8 @@ + + + + diff --git a/src/SmartSql.Test.Unit/DyRepository/ColumnAnnotationRepositoryTest.cs b/src/SmartSql.Test.Unit/DyRepository/ColumnAnnotationRepositoryTest.cs index fd9d0dc3..68706d32 100644 --- a/src/SmartSql.Test.Unit/DyRepository/ColumnAnnotationRepositoryTest.cs +++ b/src/SmartSql.Test.Unit/DyRepository/ColumnAnnotationRepositoryTest.cs @@ -26,7 +26,7 @@ public void GetEntity() Assert.Equal(id, entity.Id); } - [Fact] + //[Fact] public int Insert() { var id = _repository.Insert(new ColumnAnnotationEntity @@ -42,14 +42,14 @@ public int Insert() } [Fact] - public int InsertByParamAnnotations() + public void InsertByParamAnnotations() { var id = _repository.Insert(nameof(InsertByParamAnnotations), new ColumnAnnotationEntity.ExtendData { Info = nameof(InsertByParamAnnotations) }); Assert.NotEqual(0, id); - return id; + //return id; } } } \ No newline at end of file diff --git a/src/SmartSql.Test.Unit/SmartSql.Test.Unit.csproj b/src/SmartSql.Test.Unit/SmartSql.Test.Unit.csproj index ffec5680..cb649c1d 100644 --- a/src/SmartSql.Test.Unit/SmartSql.Test.Unit.csproj +++ b/src/SmartSql.Test.Unit/SmartSql.Test.Unit.csproj @@ -50,19 +50,18 @@ - - - - + + + - - - - - + + + + + - - + + all runtime; build; native; contentfiles; analyzers @@ -114,4 +113,7 @@ + + + diff --git a/src/SmartSql.Test/SmartSql.Test.csproj b/src/SmartSql.Test/SmartSql.Test.csproj index 6473b61b..acea8c9b 100644 --- a/src/SmartSql.Test/SmartSql.Test.csproj +++ b/src/SmartSql.Test/SmartSql.Test.csproj @@ -17,7 +17,7 @@ - + @@ -26,4 +26,8 @@ + + + + diff --git a/src/SmartSql.TypeHandler.PostgreSql/SmartSql.TypeHandler.PostgreSql.csproj b/src/SmartSql.TypeHandler.PostgreSql/SmartSql.TypeHandler.PostgreSql.csproj index 6af1adc4..57d9b3a4 100644 --- a/src/SmartSql.TypeHandler.PostgreSql/SmartSql.TypeHandler.PostgreSql.csproj +++ b/src/SmartSql.TypeHandler.PostgreSql/SmartSql.TypeHandler.PostgreSql.csproj @@ -5,12 +5,16 @@ - + + + + + diff --git a/src/SmartSql.TypeHandler/SmartSql.TypeHandler.csproj b/src/SmartSql.TypeHandler/SmartSql.TypeHandler.csproj index 7294b3be..fd8c941c 100644 --- a/src/SmartSql.TypeHandler/SmartSql.TypeHandler.csproj +++ b/src/SmartSql.TypeHandler/SmartSql.TypeHandler.csproj @@ -12,4 +12,8 @@ + + + + diff --git a/src/SmartSql/SmartSql.csproj b/src/SmartSql/SmartSql.csproj index 81760fef..d8f51886 100644 --- a/src/SmartSql/SmartSql.csproj +++ b/src/SmartSql/SmartSql.csproj @@ -7,9 +7,13 @@ - - + + + + + + From cb1280acad9d42718d9f7d4ee85d4f89403c3008 Mon Sep 17 00:00:00 2001 From: Gmij Date: Sat, 27 Jan 2024 14:53:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=8A=E9=A1=B9=E7=9B=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=88=90=E5=A4=9A=E7=9B=AE=E6=A0=87=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E7=9B=AE=E6=A0=87=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=90=8C=EF=BC=8C=E5=BC=95=E7=94=A8=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=89=88=E6=9C=AC=E7=9A=84Oracle=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SmartSql.DataConnector.csproj | 7 +++-- src/SmartSql.Oracle/SmartSql.Oracle.csproj | 29 ++++++++++--------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/SmartSql.DataConnector/SmartSql.DataConnector.csproj b/src/SmartSql.DataConnector/SmartSql.DataConnector.csproj index bcf70faf..7d53c903 100644 --- a/src/SmartSql.DataConnector/SmartSql.DataConnector.csproj +++ b/src/SmartSql.DataConnector/SmartSql.DataConnector.csproj @@ -1,7 +1,8 @@ Exe - net6.0 + + netstandard2.0;netstandard2.1; true SmartSql.DataConnector ./nupkg @@ -25,7 +26,9 @@ - + + + diff --git a/src/SmartSql.Oracle/SmartSql.Oracle.csproj b/src/SmartSql.Oracle/SmartSql.Oracle.csproj index cad74f69..bf8a3f86 100644 --- a/src/SmartSql.Oracle/SmartSql.Oracle.csproj +++ b/src/SmartSql.Oracle/SmartSql.Oracle.csproj @@ -1,20 +1,21 @@ - + - - netstandard2.0 - + + netstandard2.0;netstandard2.1 + - - - + + + - - - - + + + + + - - - + + +