Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Linq2db
提交
375c6581
L
Linq2db
项目概览
jobily
/
Linq2db
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
Linq2db
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
375c6581
编写于
6月 12, 2023
作者:
M
MaceWindu
提交者:
GitHub
6月 12, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updates (#4165)
* bump version, unpin v7 SDK * updates * fix assert
上级
5da631c4
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
38 addition
and
38 deletion
+38
-38
Build/Azure/README.md
Build/Azure/README.md
+3
-3
Build/Azure/pipelines/templates/build-job.yml
Build/Azure/pipelines/templates/build-job.yml
+1
-1
Build/Azure/pipelines/templates/build-vars.yml
Build/Azure/pipelines/templates/build-vars.yml
+3
-3
Build/Azure/pipelines/templates/test-workflow-linux.yml
Build/Azure/pipelines/templates/test-workflow-linux.yml
+1
-1
Build/Azure/pipelines/templates/test-workflow-macos.yml
Build/Azure/pipelines/templates/test-workflow-macos.yml
+1
-1
Build/Azure/pipelines/templates/test-workflow-windows.yml
Build/Azure/pipelines/templates/test-workflow-windows.yml
+2
-2
Directory.Packages.props
Directory.Packages.props
+16
-17
NuGet/PostgreSQL/LinqToDB.PostgreSQL.Tools.ttinclude
NuGet/PostgreSQL/LinqToDB.PostgreSQL.Tools.ttinclude
+1
-1
NuGet/README.linq2db.md
NuGet/README.linq2db.md
+1
-1
NuGet/linq2db.MySqlConnector.nuspec
NuGet/linq2db.MySqlConnector.nuspec
+1
-1
NuGet/linq2db.PostgreSQL.nuspec
NuGet/linq2db.PostgreSQL.nuspec
+1
-1
NuGet/linq2db.SQLite.nuspec
NuGet/linq2db.SQLite.nuspec
+1
-1
README.md
README.md
+1
-1
Tests/Base/Interceptors/SaveWrappedCommandInterceptor.cs
Tests/Base/Interceptors/SaveWrappedCommandInterceptor.cs
+1
-1
Tests/Base/TestProviders/UnwrapProfilerInterceptor.cs
Tests/Base/TestProviders/UnwrapProfilerInterceptor.cs
+1
-1
Tests/Base/Tests.Base.csproj
Tests/Base/Tests.Base.csproj
+2
-1
Tests/Linq/DataProvider/SQLiteTests.cs
Tests/Linq/DataProvider/SQLiteTests.cs
+1
-1
未找到文件。
Build/Azure/README.md
浏览文件 @
375c6581
...
@@ -70,9 +70,9 @@ Legend:
...
@@ -70,9 +70,9 @@ Legend:
|:---|:---:|:---:|:---:|:---:|
|:---|:---:|:---:|:---:|:---:|
|TestNoopProvider
<sup>
[
1
](
#notes
)
</sup>
|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|TestNoopProvider
<sup>
[
1
](
#notes
)
</sup>
|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite
[
3.40.1
](
https://www.sqlite.org/releaselog/3_40_1.html
)
<br>
[
Microsoft.Data.SQLite
](
https://www.nuget.org/packages/Microsoft.Data.SQLite/
)
<br>
with NorthwindDB Tests|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite
[
3.40.1
](
https://www.sqlite.org/releaselog/3_40_1.html
)
<br>
[
Microsoft.Data.SQLite
](
https://www.nuget.org/packages/Microsoft.Data.SQLite/
)
<br>
with NorthwindDB Tests|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite
[
3.4
0.0
](
https://www.sqlite.org/releaselog/3_40
_0.html
)
<br>
[
System.Data.SQLite
](
https://www.nuget.org/packages/System.Data.SQLite.Core/
)
<br>
with NorthwindDB Tests|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite
[
3.4
2.0
](
https://www.sqlite.org/releaselog/3_42
_0.html
)
<br>
[
System.Data.SQLite
](
https://www.nuget.org/packages/System.Data.SQLite.Core/
)
<br>
with NorthwindDB Tests|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite
[
3.4
0.0
](
https://www.sqlite.org/releaselog/3_40
_0.html
)
<br>
[
System.Data.SQLite
](
https://www.nuget.org/packages/System.Data.SQLite.Core/
)
<br>
with
[
MiniProfiler
](
https://www.nuget.org/packages/MiniProfiler.Shared/
)
<br>
without mappings to underlying provider|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite
[
3.4
2.0
](
https://www.sqlite.org/releaselog/3_42
_0.html
)
<br>
[
System.Data.SQLite
](
https://www.nuget.org/packages/System.Data.SQLite.Core/
)
<br>
with
[
MiniProfiler
](
https://www.nuget.org/packages/MiniProfiler.Shared/
)
<br>
without mappings to underlying provider|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite
[
3.4
0.0
](
https://www.sqlite.org/releaselog/3_40
_0.html
)
<br>
[
System.Data.SQLite
](
https://www.nuget.org/packages/System.Data.SQLite.Core/
)
<br>
with
[
MiniProfiler
](
https://www.nuget.org/packages/MiniProfiler.Shared/
)
<br>
with mappings to underlying provider|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|
|SQLite
[
3.4
2.0
](
https://www.sqlite.org/releaselog/3_42
_0.html
)
<br>
[
System.Data.SQLite
](
https://www.nuget.org/packages/System.Data.SQLite.Core/
)
<br>
with
[
MiniProfiler
](
https://www.nuget.org/packages/MiniProfiler.Shared/
)
<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/
)
|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL 5.6
<br>
[
MySql.Data
](
https://www.nuget.org/packages/MySql.Data/
)
|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL 5.6
<br>
[
MySqlConnector
](
https://www.nuget.org/packages/MySqlConnector/
)
|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL 5.6
<br>
[
MySqlConnector
](
https://www.nuget.org/packages/MySqlConnector/
)
|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL (latest)
<br>
[
MySql.Data
](
https://www.nuget.org/packages/MySql.Data/
)
|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
|MySQL (latest)
<br>
[
MySql.Data
](
https://www.nuget.org/packages/MySql.Data/
)
|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:|
...
...
Build/Azure/pipelines/templates/build-job.yml
浏览文件 @
375c6581
...
@@ -17,7 +17,7 @@ jobs:
...
@@ -17,7 +17,7 @@ jobs:
displayName
:
'
Install
.NET'
displayName
:
'
Install
.NET'
inputs
:
inputs
:
packageType
:
sdk
packageType
:
sdk
version
:
7.
0.203
version
:
7.
x
-
task
:
PowerShell@2
-
task
:
PowerShell@2
inputs
:
inputs
:
...
...
Build/Azure/pipelines/templates/build-vars.yml
浏览文件 @
375c6581
...
@@ -5,8 +5,8 @@ variables:
...
@@ -5,8 +5,8 @@ variables:
baselines_master
:
master
baselines_master
:
master
solution
:
'
linq2db.sln'
solution
:
'
linq2db.sln'
build_configuration
:
'
Azure'
build_configuration
:
'
Azure'
assemblyVersion
:
5.
2.3
assemblyVersion
:
5.
3.0
${{ if eq(variables['Build.SourceBranchName'], 'release') }}
:
${{ if eq(variables['Build.SourceBranchName'], 'release') }}
:
packageVersion
:
5.
2.3
packageVersion
:
5.
3.0
${{ if ne(variables['Build.SourceBranchName'], 'release') }}
:
${{ if ne(variables['Build.SourceBranchName'], 'release') }}
:
packageVersion
:
5.
2.3
packageVersion
:
5.
3.0
Build/Azure/pipelines/templates/test-workflow-linux.yml
浏览文件 @
375c6581
...
@@ -22,7 +22,7 @@ steps:
...
@@ -22,7 +22,7 @@ steps:
displayName
:
'
Install
.NET
7'
displayName
:
'
Install
.NET
7'
inputs
:
inputs
:
packageType
:
sdk
packageType
:
sdk
version
:
7.
0.203
version
:
7.
x
condition
:
and(variables.title, succeeded())
condition
:
and(variables.title, succeeded())
-
task
:
CmdLine@2
-
task
:
CmdLine@2
...
...
Build/Azure/pipelines/templates/test-workflow-macos.yml
浏览文件 @
375c6581
...
@@ -22,7 +22,7 @@ steps:
...
@@ -22,7 +22,7 @@ steps:
displayName
:
'
Install
.NET
7'
displayName
:
'
Install
.NET
7'
inputs
:
inputs
:
packageType
:
sdk
packageType
:
sdk
version
:
7.
0.203
version
:
7.
x
condition
:
and(variables.title, succeeded())
condition
:
and(variables.title, succeeded())
-
task
:
CmdLine@2
-
task
:
CmdLine@2
...
...
Build/Azure/pipelines/templates/test-workflow-windows.yml
浏览文件 @
375c6581
...
@@ -31,7 +31,7 @@ steps:
...
@@ -31,7 +31,7 @@ steps:
displayName
:
'
Install
.NET
7
(x86)'
displayName
:
'
Install
.NET
7
(x86)'
inputs
:
inputs
:
packageType
:
sdk
packageType
:
sdk
version
:
7.
0.203
version
:
7.
x
condition
:
and(variables.title, eq(variables.net70, 'true'), eq(variables.x86, 'true'), succeeded())
condition
:
and(variables.title, eq(variables.net70, 'true'), eq(variables.x86, 'true'), succeeded())
env
:
env
:
PROCESSOR_ARCHITECTURE
:
x86
PROCESSOR_ARCHITECTURE
:
x86
...
@@ -40,7 +40,7 @@ steps:
...
@@ -40,7 +40,7 @@ steps:
displayName
:
'
Install
.NET
7'
displayName
:
'
Install
.NET
7'
inputs
:
inputs
:
packageType
:
sdk
packageType
:
sdk
version
:
7.
0.203
version
:
7.
x
condition
:
and(variables.title, succeeded())
condition
:
and(variables.title, succeeded())
-
task
:
CmdLine@2
-
task
:
CmdLine@2
...
...
Directory.Packages.props
浏览文件 @
375c6581
...
@@ -15,13 +15,13 @@
...
@@ -15,13 +15,13 @@
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<!--Source of NullabilityInfoContext for runtimes before .net 6-->
<!--Source of NullabilityInfoContext for runtimes before .net 6-->
<PackageVersion Include="Nullability.Source" Version="2.1.0" />
<PackageVersion Include="Nullability.Source" Version="2.1.0" />
<PackageVersion Include="PolySharp" Version="1.13.
1
" />
<PackageVersion Include="PolySharp" Version="1.13.
2
" />
<!--build support-->
<!--build support-->
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.5-beta1.23
165.1
" />
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.5-beta1.23
225.2
" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="Mono.TextTemplating" Version="2.3.1" />
<PackageVersion Include="Mono.TextTemplating" Version="2.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.
5
.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.
6
.0" />
<!--data providers-->
<!--data providers-->
<PackageVersion Include="AdoNetCore.AseClient" Version="0.19.2" />
<PackageVersion Include="AdoNetCore.AseClient" Version="0.19.2" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.5" />
...
@@ -31,9 +31,9 @@
...
@@ -31,9 +31,9 @@
<!--3.21 provider currently contains bug which leads to test failures with oracle 12+-->
<!--3.21 provider currently contains bug which leads to test failures with oracle 12+-->
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="2.19.190" />
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="2.19.190" />
<!--<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.100" />-->
<!--<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.100" />-->
<PackageVersion Include="Devart.Data.Oracle" Version="10.1.1
34
" />
<PackageVersion Include="Devart.Data.Oracle" Version="10.1.1
51
" />
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.11
7
" />
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.11
8
" />
<PackageVersion Include="IBM.Data.DB.Provider" Version="11.5.5010.4" />
<PackageVersion Include="IBM.Data.DB.Provider" Version="11.5.5010.4" />
<PackageVersion Include="IBM.Data.DB2.Core" Version="3.1.0.600" />
<PackageVersion Include="IBM.Data.DB2.Core" Version="3.1.0.600" />
<PackageVersion Include="IBM.Data.DB2.Core-lnx" Version="3.1.0.500" />
<PackageVersion Include="IBM.Data.DB2.Core-lnx" Version="3.1.0.500" />
...
@@ -42,25 +42,24 @@
...
@@ -42,25 +42,24 @@
<PackageVersion Include="Net.IBM.Data.Db2-lnx" Version="7.0.0.200" />
<PackageVersion Include="Net.IBM.Data.Db2-lnx" Version="7.0.0.200" />
<PackageVersion Include="Net.IBM.Data.Db2-osx" Version="7.0.0.200" />
<PackageVersion Include="Net.IBM.Data.Db2-osx" Version="7.0.0.200" />
<PackageVersion Include="Octonica.ClickHouseClient" Version="2.2.9" />
<PackageVersion Include="Octonica.ClickHouseClient" Version="2.2.9" />
<PackageVersion Include="Npgsql" Version="7.0.
2
" />
<PackageVersion Include="Npgsql" Version="7.0.
4
" />
<PackageVersion Include="ClickHouse.Client" Version="6.
5.2
" />
<PackageVersion Include="ClickHouse.Client" Version="6.
6.0
" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.5" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.5" />
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
<!--tests support-->
<!--tests support-->
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.
4.2
" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.
5.0
" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.
0
" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.
2
" />
<PackageVersion Include="FluentAssertions" Version="6.11.0" />
<PackageVersion Include="FluentAssertions" Version="6.11.0" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
<PackageVersion Include="JetBrains.Profiler.Api" Version="1.1.8" />
<PackageVersion Include="JetBrains.Profiler.Api" Version="1.1.8" />
<PackageVersion Include="FSharp.Core" Version="7.0.
2
00" />
<PackageVersion Include="FSharp.Core" Version="7.0.
3
00" />
<!--packages for test projects-->
<!--packages for test projects-->
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
<PackageVersion Include="MiniProfiler.Shared" Version="4.2.22" />
<PackageVersion Include="MiniProfiler.Shared" Version="4.3.8" />
<!--frozen due https://github.com/OData/WebApi/issues/2767-->
<PackageVersion Include="MiniProfiler.Minimal" Version="4.3.8" />
<PackageVersion Include="Microsoft.AspNet.OData" Version="7.6.4" />
<PackageVersion Include="Microsoft.AspNet.OData" Version="7.7.0" />
<!--don't update due to https://github.com/OData/AspNetCoreOData/issues/420#issuecomment-1219208060-->
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="8.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.OData" Version="8.0.4" />
<PackageVersion Include="NodaTime" Version="3.1.9" />
<PackageVersion Include="NodaTime" Version="3.1.9" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.3.2" />
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.3.2" />
...
@@ -70,7 +69,7 @@
...
@@ -70,7 +69,7 @@
-->
-->
<!--remote targets + remote examples targets-->
<!--remote targets + remote examples targets-->
<!--source-->
<!--source-->
<PackageVersion Include="Grpc.Net.Client" Version="2.5
2
.0" />
<PackageVersion Include="Grpc.Net.Client" Version="2.5
3
.0" />
<!--examples-->
<!--examples-->
<PackageVersion Include="linq2db.t4models" Version="4.3.0" />
<PackageVersion Include="linq2db.t4models" Version="4.3.0" />
<!--tests-->
<!--tests-->
...
@@ -122,7 +121,7 @@
...
@@ -122,7 +121,7 @@
</ItemGroup>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' AND '$(TargetFramework)' != 'netcoreapp3.1' ">
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' AND '$(TargetFramework)' != 'netcoreapp3.1' ">
<PackageVersion Include="MySqlConnector" Version="2.2.
5
" />
<PackageVersion Include="MySqlConnector" Version="2.2.
6
" />
</ItemGroup>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">
...
...
NuGet/PostgreSQL/LinqToDB.PostgreSQL.Tools.ttinclude
浏览文件 @
375c6581
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<#@ include file="LinqToDB.PostgreSQL.ttinclude" once="true" #>
<#@ include file="LinqToDB.PostgreSQL.ttinclude" once="true" #>
<#
<#
var toolsPath = GetProviderToolsPath("Npgsql", "Npgsql, Version=7.0.
2
.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7");
var toolsPath = GetProviderToolsPath("Npgsql", "Npgsql, Version=7.0.
4
.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7");
LoadAssembly("System.Threading.Tasks.Extensions" , toolsPath);
LoadAssembly("System.Threading.Tasks.Extensions" , toolsPath);
LoadAssembly("System.Text.Json" , toolsPath);
LoadAssembly("System.Text.Json" , toolsPath);
...
...
NuGet/README.linq2db.md
浏览文件 @
375c6581
...
@@ -744,7 +744,7 @@ public class DbDataContext : DataConnection
...
@@ -744,7 +744,7 @@ public class DbDataContext : DataConnection
public
override
DbCommand
UnwrapCommand
(
IDataContext
dataContext
,
DbCommand
command
)
public
override
DbCommand
UnwrapCommand
(
IDataContext
dataContext
,
DbCommand
command
)
{
{
return
command
is
ProfiledDbCommand
c
?
c
.
Internal
Command
:
command
;
return
command
is
ProfiledDbCommand
c
?
c
.
Wrapped
Command
:
command
;
}
}
public
override
DbDataReader
UnwrapDataReader
(
IDataContext
dataContext
,
DbDataReader
dataReader
)
public
override
DbDataReader
UnwrapDataReader
(
IDataContext
dataContext
,
DbDataReader
dataReader
)
...
...
NuGet/linq2db.MySqlConnector.nuspec
浏览文件 @
375c6581
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<readme>
README.md
</readme>
<readme>
README.md
</readme>
<dependencies>
<dependencies>
<dependency
id=
"linq2db"
version=
"5.0.0"
/>
<dependency
id=
"linq2db"
version=
"5.0.0"
/>
<dependency
id=
"MySqlConnector"
version=
"2.2.
5
"
/>
<dependency
id=
"MySqlConnector"
version=
"2.2.
6
"
/>
</dependencies>
</dependencies>
<contentFiles>
<contentFiles>
<files
include=
"**\*"
buildAction=
"None"
/>
<files
include=
"**\*"
buildAction=
"None"
/>
...
...
NuGet/linq2db.PostgreSQL.nuspec
浏览文件 @
375c6581
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
</group>
</group>
<group
targetFramework=
"netstandard2.0"
>
<group
targetFramework=
"netstandard2.0"
>
<dependency
id=
"linq2db"
version=
"5.0.0"
/>
<dependency
id=
"linq2db"
version=
"5.0.0"
/>
<dependency
id=
"Npgsql"
version=
"7.0.
2
"
/>
<dependency
id=
"Npgsql"
version=
"7.0.
4
"
/>
</group>
</group>
</dependencies>
</dependencies>
<contentFiles>
<contentFiles>
...
...
NuGet/linq2db.SQLite.nuspec
浏览文件 @
375c6581
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<readme>
README.md
</readme>
<readme>
README.md
</readme>
<dependencies>
<dependencies>
<dependency
id=
"linq2db"
version=
"5.0.0"
/>
<dependency
id=
"linq2db"
version=
"5.0.0"
/>
<dependency
id=
"System.Data.SQLite.Core"
version=
"1.0.11
7
"
/>
<dependency
id=
"System.Data.SQLite.Core"
version=
"1.0.11
8
"
/>
</dependencies>
</dependencies>
<contentFiles>
<contentFiles>
<files
include=
"**\*"
buildAction=
"None"
/>
<files
include=
"**\*"
buildAction=
"None"
/>
...
...
README.md
浏览文件 @
375c6581
...
@@ -729,7 +729,7 @@ public class DbDataContext : DataConnection
...
@@ -729,7 +729,7 @@ public class DbDataContext : DataConnection
public
override
DbCommand
UnwrapCommand
(
IDataContext
dataContext
,
DbCommand
command
)
public
override
DbCommand
UnwrapCommand
(
IDataContext
dataContext
,
DbCommand
command
)
{
{
return
command
is
ProfiledDbCommand
c
?
c
.
Internal
Command
:
command
;
return
command
is
ProfiledDbCommand
c
?
c
.
Wrapped
Command
:
command
;
}
}
public
override
DbDataReader
UnwrapDataReader
(
IDataContext
dataContext
,
DbDataReader
dataReader
)
public
override
DbDataReader
UnwrapDataReader
(
IDataContext
dataContext
,
DbDataReader
dataReader
)
...
...
Tests/Base/Interceptors/SaveWrappedCommandInterceptor.cs
浏览文件 @
375c6581
...
@@ -26,7 +26,7 @@ public SaveWrappedCommandInterceptor(bool unwrap)
...
@@ -26,7 +26,7 @@ public SaveWrappedCommandInterceptor(bool unwrap)
public
override
DbCommand
CommandInitialized
(
CommandEventData
eventData
,
DbCommand
command
)
public
override
DbCommand
CommandInitialized
(
CommandEventData
eventData
,
DbCommand
command
)
{
{
Parameters
=
command
.
Parameters
.
Cast
<
DbParameter
>().
ToArray
();
Parameters
=
command
.
Parameters
.
Cast
<
DbParameter
>().
ToArray
();
Command
=
_unwrap
?
(
DbCommand
)((
dynamic
)
command
).
Internal
Command
:
command
;
Command
=
_unwrap
?
(
DbCommand
)((
dynamic
)
command
).
Wrapped
Command
:
command
;
return
command
;
return
command
;
}
}
...
...
Tests/Base/TestProviders/UnwrapProfilerInterceptor.cs
浏览文件 @
375c6581
...
@@ -26,7 +26,7 @@ public override DbTransaction UnwrapTransaction(IDataContext dataContext, DbTran
...
@@ -26,7 +26,7 @@ public override DbTransaction UnwrapTransaction(IDataContext dataContext, DbTran
public
override
DbCommand
UnwrapCommand
(
IDataContext
dataContext
,
DbCommand
command
)
public
override
DbCommand
UnwrapCommand
(
IDataContext
dataContext
,
DbCommand
command
)
{
{
return
command
is
ProfiledDbCommand
c
?
c
.
Internal
Command
:
command
;
return
command
is
ProfiledDbCommand
c
?
c
.
Wrapped
Command
:
command
;
}
}
public
override
DbDataReader
UnwrapDataReader
(
IDataContext
dataContext
,
DbDataReader
dataReader
)
public
override
DbDataReader
UnwrapDataReader
(
IDataContext
dataContext
,
DbDataReader
dataReader
)
...
...
Tests/Base/Tests.Base.csproj
浏览文件 @
375c6581
...
@@ -9,12 +9,12 @@
...
@@ -9,12 +9,12 @@
<ProjectReference Include="..\Model\Tests.Model.csproj" />
<ProjectReference Include="..\Model\Tests.Model.csproj" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit" />
<PackageReference Include="MiniProfiler.Shared" />
</ItemGroup>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net472' ">
<ItemGroup Condition="'$(TargetFramework)' == 'net472' ">
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel" />
<PackageReference Include="MiniProfiler.Shared" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>
</ItemGroup>
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
<PackageReference Include="protobuf-net.Grpc.AspNetCore" />
<PackageReference Include="protobuf-net.Grpc.AspNetCore" />
<PackageReference Include="MiniProfiler.Minimal" />
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
...
...
Tests/Linq/DataProvider/SQLiteTests.cs
浏览文件 @
375c6581
...
@@ -597,7 +597,7 @@ public void TestDbVersion([IncludeDataSources(TestProvName.AllSQLite)] string co
...
@@ -597,7 +597,7 @@ public void TestDbVersion([IncludeDataSources(TestProvName.AllSQLite)] string co
case
ProviderName
.
SQLiteClassic
:
case
ProviderName
.
SQLiteClassic
:
case
TestProvName
.
SQLiteClassicMiniProfilerMapped
:
case
TestProvName
.
SQLiteClassicMiniProfilerMapped
:
case
TestProvName
.
SQLiteClassicMiniProfilerUnmapped
:
case
TestProvName
.
SQLiteClassicMiniProfilerUnmapped
:
expectedVersion
=
"3.4
0
.0"
;
expectedVersion
=
"3.4
2
.0"
;
break
;
break
;
case
ProviderName
.
SQLiteMS
:
case
ProviderName
.
SQLiteMS
:
expectedVersion
=
"3.40.1"
;
expectedVersion
=
"3.40.1"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录