Updated Marten to v4.alpha.11

ritasker · May 17, 2021 · 8881f95 · 8881f95
1 parent 523eed8
commit 8881f95
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 21 deletions.
diff --git a/CQRS.Tests/CQRS.Tests.csproj b/CQRS.Tests/CQRS.Tests.csproj
@@ -14,7 +14,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="SharpTestsEx" Version="2.0.0" />

diff --git 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
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="Ardalis.GuardClauses" Version="3.1.0" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />

diff --git a/Core.Tests/Core.Tests.csproj b/Core.Tests/Core.Tests.csproj
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
         <PackageReference Include="SharpTestsEx" Version="2.0.0" />

diff --git a/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj b/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj
@@ -14,7 +14,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />

diff --git 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
@@ -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
@@ -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
@@ -18,7 +18,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />

diff --git 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
@@ -17,7 +17,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />

diff --git a/...unts/EventSourcing.Sample.Clients.Contracts/EventSourcing.Sample.Clients.Contracts.csproj b/...unts/EventSourcing.Sample.Clients.Contracts/EventSourcing.Sample.Clients.Contracts.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Sample/BankAccounts/EventSourcing.Sample.Clients/EventSourcing.Sample.Clients.csproj b/Sample/BankAccounts/EventSourcing.Sample.Clients/EventSourcing.Sample.Clients.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/...counts/EventSourcing.Sample.IntegrationTests/EventSourcing.Sample.IntegrationTests.csproj b/...counts/EventSourcing.Sample.IntegrationTests/EventSourcing.Sample.IntegrationTests.csproj
@@ -25,7 +25,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />

diff --git a/...Sourcing.Sample.Transactions.Contracts/EventSourcing.Sample.Transactions.Contracts.csproj b/...Sourcing.Sample.Transactions.Contracts/EventSourcing.Sample.Transactions.Contracts.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...e/BankAccounts/EventSourcing.Sample.Transactions/EventSourcing.Sample.Transactions.csproj b/...e/BankAccounts/EventSourcing.Sample.Transactions/EventSourcing.Sample.Transactions.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Sample/BankAccounts/EventSourcing.Sample.Web/EventSourcing.Sample.Web.csproj b/Sample/BankAccounts/EventSourcing.Sample.Web/EventSourcing.Sample.Web.csproj
@@ -20,7 +20,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git 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
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="MediatR" Version="9.0.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />

diff --git a/...Management/MeetingsManagement.IntegrationTests/MeetingsManagement.IntegrationTests.csproj b/...Management/MeetingsManagement.IntegrationTests/MeetingsManagement.IntegrationTests.csproj
@@ -15,7 +15,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />

diff --git a/Sample/MeetingsManagement/MeetingsManagement/MeetingsManagement.csproj b/Sample/MeetingsManagement/MeetingsManagement/MeetingsManagement.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="JsonNet.PrivateSettersContractResolvers" Version="1.0.0" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />

diff --git a/...MeetingsManagement/MeetingsSearch.IntegrationTests/MeetingsSearch.IntegrationTests.csproj b/...MeetingsManagement/MeetingsSearch.IntegrationTests/MeetingsSearch.IntegrationTests.csproj
@@ -15,7 +15,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />

diff --git a/Sample/Tickets/Tickets.Tests/Tickets.Tests.csproj b/Sample/Tickets/Tickets.Tests/Tickets.Tests.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="NSubstitute" Version="4.2.2" />
         <PackageReference Include="xunit" Version="2.4.1" />

diff --git 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<Reservation>().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
@@ -8,7 +8,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Marten" Version="4.0.0-alpha.10" />
+        <PackageReference Include="Marten" Version="4.0.0-alpha.11" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">