From 3d0a1df35f099bbf0957751c2e9acfa3f8b72a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Slivka?= Date: Thu, 15 Jul 2021 06:44:04 +0200 Subject: [PATCH 1/2] Update nuget packages. --- src/Kros.KORM.MsAccess.csproj | 59 +------ src/Properties/AssemblyInfo.cs | 5 +- src/app.config | 11 -- src/packages.config | 19 --- tests/Integration/DbSetShould.cs | 10 +- tests/Kros.KORM.MsAccess.UnitTests.csproj | 178 +++++----------------- tests/Query/Sql/LinqTranslatorTestBase.cs | 10 ++ tests/app.config | 27 ---- tests/packages.config | 45 ------ 9 files changed, 59 insertions(+), 305 deletions(-) delete mode 100644 src/app.config delete mode 100644 src/packages.config delete mode 100644 tests/app.config delete mode 100644 tests/packages.config diff --git a/src/Kros.KORM.MsAccess.csproj b/src/Kros.KORM.MsAccess.csproj index a0fcb78..3ea4786 100644 --- a/src/Kros.KORM.MsAccess.csproj +++ b/src/Kros.KORM.MsAccess.csproj @@ -43,53 +43,11 @@ - - ..\packages\Kros.KORM.4.0.0-alpha.14\lib\net46\Kros.KORM.dll - - - ..\packages\Kros.Utils.1.11.0\lib\net46\Kros.Utils.dll - - - ..\packages\Kros.Utils.MsAccess.1.8.0\lib\net46\Kros.Utils.MsAccess.dll - - - ..\packages\Microsoft.Data.SqlClient.1.1.0\lib\net46\Microsoft.Data.SqlClient.dll - - - ..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll - - - ..\packages\Microsoft.IdentityModel.JsonWebTokens.5.5.0\lib\net451\Microsoft.IdentityModel.JsonWebTokens.dll - - - ..\packages\Microsoft.IdentityModel.Logging.5.5.0\lib\net451\Microsoft.IdentityModel.Logging.dll - - - ..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net451\Microsoft.IdentityModel.Protocols.dll - - - ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net451\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll - - - ..\packages\Microsoft.IdentityModel.Tokens.5.5.0\lib\net451\Microsoft.IdentityModel.Tokens.dll - - - ..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll - - - ..\packages\System.IdentityModel.Tokens.Jwt.5.5.0\lib\net451\System.IdentityModel.Tokens.Jwt.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll - @@ -106,22 +64,21 @@ - - + + + 4.3.0 + + + 1.9.0 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index 5a7d622..138d8d9 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -32,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.9.0.0")] -[assembly: AssemblyFileVersion("1.9.0.0")] +[assembly: AssemblyVersion("1.10.0.0")] +[assembly: AssemblyFileVersion("1.10.0.0")] diff --git a/src/app.config b/src/app.config deleted file mode 100644 index 18afb92..0000000 --- a/src/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/packages.config b/src/packages.config deleted file mode 100644 index 3e347a3..0000000 --- a/src/packages.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/Integration/DbSetShould.cs b/tests/Integration/DbSetShould.cs index b7488de..dd84aaa 100644 --- a/tests/Integration/DbSetShould.cs +++ b/tests/Integration/DbSetShould.cs @@ -111,20 +111,20 @@ public void InsertDataSynchronouslyWithoutDeadLock_Jet() } [SkippableFact] - public async Task InsertDataAsync_Ace() + public Task InsertDataAsync_AceAsync() { Helpers.SkipTestIfAceProviderNotAvailable(); - await InsertDataAsyncCore(ProviderType.Ace); + return InsertDataAsyncCoreAsync(ProviderType.Ace); } [SkippableFact] - public async Task InsertDataAsync_Jet() + public Task InsertDataAsync_JetAsync() { Helpers.SkipTestIfJetProviderNotAvailable(); - await InsertDataAsyncCore(ProviderType.Jet); + return InsertDataAsyncCoreAsync(ProviderType.Jet); } - private async Task InsertDataAsyncCore(ProviderType provider) + private async Task InsertDataAsyncCoreAsync(ProviderType provider) { using (var helper = Helpers.CreateDatabase(provider, CreateTable_TestTable)) { diff --git a/tests/Kros.KORM.MsAccess.UnitTests.csproj b/tests/Kros.KORM.MsAccess.UnitTests.csproj index c6d822e..4482be1 100644 --- a/tests/Kros.KORM.MsAccess.UnitTests.csproj +++ b/tests/Kros.KORM.MsAccess.UnitTests.csproj @@ -1,8 +1,5 @@  - - - Debug AnyCPU @@ -19,8 +16,6 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - - true @@ -40,136 +35,18 @@ 4 - - ..\packages\FluentAssertions.5.9.0\lib\net45\FluentAssertions.dll - - - ..\packages\Kros.KORM.4.0.0-alpha.14\lib\net46\Kros.KORM.dll - - - ..\packages\Kros.Utils.1.11.0\lib\net46\Kros.Utils.dll - - - ..\packages\Kros.Utils.MsAccess.1.8.0\lib\net46\Kros.Utils.MsAccess.dll - - - ..\packages\Microsoft.Data.SqlClient.1.1.0\lib\net46\Microsoft.Data.SqlClient.dll - - - ..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll - - - ..\packages\Microsoft.IdentityModel.JsonWebTokens.5.5.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll - - - ..\packages\Microsoft.IdentityModel.Logging.5.5.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - - ..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.dll - - - ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll - - - ..\packages\Microsoft.IdentityModel.Tokens.5.5.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - - - ..\packages\MSTest.TestFramework.2.0.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.2.0.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Nito.AsyncEx.Context.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll - - - ..\packages\Nito.AsyncEx.Tasks.5.0.0\lib\netstandard2.0\Nito.AsyncEx.Tasks.dll - - - ..\packages\Nito.Disposables.2.0.1\lib\net461\Nito.Disposables.dll - - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll - - - ..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll - - - ..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll - True - True - - - ..\packages\System.IdentityModel.Tokens.Jwt.5.5.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll - - - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - - - ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll - True - True - - - ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - True - - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - ..\packages\Validation.2.4.22\lib\net45\Validation.dll - - - ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - ..\packages\Xunit.SkippableFact.1.3.12\lib\net452\Xunit.SkippableFact.dll - @@ -180,36 +57,49 @@ - - - - - - - {916834a9-14c5-498d-a3ed-2e3bb5b8a8c8} Kros.KORM.MsAccess + + + 5.10.3 + + + 4.3.0 + + + 1.9.0 + + + 2.2.5 + + + 2.2.5 + + + 5.1.0 + + + 2.5.42 + + + 2.4.1 + + + 2.4.3 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 1.4.13 + + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - \ No newline at end of file diff --git a/tests/Query/Sql/LinqTranslatorTestBase.cs b/tests/Query/Sql/LinqTranslatorTestBase.cs index bdf0204..b563ae4 100644 --- a/tests/Query/Sql/LinqTranslatorTestBase.cs +++ b/tests/Query/Sql/LinqTranslatorTestBase.cs @@ -189,6 +189,11 @@ public IIdGenerator CreateIdGenerator(string tableName, int batchSize) throw new NotImplementedException(); } + public IIdGenerator CreateIdGenerator(Type dataType, string tableName, int batchSize) + { + throw new NotImplementedException(); + } + public IQueryable CreateQuery(Expression expression) { throw new NotImplementedException(); @@ -272,6 +277,11 @@ public DbCommand GetCommandForCurrentTransaction() public ISqlExpressionVisitor GetExpressionVisitor() => throw new NotImplementedException(); + public IIdGeneratorsForDatabaseInit GetIdGeneratorsForDatabaseInit() + { + throw new NotImplementedException(); + } + public void SetParameterDbType(DbParameter parameter, string tableName, string columnName) { throw new NotImplementedException(); diff --git a/tests/app.config b/tests/app.config deleted file mode 100644 index 994b6cb..0000000 --- a/tests/app.config +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/packages.config b/tests/packages.config deleted file mode 100644 index f87b0a9..0000000 --- a/tests/packages.config +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From dbf32a3808a9799680b92ea4aa2b3e62e6843591 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Slivka?= Date: Thu, 15 Jul 2021 07:19:59 +0200 Subject: [PATCH 2/2] Return back async/await. --- tests/Integration/DbSetShould.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Integration/DbSetShould.cs b/tests/Integration/DbSetShould.cs index dd84aaa..460c8a6 100644 --- a/tests/Integration/DbSetShould.cs +++ b/tests/Integration/DbSetShould.cs @@ -111,17 +111,17 @@ public void InsertDataSynchronouslyWithoutDeadLock_Jet() } [SkippableFact] - public Task InsertDataAsync_AceAsync() + public async Task InsertDataAsync_AceAsync() { Helpers.SkipTestIfAceProviderNotAvailable(); - return InsertDataAsyncCoreAsync(ProviderType.Ace); + await InsertDataAsyncCoreAsync(ProviderType.Ace); } [SkippableFact] - public Task InsertDataAsync_JetAsync() + public async Task InsertDataAsync_JetAsync() { Helpers.SkipTestIfJetProviderNotAvailable(); - return InsertDataAsyncCoreAsync(ProviderType.Jet); + await InsertDataAsyncCoreAsync(ProviderType.Jet); } private async Task InsertDataAsyncCoreAsync(ProviderType provider)