未验证 提交 0b8f1e08 编写于 作者: M MaceWindu 提交者: GitHub

- downgrade abstractions (#3955)

- downgrade mysql.DataConnection
上级 f82dd006
......@@ -73,9 +73,9 @@ Legend:
|SQLite [3.40.0](https://www.sqlite.org/releaselog/3_40_0.html)<br>[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/) 1.0.117<br>with NorthwindDB Tests|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite [3.40.0](https://www.sqlite.org/releaselog/3_40_0.html)<br>[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/) 1.0.117<br>with [MiniProfiler](https://www.nuget.org/packages/MiniProfiler.Shared/) 4.2.22<br>without mappings to underlying provider|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite [3.40.0](https://www.sqlite.org/releaselog/3_40_0.html)<br>[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/) 1.0.117<br>with [MiniProfiler](https://www.nuget.org/packages/MiniProfiler.Shared/) 4.2.22<br>with mappings to underlying provider|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL 5.6<br>[MySql.Data](https://www.nuget.org/packages/MySql.Data/) 8.0.32|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL 5.6<br>[MySql.Data](https://www.nuget.org/packages/MySql.Data/) 8.0.31|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL 5.6<br>[MySqlConnector](https://www.nuget.org/packages/MySqlConnector/) 0.69.10/1.3.14/2.2.5|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL (latest)<br>[MySql.Data](https://www.nuget.org/packages/MySql.Data/) 8.0.32|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL (latest)<br>[MySql.Data](https://www.nuget.org/packages/MySql.Data/) 8.0.31|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL (latest)<br>[MySqlConnector](https://www.nuget.org/packages/MySqlConnector/) 0.69.10/1.3.14/2.2.5|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MariaDB (latest)<br>[MySqlConnector](https://www.nuget.org/packages/MySqlConnector/) 0.69.10/1.3.14/2.2.5|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|PostgreSQL 10<br>[Npgsql](https://www.nuget.org/packages/Npgsql/) 7.0.1 |:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
......
......@@ -22,7 +22,7 @@
<PackageVersion Include="Mono.TextTemplating" Version="2.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
<!--data providers-->
<PackageVersion Include="MySql.Data" Version="8.0.32" />
<PackageVersion Include="MySql.Data" Version="8.0.31" />
<PackageVersion Include="AdoNetCore.AseClient" Version="0.19.2" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.0" />
......@@ -87,10 +87,6 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
<!--main version-->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
<!--test v1.x compatibility, required for Pomelo EF.Core provider v5 -->
<PackageVersion Include="MySqlConnector" Version="1.3.14" />
<!--v7+ dropped support of netcoreapp3.1 and ns2.0 build is useless as it throws PNSE ¯\_(ツ)_/¯ -->
......@@ -100,10 +96,14 @@
<PackageVersion Include="System.Text.Json" Version="6.0.7" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net45' AND '$(TargetFramework)' != 'net46' AND '$(TargetFramework)' != 'netcoreapp3.1' ">
<ItemGroup Condition=" '$(TargetFramework)' != 'net45' AND '$(TargetFramework)' != 'net46' ">
<!--main version-->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<!--
pin abstractions packages to lowest supported runtime (.net 6 currently)
https://github.com/linq2db/linq2db/issues/3953
-->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
</ItemGroup>
<!--test dependencies-->
......
......@@ -17,8 +17,8 @@
</group>
<group targetFramework="netstandard2.0">
<dependency id="linq2db" version="5.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection" version="7.0.0" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection" version="6.0.1" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.3" />
</group>
</dependencies>
</metadata>
......
......@@ -14,7 +14,7 @@
<readme>README.md</readme>
<dependencies>
<dependency id="linq2db" version="5.0.0" />
<dependency id="MySql.Data" version="8.0.32" />
<dependency id="MySql.Data" version="8.0.31" />
</dependencies>
<contentFiles>
<files include="**\*" buildAction="None" />
......
......@@ -60,7 +60,7 @@ public bool IsEnabled(LogLevel logLevel)
}
public IDisposable BeginScope<TState>(TState state)
#if !NETFRAMEWORK
#if NET7_0_OR_GREATER
where TState : notnull
#endif
=> new Disposable();
......
......@@ -44,11 +44,11 @@ public void Test3840([IncludeDataSources(true, TestProvName.AllSqlServer2008Plus
{
new Test
{
StartDateTime = DateTime.UtcNow,
StartDateTime = TestData.DateTimeUtc,
PreNotification = TimeSpan.FromSeconds(2000),
PreNotification2 = TimeSpan.FromSeconds(2000),
PreNotification3 = TimeSpan.FromSeconds(2000),
StrField = DateTime.Today,
StrField = TestData.Date,
}
});
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册