From 375c658133d4d9155f93723eb9fd96266274ff45 Mon Sep 17 00:00:00 2001 From: MaceWindu Date: Mon, 12 Jun 2023 20:03:30 +0200 Subject: [PATCH] Updates (#4165) * bump version, unpin v7 SDK * updates * fix assert --- Build/Azure/README.md | 6 ++-- Build/Azure/pipelines/templates/build-job.yml | 2 +- .../Azure/pipelines/templates/build-vars.yml | 6 ++-- .../templates/test-workflow-linux.yml | 2 +- .../templates/test-workflow-macos.yml | 2 +- .../templates/test-workflow-windows.yml | 4 +-- Directory.Packages.props | 33 +++++++++---------- .../LinqToDB.PostgreSQL.Tools.ttinclude | 2 +- NuGet/README.linq2db.md | 2 +- NuGet/linq2db.MySqlConnector.nuspec | 2 +- NuGet/linq2db.PostgreSQL.nuspec | 2 +- NuGet/linq2db.SQLite.nuspec | 2 +- README.md | 2 +- .../SaveWrappedCommandInterceptor.cs | 2 +- .../UnwrapProfilerInterceptor.cs | 2 +- Tests/Base/Tests.Base.csproj | 3 +- Tests/Linq/DataProvider/SQLiteTests.cs | 2 +- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Build/Azure/README.md b/Build/Azure/README.md index e4f54ec57..85846bd3d 100644 --- a/Build/Azure/README.md +++ b/Build/Azure/README.md @@ -70,9 +70,9 @@ Legend: |:---|:---:|:---:|:---:|:---:| |TestNoopProvider[1](#notes)|: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)
[Microsoft.Data.SQLite](https://www.nuget.org/packages/Microsoft.Data.SQLite/)
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)
[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/)
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)
[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/)
with [MiniProfiler](https://www.nuget.org/packages/MiniProfiler.Shared/)
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)
[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/)
with [MiniProfiler](https://www.nuget.org/packages/MiniProfiler.Shared/)
with mappings to underlying provider|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +|SQLite [3.42.0](https://www.sqlite.org/releaselog/3_42_0.html)
[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/)
with NorthwindDB Tests|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +|SQLite [3.42.0](https://www.sqlite.org/releaselog/3_42_0.html)
[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/)
with [MiniProfiler](https://www.nuget.org/packages/MiniProfiler.Shared/)
without mappings to underlying provider|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| +|SQLite [3.42.0](https://www.sqlite.org/releaselog/3_42_0.html)
[System.Data.SQLite](https://www.nuget.org/packages/System.Data.SQLite.Core/)
with [MiniProfiler](https://www.nuget.org/packages/MiniProfiler.Shared/)
with mappings to underlying provider|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:| |MySQL 5.6
[MySql.Data](https://www.nuget.org/packages/MySql.Data/)|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:| |MySQL 5.6
[MySqlConnector](https://www.nuget.org/packages/MySqlConnector/)|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:| |MySQL (latest)
[MySql.Data](https://www.nuget.org/packages/MySql.Data/)|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:| diff --git a/Build/Azure/pipelines/templates/build-job.yml b/Build/Azure/pipelines/templates/build-job.yml index af207b0ca..d63db4675 100644 --- a/Build/Azure/pipelines/templates/build-job.yml +++ b/Build/Azure/pipelines/templates/build-job.yml @@ -17,7 +17,7 @@ jobs: displayName: 'Install .NET' inputs: packageType: sdk - version: 7.0.203 + version: 7.x - task: PowerShell@2 inputs: diff --git a/Build/Azure/pipelines/templates/build-vars.yml b/Build/Azure/pipelines/templates/build-vars.yml index 5ca1b1961..264321310 100644 --- a/Build/Azure/pipelines/templates/build-vars.yml +++ b/Build/Azure/pipelines/templates/build-vars.yml @@ -5,8 +5,8 @@ variables: baselines_master: master solution: 'linq2db.sln' build_configuration: 'Azure' - assemblyVersion: 5.2.3 + assemblyVersion: 5.3.0 ${{ if eq(variables['Build.SourceBranchName'], 'release') }}: - packageVersion: 5.2.3 + packageVersion: 5.3.0 ${{ if ne(variables['Build.SourceBranchName'], 'release') }}: - packageVersion: 5.2.3 + packageVersion: 5.3.0 diff --git a/Build/Azure/pipelines/templates/test-workflow-linux.yml b/Build/Azure/pipelines/templates/test-workflow-linux.yml index 21f8d63ab..bd62995f7 100644 --- a/Build/Azure/pipelines/templates/test-workflow-linux.yml +++ b/Build/Azure/pipelines/templates/test-workflow-linux.yml @@ -22,7 +22,7 @@ steps: displayName: 'Install .NET 7' inputs: packageType: sdk - version: 7.0.203 + version: 7.x condition: and(variables.title, succeeded()) - task: CmdLine@2 diff --git a/Build/Azure/pipelines/templates/test-workflow-macos.yml b/Build/Azure/pipelines/templates/test-workflow-macos.yml index 6ed9c08fa..212f6be5b 100644 --- a/Build/Azure/pipelines/templates/test-workflow-macos.yml +++ b/Build/Azure/pipelines/templates/test-workflow-macos.yml @@ -22,7 +22,7 @@ steps: displayName: 'Install .NET 7' inputs: packageType: sdk - version: 7.0.203 + version: 7.x condition: and(variables.title, succeeded()) - task: CmdLine@2 diff --git a/Build/Azure/pipelines/templates/test-workflow-windows.yml b/Build/Azure/pipelines/templates/test-workflow-windows.yml index b916aaeaf..8ec8c5375 100644 --- a/Build/Azure/pipelines/templates/test-workflow-windows.yml +++ b/Build/Azure/pipelines/templates/test-workflow-windows.yml @@ -31,7 +31,7 @@ steps: displayName: 'Install .NET 7 (x86)' inputs: packageType: sdk - version: 7.0.203 + version: 7.x condition: and(variables.title, eq(variables.net70, 'true'), eq(variables.x86, 'true'), succeeded()) env: PROCESSOR_ARCHITECTURE: x86 @@ -40,7 +40,7 @@ steps: displayName: 'Install .NET 7' inputs: packageType: sdk - version: 7.0.203 + version: 7.x condition: and(variables.title, succeeded()) - task: CmdLine@2 diff --git a/Directory.Packages.props b/Directory.Packages.props index b6045439a..36f9002e5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -15,13 +15,13 @@ - + - + - + @@ -31,9 +31,9 @@ - + - + @@ -42,25 +42,24 @@ - - + + - - + + - + - - - - - + + + + @@ -70,7 +69,7 @@ --> - + @@ -122,7 +121,7 @@ - + diff --git a/NuGet/PostgreSQL/LinqToDB.PostgreSQL.Tools.ttinclude b/NuGet/PostgreSQL/LinqToDB.PostgreSQL.Tools.ttinclude index 771949ebd..5c4a4b7ed 100644 --- a/NuGet/PostgreSQL/LinqToDB.PostgreSQL.Tools.ttinclude +++ b/NuGet/PostgreSQL/LinqToDB.PostgreSQL.Tools.ttinclude @@ -3,7 +3,7 @@ <#@ 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.Text.Json" , toolsPath); diff --git a/NuGet/README.linq2db.md b/NuGet/README.linq2db.md index c6fca6e77..81a633080 100644 --- a/NuGet/README.linq2db.md +++ b/NuGet/README.linq2db.md @@ -744,7 +744,7 @@ public class DbDataContext : DataConnection public override DbCommand UnwrapCommand(IDataContext dataContext, DbCommand command) { - return command is ProfiledDbCommand c ? c.InternalCommand : command; + return command is ProfiledDbCommand c ? c.WrappedCommand : command; } public override DbDataReader UnwrapDataReader(IDataContext dataContext, DbDataReader dataReader) diff --git a/NuGet/linq2db.MySqlConnector.nuspec b/NuGet/linq2db.MySqlConnector.nuspec index 17ae81fb3..2b93b0fa9 100644 --- a/NuGet/linq2db.MySqlConnector.nuspec +++ b/NuGet/linq2db.MySqlConnector.nuspec @@ -14,7 +14,7 @@ README.md - + diff --git a/NuGet/linq2db.PostgreSQL.nuspec b/NuGet/linq2db.PostgreSQL.nuspec index b1821eeb6..52b6a8110 100644 --- a/NuGet/linq2db.PostgreSQL.nuspec +++ b/NuGet/linq2db.PostgreSQL.nuspec @@ -23,7 +23,7 @@ - + diff --git a/NuGet/linq2db.SQLite.nuspec b/NuGet/linq2db.SQLite.nuspec index a91806ac8..0a0467de2 100644 --- a/NuGet/linq2db.SQLite.nuspec +++ b/NuGet/linq2db.SQLite.nuspec @@ -14,7 +14,7 @@ README.md - + diff --git a/README.md b/README.md index 750e7f07d..830f1af04 100644 --- a/README.md +++ b/README.md @@ -729,7 +729,7 @@ public class DbDataContext : DataConnection public override DbCommand UnwrapCommand(IDataContext dataContext, DbCommand command) { - return command is ProfiledDbCommand c ? c.InternalCommand : command; + return command is ProfiledDbCommand c ? c.WrappedCommand : command; } public override DbDataReader UnwrapDataReader(IDataContext dataContext, DbDataReader dataReader) diff --git a/Tests/Base/Interceptors/SaveWrappedCommandInterceptor.cs b/Tests/Base/Interceptors/SaveWrappedCommandInterceptor.cs index 402907ee7..4802d4867 100644 --- a/Tests/Base/Interceptors/SaveWrappedCommandInterceptor.cs +++ b/Tests/Base/Interceptors/SaveWrappedCommandInterceptor.cs @@ -26,7 +26,7 @@ public SaveWrappedCommandInterceptor(bool unwrap) public override DbCommand CommandInitialized(CommandEventData eventData, DbCommand command) { Parameters = command.Parameters.Cast().ToArray(); - Command = _unwrap ? (DbCommand)((dynamic)command).InternalCommand : command; + Command = _unwrap ? (DbCommand)((dynamic)command).WrappedCommand : command; return command; } diff --git a/Tests/Base/TestProviders/UnwrapProfilerInterceptor.cs b/Tests/Base/TestProviders/UnwrapProfilerInterceptor.cs index 9d88bee56..5f45210a7 100644 --- a/Tests/Base/TestProviders/UnwrapProfilerInterceptor.cs +++ b/Tests/Base/TestProviders/UnwrapProfilerInterceptor.cs @@ -26,7 +26,7 @@ public override DbTransaction UnwrapTransaction(IDataContext dataContext, DbTran public override DbCommand UnwrapCommand(IDataContext dataContext, DbCommand command) { - return command is ProfiledDbCommand c ? c.InternalCommand : command; + return command is ProfiledDbCommand c ? c.WrappedCommand : command; } public override DbDataReader UnwrapDataReader(IDataContext dataContext, DbDataReader dataReader) diff --git a/Tests/Base/Tests.Base.csproj b/Tests/Base/Tests.Base.csproj index b800bde54..d8e4f6312 100644 --- a/Tests/Base/Tests.Base.csproj +++ b/Tests/Base/Tests.Base.csproj @@ -9,12 +9,12 @@ - + @@ -26,6 +26,7 @@ + diff --git a/Tests/Linq/DataProvider/SQLiteTests.cs b/Tests/Linq/DataProvider/SQLiteTests.cs index b0bb41519..c2a0e4524 100644 --- a/Tests/Linq/DataProvider/SQLiteTests.cs +++ b/Tests/Linq/DataProvider/SQLiteTests.cs @@ -597,7 +597,7 @@ public void TestDbVersion([IncludeDataSources(TestProvName.AllSQLite)] string co case ProviderName.SQLiteClassic: case TestProvName.SQLiteClassicMiniProfilerMapped: case TestProvName.SQLiteClassicMiniProfilerUnmapped: - expectedVersion = "3.40.0"; + expectedVersion = "3.42.0"; break; case ProviderName.SQLiteMS: expectedVersion = "3.40.1"; -- GitLab