Skip to content

升级所有能升的依赖项，到net8环境。目前不支持的， 主要是Oracle和RabbitMQ，存在接口不一致情况。 #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

升级所有能升的依赖项，到net8环境。目前不支持的， 主要是Oracle和RabbitMQ，存在接口不一致情况。 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3091cea
升级所有能升的依赖项，到net8环境。目前不支持的， 主要是Oracle和RabbitMQ，存在接口不一致情况。
gmij Jan 26, 2024
cb1280a
把项目调整成多目标框架，根据目标框架的不同，引用不同版本的Oracle驱动。
gmij Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion sample/SmartSql.Sample.AspNetCore/SmartSql.Sample.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.10" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.1" />
<PackageReference Include="SkyAPM.Agent.AspNetCore" Version="2.1.0" />
<PackageReference Include="SkyAPM.Diagnostics.SmartSql" Version="2.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
Expand Down Expand Up @@ -42,4 +42,8 @@
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion sample/SmartSql.Sample.AspNetCore/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
// });
services.AddSingleton<UserService>();
RegisterConfigureSwagger(services);
return services.BuildAspectInjectorProvider();
return services.BuildDynamicProxyProvider();//.BuildAspectInjectorProvider();
}

private void RegisterConfigureSwagger(IServiceCollection services)
Expand Down
6 changes: 5 additions & 1 deletion src/SmartSql.AOP/SmartSql.AOP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="1.2.0" />
<PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="2.4.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartSql.DIExtension\SmartSql.DIExtension.csproj" />
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/SmartSql.Bulk.MsSqlServer/SmartSql.Bulk.MsSqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.4" />
</ItemGroup>

<ItemGroup>
Expand All @@ -21,4 +21,8 @@
<Link>BulkInsert.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion src/SmartSql.Bulk.MySql/SmartSql.Bulk.MySql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MySql.Data" Version="8.0.30" />
<PackageReference Include="MySql.Data" Version="8.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartSql.Bulk\SmartSql.Bulk.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/SmartSql.Bulk.MySqlConnector/SmartSql.Bulk.MySqlConnector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MySqlConnector" Version="2.1.8" />
<PackageReference Include="MySqlConnector" Version="2.3.5" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartSql.Bulk\SmartSql.Bulk.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion src/SmartSql.Bulk.PostgreSql/SmartSql.Bulk.PostgreSql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Npgsql" Version="4.1.12" />
<PackageReference Include="Npgsql" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartSql.Bulk\SmartSql.Bulk.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/SmartSql.Bulk.SqlServer/SmartSql.Bulk.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartSql.Bulk\SmartSql.Bulk.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/SmartSql.Bulk/SmartSql.Bulk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/SmartSql.Cache.Redis/SmartSql.Cache.Redis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="StackExchange.Redis" Version="2.5.61" />
<PackageReference Include="StackExchange.Redis" Version="2.7.17" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/SmartSql.Cache.Sync/SmartSql.Cache.Sync.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@
<ProjectReference Include="..\SmartSql.InvokeSync\SmartSql.InvokeSync.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
8 changes: 6 additions & 2 deletions src/SmartSql.DIExtension/SmartSql.DIExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartSql.DyRepository\SmartSql.DyRepository.csproj" />
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
38 changes: 23 additions & 15 deletions src/SmartSql.DataConnector/SmartSql.DataConnector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<!--<TargetFramework>net6.0</TargetFramework>-->
<TargetFrameworks>netstandard2.0;netstandard2.1;</TargetFrameworks>
<PackAsTool>true</PackAsTool>
<ToolCommandName>SmartSql.DataConnector</ToolCommandName>
<PackageOutputPath>./nupkg</PackageOutputPath>
Expand All @@ -17,21 +18,24 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview7.19362.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
<PackageReference Include="MySql.Data" Version="8.0.30" />
<PackageReference Include="Npgsql" Version="4.1.12" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.180" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="3.0.0-dev-00019" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="MySql.Data" Version="8.3.0" />
<PackageReference Include="MySqlConnector" Version="2.3.5" />
<PackageReference Include="Npgsql" Version="8.0.1" />
<!--<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.220" />-->
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Oracle.ManagedDataAccess.Core" Version="2.19.220" />
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.1'" Include="Oracle.ManagedDataAccess.Core" Version="3.21.130" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
<PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
<PackageReference Include="YamlDotNet" Version="11.2.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
<PackageReference Include="YamlDotNet" Version="15.1.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -47,4 +51,8 @@
<Folder Include="logs" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/SmartSql.DyRepository/SmartSql.DyRepository.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/SmartSql.Extensions/SmartSql.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/SmartSql.InvokeSync.Kafka/SmartSql.InvokeSync.Kafka.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Confluent.Kafka" Version="1.8.2" />
<PackageReference Include="Confluent.Kafka" Version="2.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/SmartSql.InvokeSync.RabbitMQ/SmartSql.InvokeSync.RabbitMQ.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@
<ProjectReference Include="..\SmartSql.InvokeSync\SmartSql.InvokeSync.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/SmartSql.InvokeSync/SmartSql.InvokeSync.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@
<ProjectReference Include="..\SmartSql.DIExtension\SmartSql.DIExtension.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion src/SmartSql.Options/SmartSql.Options.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@

<ItemGroup>
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
26 changes: 16 additions & 10 deletions src/SmartSql.Oracle/SmartSql.Oracle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.180" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="Oracle.ManagedDataAccess.Core" Version="2.19.220" />
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.1'" Include="Oracle.ManagedDataAccess.Core" Version="3.21.130" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
4 changes: 4 additions & 0 deletions src/SmartSql.ScriptTag/SmartSql.ScriptTag.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@
<ProjectReference Include="..\SmartSql\SmartSql.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
10 changes: 7 additions & 3 deletions src/SmartSql.Test.Performance/SmartSql.Test.Performance.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
<PackageReference Include="Dapper" Version="1.60.6" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
<PackageReference Include="Dapper" Version="2.1.28" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>

<ItemGroup>
Expand All @@ -28,4 +28,8 @@
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/SmartSql.Test.Unit/DyRepository/ColumnAnnotationRepositoryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void GetEntity()
Assert.Equal(id, entity.Id);
}

[Fact]
//[Fact]
public int Insert()
{
var id = _repository.Insert(new ColumnAnnotationEntity
Expand All @@ -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;
}
}
}
Loading