From 8881f953317d1bbc581a7d5855ab349a3543e727 Mon Sep 17 00:00:00 2001 From: "oskar.dudycz" Date: Mon, 17 May 2021 20:26:57 +0200 Subject: [PATCH] Updated Marten to v4.alpha.11 --- CQRS.Tests/CQRS.Tests.csproj | 2 +- Core.Marten/Config.cs | 2 +- Core.Marten/Core.Marten.csproj | 2 +- Core.Tests/Core.Tests.csproj | 2 +- .../EventSourcing.Integration.Tests.csproj | 2 +- .../Aggregate/OutOfOrder/OutOfOrderProjectionsTest.cs | 1 + .../EventStore/Projections/AggregationProjectionsTest.cs | 1 + Marten.Integration.Tests/General/StoreInitializationTests.cs | 1 + Marten.Integration.Tests/Marten.Integration.Tests.csproj | 2 +- .../TestsInfrastructure/DocumentStoreProvider.cs | 1 + MediatR.Tests/MediatR.Tests.csproj | 2 +- .../EventSourcing.Sample.Clients.Contracts.csproj | 2 +- .../EventSourcing.Sample.Clients.csproj | 2 +- .../EventSourcing.Sample.IntegrationTests.csproj | 2 +- .../EventSourcing.Sample.Transactions.Contracts.csproj | 2 +- .../EventSourcing.Sample.Transactions.csproj | 2 +- .../EventSourcing.Sample.Web/EventSourcing.Sample.Web.csproj | 2 +- Sample/BankAccounts/EventSourcing.Sample.Web/Startup.cs | 1 + .../MeetingsManagement.Api/MeetingsManagement.Api.csproj | 2 +- .../MeetingsManagement.IntegrationTests.csproj | 2 +- .../MeetingsManagement/MeetingsManagement.csproj | 2 +- .../MeetingsSearch.IntegrationTests.csproj | 2 +- Sample/Tickets/Tickets.Tests/Tickets.Tests.csproj | 2 +- Sample/Tickets/Tickets/Reservations/ReservationsConfig.cs | 4 ++-- .../BuildYourOwnEventStore/08-Snapshots/08-Snapshots.csproj | 2 +- 25 files changed, 26 insertions(+), 21 deletions(-) diff --git a/CQRS.Tests/CQRS.Tests.csproj b/CQRS.Tests/CQRS.Tests.csproj index df66a6939..1a1145d69 100644 --- a/CQRS.Tests/CQRS.Tests.csproj +++ b/CQRS.Tests/CQRS.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/Core.Marten/Config.cs b/Core.Marten/Config.cs index 5636cd7f8..e696b6cfe 100644 --- a/Core.Marten/Config.cs +++ b/Core.Marten/Config.cs @@ -4,6 +4,7 @@ using Marten.Events.Daemon.Resiliency; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Weasel.Postgresql; namespace Core.Marten { @@ -57,7 +58,6 @@ private static void SetStoreOptions(StoreOptions options, Config config, options.DatabaseSchemaName = config.ReadModelSchema; options.UseDefaultSerialization(nonPublicMembersStorage: NonPublicMembersStorage.NonPublicSetters, enumStorage: EnumStorage.AsString); - options.PLV8Enabled = false; options.Events.Daemon.Mode = config.DaemonMode; configureOptions?.Invoke(options); diff --git a/Core.Marten/Core.Marten.csproj b/Core.Marten/Core.Marten.csproj index e3e8f6d5c..ea35de4c5 100644 --- a/Core.Marten/Core.Marten.csproj +++ b/Core.Marten/Core.Marten.csproj @@ -8,7 +8,7 @@ - + diff --git a/Core.Tests/Core.Tests.csproj b/Core.Tests/Core.Tests.csproj index bad682789..aabcd7477 100644 --- a/Core.Tests/Core.Tests.csproj +++ b/Core.Tests/Core.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj b/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj index 73f87fa5a..1b765e041 100644 --- a/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj +++ b/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/Marten.Integration.Tests/EventStore/Aggregate/OutOfOrder/OutOfOrderProjectionsTest.cs b/Marten.Integration.Tests/EventStore/Aggregate/OutOfOrder/OutOfOrderProjectionsTest.cs index b645bf535..29a4c7254 100644 --- a/Marten.Integration.Tests/EventStore/Aggregate/OutOfOrder/OutOfOrderProjectionsTest.cs +++ b/Marten.Integration.Tests/EventStore/Aggregate/OutOfOrder/OutOfOrderProjectionsTest.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Marten.Integration.Tests.TestsInfrastructure; using SharpTestsEx; +using Weasel.Postgresql; using Xunit; namespace Marten.Integration.Tests.EventStore.Projections diff --git a/Marten.Integration.Tests/EventStore/Projections/AggregationProjectionsTest.cs b/Marten.Integration.Tests/EventStore/Projections/AggregationProjectionsTest.cs index 50e7776c6..aa53023a4 100644 --- a/Marten.Integration.Tests/EventStore/Projections/AggregationProjectionsTest.cs +++ b/Marten.Integration.Tests/EventStore/Projections/AggregationProjectionsTest.cs @@ -4,6 +4,7 @@ using Marten.Events.Aggregation; using Marten.Integration.Tests.TestsInfrastructure; using SharpTestsEx; +using Weasel.Postgresql; using Xunit; namespace Marten.Integration.Tests.EventStore.Projections diff --git a/Marten.Integration.Tests/General/StoreInitializationTests.cs b/Marten.Integration.Tests/General/StoreInitializationTests.cs index 22caf6049..de38d841d 100644 --- a/Marten.Integration.Tests/General/StoreInitializationTests.cs +++ b/Marten.Integration.Tests/General/StoreInitializationTests.cs @@ -1,5 +1,6 @@ using Npgsql; using SharpTestsEx; +using Weasel.Postgresql; using Xunit; namespace Marten.Integration.Tests.General diff --git a/Marten.Integration.Tests/Marten.Integration.Tests.csproj b/Marten.Integration.Tests/Marten.Integration.Tests.csproj index acd312dbb..1df9ab692 100644 --- a/Marten.Integration.Tests/Marten.Integration.Tests.csproj +++ b/Marten.Integration.Tests/Marten.Integration.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/Marten.Integration.Tests/TestsInfrastructure/DocumentStoreProvider.cs b/Marten.Integration.Tests/TestsInfrastructure/DocumentStoreProvider.cs index 8de70653d..e253d1f97 100644 --- a/Marten.Integration.Tests/TestsInfrastructure/DocumentStoreProvider.cs +++ b/Marten.Integration.Tests/TestsInfrastructure/DocumentStoreProvider.cs @@ -1,4 +1,5 @@ using System; +using Weasel.Postgresql; namespace Marten.Integration.Tests.TestsInfrastructure { diff --git a/MediatR.Tests/MediatR.Tests.csproj b/MediatR.Tests/MediatR.Tests.csproj index 32832e146..f2ac95f44 100644 --- a/MediatR.Tests/MediatR.Tests.csproj +++ b/MediatR.Tests/MediatR.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/Sample/BankAccounts/EventSourcing.Sample.Clients.Contracts/EventSourcing.Sample.Clients.Contracts.csproj b/Sample/BankAccounts/EventSourcing.Sample.Clients.Contracts/EventSourcing.Sample.Clients.Contracts.csproj index 1f909d8a1..e5ed3544d 100644 --- a/Sample/BankAccounts/EventSourcing.Sample.Clients.Contracts/EventSourcing.Sample.Clients.Contracts.csproj +++ b/Sample/BankAccounts/EventSourcing.Sample.Clients.Contracts/EventSourcing.Sample.Clients.Contracts.csproj @@ -8,7 +8,7 @@ - + diff --git a/Sample/BankAccounts/EventSourcing.Sample.Clients/EventSourcing.Sample.Clients.csproj b/Sample/BankAccounts/EventSourcing.Sample.Clients/EventSourcing.Sample.Clients.csproj index b9401069f..7a1df3a93 100644 --- a/Sample/BankAccounts/EventSourcing.Sample.Clients/EventSourcing.Sample.Clients.csproj +++ b/Sample/BankAccounts/EventSourcing.Sample.Clients/EventSourcing.Sample.Clients.csproj @@ -12,7 +12,7 @@ - + all diff --git a/Sample/BankAccounts/EventSourcing.Sample.IntegrationTests/EventSourcing.Sample.IntegrationTests.csproj b/Sample/BankAccounts/EventSourcing.Sample.IntegrationTests/EventSourcing.Sample.IntegrationTests.csproj index 75f4dfd6d..2791f10be 100644 --- a/Sample/BankAccounts/EventSourcing.Sample.IntegrationTests/EventSourcing.Sample.IntegrationTests.csproj +++ b/Sample/BankAccounts/EventSourcing.Sample.IntegrationTests/EventSourcing.Sample.IntegrationTests.csproj @@ -25,7 +25,7 @@ - + diff --git a/Sample/BankAccounts/EventSourcing.Sample.Transactions.Contracts/EventSourcing.Sample.Transactions.Contracts.csproj b/Sample/BankAccounts/EventSourcing.Sample.Transactions.Contracts/EventSourcing.Sample.Transactions.Contracts.csproj index 1f909d8a1..e5ed3544d 100644 --- a/Sample/BankAccounts/EventSourcing.Sample.Transactions.Contracts/EventSourcing.Sample.Transactions.Contracts.csproj +++ b/Sample/BankAccounts/EventSourcing.Sample.Transactions.Contracts/EventSourcing.Sample.Transactions.Contracts.csproj @@ -8,7 +8,7 @@ - + diff --git a/Sample/BankAccounts/EventSourcing.Sample.Transactions/EventSourcing.Sample.Transactions.csproj b/Sample/BankAccounts/EventSourcing.Sample.Transactions/EventSourcing.Sample.Transactions.csproj index be68a4bf6..8da93cbd5 100644 --- a/Sample/BankAccounts/EventSourcing.Sample.Transactions/EventSourcing.Sample.Transactions.csproj +++ b/Sample/BankAccounts/EventSourcing.Sample.Transactions/EventSourcing.Sample.Transactions.csproj @@ -8,7 +8,7 @@ - + diff --git a/Sample/BankAccounts/EventSourcing.Sample.Web/EventSourcing.Sample.Web.csproj b/Sample/BankAccounts/EventSourcing.Sample.Web/EventSourcing.Sample.Web.csproj index bd7d37fe0..8a5765ee0 100644 --- a/Sample/BankAccounts/EventSourcing.Sample.Web/EventSourcing.Sample.Web.csproj +++ b/Sample/BankAccounts/EventSourcing.Sample.Web/EventSourcing.Sample.Web.csproj @@ -20,7 +20,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Sample/BankAccounts/EventSourcing.Sample.Web/Startup.cs b/Sample/BankAccounts/EventSourcing.Sample.Web/Startup.cs index 8d260dcc9..9e552450d 100644 --- a/Sample/BankAccounts/EventSourcing.Sample.Web/Startup.cs +++ b/Sample/BankAccounts/EventSourcing.Sample.Web/Startup.cs @@ -26,6 +26,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; +using Weasel.Postgresql; namespace EventSourcing.Web.Sample { diff --git a/Sample/MeetingsManagement/MeetingsManagement.Api/MeetingsManagement.Api.csproj b/Sample/MeetingsManagement/MeetingsManagement.Api/MeetingsManagement.Api.csproj index 215013cb1..cf128826a 100644 --- a/Sample/MeetingsManagement/MeetingsManagement.Api/MeetingsManagement.Api.csproj +++ b/Sample/MeetingsManagement/MeetingsManagement.Api/MeetingsManagement.Api.csproj @@ -7,7 +7,7 @@ - + diff --git a/Sample/MeetingsManagement/MeetingsManagement.IntegrationTests/MeetingsManagement.IntegrationTests.csproj b/Sample/MeetingsManagement/MeetingsManagement.IntegrationTests/MeetingsManagement.IntegrationTests.csproj index 436732f53..ea345ada8 100644 --- a/Sample/MeetingsManagement/MeetingsManagement.IntegrationTests/MeetingsManagement.IntegrationTests.csproj +++ b/Sample/MeetingsManagement/MeetingsManagement.IntegrationTests/MeetingsManagement.IntegrationTests.csproj @@ -15,7 +15,7 @@ - + diff --git a/Sample/MeetingsManagement/MeetingsManagement/MeetingsManagement.csproj b/Sample/MeetingsManagement/MeetingsManagement/MeetingsManagement.csproj index 573bb2bc3..536c3768c 100644 --- a/Sample/MeetingsManagement/MeetingsManagement/MeetingsManagement.csproj +++ b/Sample/MeetingsManagement/MeetingsManagement/MeetingsManagement.csproj @@ -8,7 +8,7 @@ - + diff --git a/Sample/MeetingsManagement/MeetingsSearch.IntegrationTests/MeetingsSearch.IntegrationTests.csproj b/Sample/MeetingsManagement/MeetingsSearch.IntegrationTests/MeetingsSearch.IntegrationTests.csproj index 67b1d7266..a2a6c673b 100644 --- a/Sample/MeetingsManagement/MeetingsSearch.IntegrationTests/MeetingsSearch.IntegrationTests.csproj +++ b/Sample/MeetingsManagement/MeetingsSearch.IntegrationTests/MeetingsSearch.IntegrationTests.csproj @@ -15,7 +15,7 @@ - + diff --git a/Sample/Tickets/Tickets.Tests/Tickets.Tests.csproj b/Sample/Tickets/Tickets.Tests/Tickets.Tests.csproj index 5e9688975..0e347d601 100644 --- a/Sample/Tickets/Tickets.Tests/Tickets.Tests.csproj +++ b/Sample/Tickets/Tickets.Tests/Tickets.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/Sample/Tickets/Tickets/Reservations/ReservationsConfig.cs b/Sample/Tickets/Tickets/Reservations/ReservationsConfig.cs index 5e1cc8c3c..712dade50 100644 --- a/Sample/Tickets/Tickets/Reservations/ReservationsConfig.cs +++ b/Sample/Tickets/Tickets/Reservations/ReservationsConfig.cs @@ -49,14 +49,14 @@ internal static void ConfigureReservations(this StoreOptions options) x.IsUnique = true; // Partial index by supplying a condition - x.Where = "(data ->> 'Status') != 'Cancelled'"; + x.Predicate = "(data ->> 'Status') != 'Cancelled'"; }); options.Schema.For().Index(x => x.Number, x => { x.IsUnique = true; // Partial index by supplying a condition - x.Where = "(data ->> 'Status') != 'Cancelled'"; + x.Predicate = "(data ->> 'Status') != 'Cancelled'"; }); diff --git a/Workshops/BuildYourOwnEventStore/08-Snapshots/08-Snapshots.csproj b/Workshops/BuildYourOwnEventStore/08-Snapshots/08-Snapshots.csproj index 30e46d87e..64c3fd517 100644 --- a/Workshops/BuildYourOwnEventStore/08-Snapshots/08-Snapshots.csproj +++ b/Workshops/BuildYourOwnEventStore/08-Snapshots/08-Snapshots.csproj @@ -8,7 +8,7 @@ - +