Deps update

PawelGerr · PawelGerr · commit e1b478abd1c2 · 2023-03-14T19:13:41.000+01:00
diff --git a/samples/Thinktecture.EntityFrameworkCore.Benchmarks/Thinktecture.EntityFrameworkCore.Benchmarks.csproj b/samples/Thinktecture.EntityFrameworkCore.Benchmarks/Thinktecture.EntityFrameworkCore.Benchmarks.csproj
@@ -12,7 +12,7 @@
    </ItemGroup>
 
    <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
    </ItemGroup>
 
diff --git a/samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples.csproj b/samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples/Thinktecture.EntityFrameworkCore.SqlServer.Samples.csproj
@@ -17,7 +17,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3" PrivateAssets="all" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4" PrivateAssets="all" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     </ItemGroup>
diff --git a/samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples.csproj b/samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples/Thinktecture.EntityFrameworkCore.Sqlite.Samples.csproj
@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4" PrivateAssets="all" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     </ItemGroup>
diff --git a/src/Thinktecture.EntityFrameworkCore.Relational/Thinktecture.EntityFrameworkCore.Relational.csproj b/src/Thinktecture.EntityFrameworkCore.Relational/Thinktecture.EntityFrameworkCore.Relational.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.3" />
-      <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.3" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.4" />
+      <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.4" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Thinktecture.EntityFrameworkCore.SqlServer/Thinktecture.EntityFrameworkCore.SqlServer.csproj b/src/Thinktecture.EntityFrameworkCore.SqlServer/Thinktecture.EntityFrameworkCore.SqlServer.csproj
@@ -5,7 +5,7 @@
     </ItemGroup>
     
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Thinktecture.EntityFrameworkCore.Sqlite/EntityFrameworkCore/BulkOperations/SqliteCommandBuilder.cs b/src/Thinktecture.EntityFrameworkCore.Sqlite/EntityFrameworkCore/BulkOperations/SqliteCommandBuilder.cs
@@ -1,6 +1,5 @@
 using System.Text;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.ObjectPool;
 using Thinktecture.EntityFrameworkCore.Data;
diff --git a/src/Thinktecture.EntityFrameworkCore.Sqlite/Thinktecture.EntityFrameworkCore.Sqlite.csproj b/src/Thinktecture.EntityFrameworkCore.Sqlite/Thinktecture.EntityFrameworkCore.Sqlite.csproj
@@ -5,7 +5,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -10,7 +10,7 @@
 
    <ItemGroup>
       <PackageReference Include="FluentAssertions" Version="6.10.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
       <PackageReference Include="Moq" Version="4.18.4" />
       <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
       <PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
diff --git a/tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests.csproj
@@ -9,7 +9,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/IntegrationTestsBase.cs b/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/IntegrationTestsBase.cs
@@ -3,9 +3,7 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.Extensions.Logging;
 using Thinktecture.EntityFrameworkCore.Infrastructure;
-using Thinktecture.EntityFrameworkCore.Parameters;
 using Thinktecture.EntityFrameworkCore.Query;
-using Thinktecture.EntityFrameworkCore.TempTables;
 using Thinktecture.EntityFrameworkCore.Testing;
 using Thinktecture.Json;
 using Thinktecture.TestDatabaseContext;
diff --git a/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/SqlServerContainerFixture.cs b/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/SqlServerContainerFixture.cs
@@ -1,31 +1,24 @@
-using DotNet.Testcontainers.Builders;
-using DotNet.Testcontainers.Configurations;
-using DotNet.Testcontainers.Containers;
+using Testcontainers.MsSql;
 
 namespace Thinktecture;
 
 public class SqlServerContainerFixture : IDisposable, IAsyncDisposable, IAsyncLifetime
 {
-   private readonly MsSqlTestcontainer _sqlServerContainer;
+   private readonly MsSqlContainer _sqlServerContainer;
    private bool _isDisposed;
 
-   public string ConnectionString => $"{_sqlServerContainer.ConnectionString};TrustServerCertificate=true;";
+   public string ConnectionString => _sqlServerContainer.GetConnectionString();
 
    public SqlServerContainerFixture()
    {
       _sqlServerContainer = BuildContainer();
    }
 
-   private static MsSqlTestcontainer BuildContainer()
+   private static MsSqlContainer BuildContainer()
    {
-      // https: //github.com/testcontainers/testcontainers-dotnet/issues/750#issuecomment-1412257694
-#pragma warning disable 618
-      return new TestcontainersBuilder<MsSqlTestcontainer>()
-#pragma warning restore 618
-             .WithDatabase(new MsSqlTestcontainerConfiguration("mcr.microsoft.com/mssql/server:2022-latest")
-                           {
-                              Password = $"P@sswo0d01_{Guid.NewGuid()}"
-                           })
+      return new MsSqlBuilder()
+             .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
+             .WithPassword($"P@sswo0d01_{Guid.NewGuid()}")
              .WithCleanUp(true)
              .Build();
    }
diff --git a/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests.csproj
@@ -5,10 +5,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4" PrivateAssets="all" />
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-       <PackageReference Include="Testcontainers" Version="2.4.0" />
+       <PackageReference Include="Testcontainers.MsSql" Version="3.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests/Thinktecture.EntityFrameworkCore.Sqlite.Tests.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4" PrivateAssets="all" />
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
         <PackageReference Include="Xunit.Extensions.AssemblyFixture" Version="2.4.1" />
diff --git a/tests/Thinktecture.EntityFrameworkCore.TestHelpers/Thinktecture.EntityFrameworkCore.TestHelpers.csproj b/tests/Thinktecture.EntityFrameworkCore.TestHelpers/Thinktecture.EntityFrameworkCore.TestHelpers.csproj
@@ -6,7 +6,7 @@
    </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.3" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.4" />
    </ItemGroup>
 
 </Project>
diff --git a/tests/Thinktecture.EntityFrameworkCore.Testing.Tests/Thinktecture.EntityFrameworkCore.Testing.Tests.csproj b/tests/Thinktecture.EntityFrameworkCore.Testing.Tests/Thinktecture.EntityFrameworkCore.Testing.Tests.csproj
@@ -6,7 +6,7 @@
    </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
    </ItemGroup>
 
    <ItemGroup>
