Merge remote-tracking branch 'upstream/main' into tests-1

# Conflicts:
#	src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj
#	src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestHelpers.cs

Author: KirillKurdyukov

src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/EfCore.Ydb.FunctionalTests.csproj

@@ -16,12 +16,6 @@
         </PackageReference>
     </ItemGroup>
 
-    <ItemGroup>
-        <None Update="xunit.runner.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\..\EfCore.Ydb\src\EfCore.Ydb.csproj"/>
     </ItemGroup>

src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/Query/NorthwindQueryYdbFixtures.cs

@@ -6,7 +6,7 @@
 
 namespace EfCore.Ydb.FunctionalTests.Query;
 
-public class NorthwindQueryYdbFixture<TModelCustomizer> : NorthwindQueryRelationalFixture<TModelCustomizer>
+internal class NorthwindQueryYdbFixture<TModelCustomizer> : NorthwindQueryRelationalFixture<TModelCustomizer>
     where TModelCustomizer : ITestModelCustomizer, new()
 {
     protected override ITestStoreFactory TestStoreFactory

src/EfCore.Ydb/test/EfCore.Ydb.FunctionalTests/TestUtilities/YdbTestHelpers.cs

@@ -2,16 +2,21 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
+using Ydb.Sdk.Ado;
 
 namespace EfCore.Ydb.FunctionalTests.TestUtilities;
 
 public class YdbTestHelpers : RelationalTestHelpers
 {
+    private YdbTestHelpers()
+    {
+    }
+
     public static YdbTestHelpers Instance { get; } = new();
 
-    public override IServiceCollection AddProviderServices(IServiceCollection services)
-        => services.AddEntityFrameworkYdb();
+    public override IServiceCollection AddProviderServices(IServiceCollection services) =>
+        services.AddEntityFrameworkYdb();
 
-    public override DbContextOptionsBuilder UseProviderOptions(DbContextOptionsBuilder optionsBuilder)
-        => optionsBuilder.UseYdb(string.Empty);
+    public override DbContextOptionsBuilder UseProviderOptions(DbContextOptionsBuilder optionsBuilder) =>
+        optionsBuilder.UseYdb(new YdbConnection("Port=2136;Host=localhost;Database=/local"));
 }