diff --git a/Directory.Packages.props b/Directory.Packages.props index 064af7c8..7375ed1e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,106 +1,103 @@ - - true - - - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24474.3 - - - 8.0.6 - 8.0 - 8.0.8 - - - 3.10.0 - - - 8.0.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + + + 9.0.0 + + + 8.0.6 + + + 4.0.0 + + + 9.0.1 + 0.4.74 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Core/test/Eventuous.Tests.Persistence.Base/Store/Read.cs b/src/Core/test/Eventuous.Tests.Persistence.Base/Store/Read.cs index 45e5ce2d..8abb980b 100644 --- a/src/Core/test/Eventuous.Tests.Persistence.Base/Store/Read.cs +++ b/src/Core/test/Eventuous.Tests.Persistence.Base/Store/Read.cs @@ -62,7 +62,7 @@ public async Task ShouldReadHead(CancellationToken cancellationToken) { var expected = events.Take(10); IEnumerable actual = result.Select(x => x.Payload)!; - await Assert.That(actual).IsEquivalentCollectionTo(expected); + await Assert.That(actual).IsEquivalentTo(expected); } [Test] diff --git a/src/Core/test/Eventuous.Tests.Persistence.Base/Store/TieredStoreTests.cs b/src/Core/test/Eventuous.Tests.Persistence.Base/Store/TieredStoreTests.cs index 0a65b7ed..46d84745 100644 --- a/src/Core/test/Eventuous.Tests.Persistence.Base/Store/TieredStoreTests.cs +++ b/src/Core/test/Eventuous.Tests.Persistence.Base/Store/TieredStoreTests.cs @@ -22,7 +22,7 @@ protected async Task Should_load_hot_and_archive() { var loaded = (await combined.ReadStream(stream, StreamReadPosition.Start)).ToArray(); var actual = loaded.Select(x => (TestEventForTiers)x.Payload!).ToArray(); - await Assert.That(actual).IsEquivalentCollectionTo(testEvents); + await Assert.That(actual).IsEquivalentTo(testEvents); await Assert.That(loaded.Take(50).Select(x => x.FromArchive)).DoesNotContain(false); await Assert.That(loaded.Skip(50).Select(x => x.FromArchive)).DoesNotContain(true); diff --git a/src/GooglePubSub/test/Eventuous.Tests.GooglePubSub/PubSubTests.cs b/src/GooglePubSub/test/Eventuous.Tests.GooglePubSub/PubSubTests.cs index 988c7a28..29374c77 100644 --- a/src/GooglePubSub/test/Eventuous.Tests.GooglePubSub/PubSubTests.cs +++ b/src/GooglePubSub/test/Eventuous.Tests.GooglePubSub/PubSubTests.cs @@ -8,7 +8,7 @@ namespace Eventuous.Tests.GooglePubSub; -[ClassDataSource(Shared = SharedType.ForClass)] +[ClassDataSource(Shared = SharedType.PerClass)] public class PubSubTests { static PubSubTests() => TypeMap.Instance.RegisterKnownEventTypes(typeof(TestEvent).Assembly); diff --git a/src/Mongo/src/Eventuous.Projections.MongoDB/Tools/MongoDatabaseExtensions.cs b/src/Mongo/src/Eventuous.Projections.MongoDB/Tools/MongoDatabaseExtensions.cs index 7698589b..d92b4040 100644 --- a/src/Mongo/src/Eventuous.Projections.MongoDB/Tools/MongoDatabaseExtensions.cs +++ b/src/Mongo/src/Eventuous.Projections.MongoDB/Tools/MongoDatabaseExtensions.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. using System.Linq.Expressions; -using MongoDB.Driver.Linq; namespace Eventuous.Projections.MongoDB.Tools; @@ -278,14 +277,14 @@ public static Task DeleteManyDocuments( ) where T : Document => database.GetDocumentCollection(collectionName).DeleteManyDocuments(filter, cancellationToken); - public static IMongoQueryable AsQueryable(this IMongoDatabase database, MongoCollectionName collectionName, Action? configure = null) + public static IQueryable AsQueryable(this IMongoDatabase database, MongoCollectionName collectionName, Action? configure = null) where T : Document { var options = new AggregateOptions(); configure?.Invoke(options); return database.GetDocumentCollection(collectionName).AsQueryable(options); } - public static IMongoQueryable AsQueryable(this IMongoDatabase database, Action? configure = null) where T : Document { + public static IQueryable AsQueryable(this IMongoDatabase database, Action? configure = null) where T : Document { var options = new AggregateOptions(); configure?.Invoke(options); return database.GetDocumentCollection().AsQueryable(options); diff --git a/src/SqlServer/test/Eventuous.Tests.SqlServer/Eventuous.Tests.SqlServer.csproj b/src/SqlServer/test/Eventuous.Tests.SqlServer/Eventuous.Tests.SqlServer.csproj index aec64d78..994fe7e2 100644 --- a/src/SqlServer/test/Eventuous.Tests.SqlServer/Eventuous.Tests.SqlServer.csproj +++ b/src/SqlServer/test/Eventuous.Tests.SqlServer/Eventuous.Tests.SqlServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/SqlServer/test/Eventuous.Tests.SqlServer/Fixtures/SqlContainer.cs b/src/SqlServer/test/Eventuous.Tests.SqlServer/Fixtures/SqlContainer.cs index be154928..bba1c3e1 100644 --- a/src/SqlServer/test/Eventuous.Tests.SqlServer/Fixtures/SqlContainer.cs +++ b/src/SqlServer/test/Eventuous.Tests.SqlServer/Fixtures/SqlContainer.cs @@ -1,9 +1,7 @@ -using Testcontainers.SqlEdge; +using Testcontainers.MsSql; namespace Eventuous.Tests.SqlServer.Fixtures; public static class SqlContainer { - public static SqlEdgeContainer Create() => new SqlEdgeBuilder() - .WithImage("mcr.microsoft.com/mssql/server:2022-latest") - .Build(); + public static MsSqlContainer Create() => new MsSqlBuilder().WithImage("mcr.microsoft.com/mssql/server:2022-latest").Build(); } diff --git a/src/SqlServer/test/Eventuous.Tests.SqlServer/Metrics/MetricsFixture.cs b/src/SqlServer/test/Eventuous.Tests.SqlServer/Metrics/MetricsFixture.cs index 80fdcef2..8357dea4 100644 --- a/src/SqlServer/test/Eventuous.Tests.SqlServer/Metrics/MetricsFixture.cs +++ b/src/SqlServer/test/Eventuous.Tests.SqlServer/Metrics/MetricsFixture.cs @@ -4,15 +4,15 @@ using Eventuous.Tests.OpenTelemetry.Fixtures; using Eventuous.Tests.SqlServer.Fixtures; using Microsoft.Extensions.DependencyInjection; -using Testcontainers.SqlEdge; +using Testcontainers.MsSql; namespace Eventuous.Tests.SqlServer.Metrics; public class MetricsFixture - : MetricsSubscriptionFixtureBase { + : MetricsSubscriptionFixtureBase { readonly string _schemaName = GetSchemaName(); - protected override SqlEdgeContainer CreateContainer() => SqlContainer.Create(); + protected override MsSqlContainer CreateContainer() => SqlContainer.Create(); protected override void ConfigureSubscription(SqlServerStreamSubscriptionOptions options) { options.Schema = _schemaName; diff --git a/src/SqlServer/test/Eventuous.Tests.SqlServer/Store/StoreFixture.cs b/src/SqlServer/test/Eventuous.Tests.SqlServer/Store/StoreFixture.cs index bee3b569..c21f65a1 100644 --- a/src/SqlServer/test/Eventuous.Tests.SqlServer/Store/StoreFixture.cs +++ b/src/SqlServer/test/Eventuous.Tests.SqlServer/Store/StoreFixture.cs @@ -2,11 +2,11 @@ using Eventuous.Tests.Persistence.Base.Fixtures; using Eventuous.Tests.SqlServer.Fixtures; using Microsoft.Extensions.DependencyInjection; -using Testcontainers.SqlEdge; +using Testcontainers.MsSql; namespace Eventuous.Tests.SqlServer.Store; -public sealed class StoreFixture : StoreFixtureBase { +public sealed class StoreFixture : StoreFixtureBase { readonly string _schemaName = GetSchemaName(); protected override void SetupServices(IServiceCollection services) { @@ -14,5 +14,5 @@ protected override void SetupServices(IServiceCollection services) { services.AddEventStore(); } - protected override SqlEdgeContainer CreateContainer() => SqlContainer.Create(); + protected override MsSqlContainer CreateContainer() => SqlContainer.Create(); } diff --git a/src/SqlServer/test/Eventuous.Tests.SqlServer/Store/TieredStoreTests.cs b/src/SqlServer/test/Eventuous.Tests.SqlServer/Store/TieredStoreTests.cs index bb9799fe..b3125a99 100644 --- a/src/SqlServer/test/Eventuous.Tests.SqlServer/Store/TieredStoreTests.cs +++ b/src/SqlServer/test/Eventuous.Tests.SqlServer/Store/TieredStoreTests.cs @@ -1,10 +1,10 @@ using Eventuous.Tests.Persistence.Base.Store; -using Testcontainers.SqlEdge; +using Testcontainers.MsSql; namespace Eventuous.Tests.SqlServer.Store; -[ClassDataSource(Shared = SharedType.ForClass)] -public class TieredStoreTests(StoreFixture storeFixture) : TieredStoreTestsBase(storeFixture) { +[ClassDataSource(Shared = SharedType.PerClass)] +public class TieredStoreTests(StoreFixture storeFixture) : TieredStoreTestsBase(storeFixture) { [Test] public async Task Should_load_hot_and_archive_test() { await Should_load_hot_and_archive(); diff --git a/src/SqlServer/test/Eventuous.Tests.SqlServer/Subscriptions/SubscribeTests.cs b/src/SqlServer/test/Eventuous.Tests.SqlServer/Subscriptions/SubscribeTests.cs index f0dc4662..84390b79 100644 --- a/src/SqlServer/test/Eventuous.Tests.SqlServer/Subscriptions/SubscribeTests.cs +++ b/src/SqlServer/test/Eventuous.Tests.SqlServer/Subscriptions/SubscribeTests.cs @@ -1,13 +1,13 @@ using Eventuous.SqlServer.Subscriptions; using Eventuous.Tests.Subscriptions.Base; -using Testcontainers.SqlEdge; +using Testcontainers.MsSql; // ReSharper disable UnusedType.Global namespace Eventuous.Tests.SqlServer.Subscriptions; public class SubscribeToAll() - : SubscribeToAllBase( + : SubscribeToAllBase( new SubscriptionFixture(_ => { }, false) ) { [Test] @@ -28,7 +28,7 @@ public async Task SqlServer_ShouldUseExistingCheckpoint(CancellationToken cancel [ClassDataSource(Shared = SharedType.None)] public class SubscribeToStream(StreamNameFixture streamNameFixture) - : SubscribeToStreamBase( + : SubscribeToStreamBase( streamNameFixture.StreamName, new SubscriptionFixture( opt => ConfigureOptions(opt, streamNameFixture), diff --git a/src/SqlServer/test/Eventuous.Tests.SqlServer/Subscriptions/SubscriptionFixture.cs b/src/SqlServer/test/Eventuous.Tests.SqlServer/Subscriptions/SubscriptionFixture.cs index 487ae9ad..54acbb57 100644 --- a/src/SqlServer/test/Eventuous.Tests.SqlServer/Subscriptions/SubscriptionFixture.cs +++ b/src/SqlServer/test/Eventuous.Tests.SqlServer/Subscriptions/SubscriptionFixture.cs @@ -5,7 +5,7 @@ using Eventuous.Tests.SqlServer.Fixtures; using Eventuous.Tests.Subscriptions.Base; using Microsoft.Extensions.DependencyInjection; -using Testcontainers.SqlEdge; +using Testcontainers.MsSql; namespace Eventuous.Tests.SqlServer.Subscriptions; @@ -15,7 +15,7 @@ public class SubscriptionFixture? configureServices = null, LogLevel logLevel = LogLevel.Debug ) - : SubscriptionFixtureBase( + : SubscriptionFixtureBase( autoStart, logLevel ) @@ -24,7 +24,7 @@ public class SubscriptionFixture SqlContainer.Create(); + protected override MsSqlContainer CreateContainer() => SqlContainer.Create(); protected override SqlServerCheckpointStore GetCheckpointStore(IServiceProvider sp) => sp.GetRequiredService();