diff --git a/Analysis.Build.props b/Analysis.Build.props index e08ee5a1a7..72d2814ede 100644 --- a/Analysis.Build.props +++ b/Analysis.Build.props @@ -11,7 +11,7 @@ none all - + all none all diff --git a/Directory.Build.props b/Directory.Build.props index 85d4fe3a25..97b823f921 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 6.2.0 + 6.3.0 11.0 Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko https://martendb.io/logo.png diff --git a/src/CoreTests/CoreTests.csproj b/src/CoreTests/CoreTests.csproj index dd5aca0dd5..d16c223d5c 100644 --- a/src/CoreTests/CoreTests.csproj +++ b/src/CoreTests/CoreTests.csproj @@ -16,18 +16,18 @@ - + - + - + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/DocumentDbTests/DocumentDbTests.csproj b/src/DocumentDbTests/DocumentDbTests.csproj index eb0af33e37..db4ebe85c5 100644 --- a/src/DocumentDbTests/DocumentDbTests.csproj +++ b/src/DocumentDbTests/DocumentDbTests.csproj @@ -15,14 +15,14 @@ - + - + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/EventPublisher/EventPublisher.csproj b/src/EventPublisher/EventPublisher.csproj index 7f27215063..aceea9f917 100644 --- a/src/EventPublisher/EventPublisher.csproj +++ b/src/EventPublisher/EventPublisher.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/EventSourcingTests/EventSourcingTests.csproj b/src/EventSourcingTests/EventSourcingTests.csproj index f1a7b61dd5..9c398be276 100644 --- a/src/EventSourcingTests/EventSourcingTests.csproj +++ b/src/EventSourcingTests/EventSourcingTests.csproj @@ -6,25 +6,25 @@ - - - + + + - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers - - - + + + @@ -119,22 +119,22 @@ Harness\TestsSettings.cs - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + SchemaMigrationExtensions.cs @@ -156,9 +156,9 @@ - - ..\..\..\..\..\..\usr\local\share\dotnet\shared\Microsoft.AspNetCore.App\6.0.21\Microsoft.Extensions.Hosting.dll - + + ..\..\..\..\..\..\usr\local\share\dotnet\shared\Microsoft.AspNetCore.App\6.0.21\Microsoft.Extensions.Hosting.dll + diff --git a/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj b/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj index b841409b44..623032755c 100644 --- a/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj +++ b/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -21,7 +21,7 @@ - + diff --git a/src/Marten.AspNetCore/Marten.AspNetCore.csproj b/src/Marten.AspNetCore/Marten.AspNetCore.csproj index 9a13b9aabd..4bddd3a0ec 100644 --- a/src/Marten.AspNetCore/Marten.AspNetCore.csproj +++ b/src/Marten.AspNetCore/Marten.AspNetCore.csproj @@ -3,7 +3,7 @@ net6.0;net7.0 Helpers for Marten-backed AspNetCore applications - 6.1.0 + 6.3.0 true true true @@ -22,9 +22,9 @@ - + - + diff --git a/src/Marten.AsyncDaemon.Testing/Marten.AsyncDaemon.Testing.csproj b/src/Marten.AsyncDaemon.Testing/Marten.AsyncDaemon.Testing.csproj index 7f31f025f0..ae7525d3f7 100644 --- a/src/Marten.AsyncDaemon.Testing/Marten.AsyncDaemon.Testing.csproj +++ b/src/Marten.AsyncDaemon.Testing/Marten.AsyncDaemon.Testing.csproj @@ -5,22 +5,22 @@ latest - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers - + - - - + + + diff --git a/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj b/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj index 621506fc43..c665194212 100644 --- a/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj +++ b/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj @@ -9,10 +9,10 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Marten.CommandLine/Marten.CommandLine.csproj b/src/Marten.CommandLine/Marten.CommandLine.csproj index 54d6ee7310..5daa321bf0 100644 --- a/src/Marten.CommandLine/Marten.CommandLine.csproj +++ b/src/Marten.CommandLine/Marten.CommandLine.csproj @@ -31,10 +31,10 @@ $(EnableSourceLink) - + - + diff --git a/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj b/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj index 9bdd4f03a1..5050008e33 100644 --- a/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj +++ b/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj @@ -13,11 +13,11 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Marten.NodaTime/Marten.NodaTime.csproj b/src/Marten.NodaTime/Marten.NodaTime.csproj index 0e1a763e62..ef18f6e1e7 100644 --- a/src/Marten.NodaTime/Marten.NodaTime.csproj +++ b/src/Marten.NodaTime/Marten.NodaTime.csproj @@ -1,7 +1,7 @@  NodaTime extension for Marten - 6.1.0 + 6.3.0 net6.0;net7.0 true true @@ -30,7 +30,7 @@ - + diff --git a/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj b/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj index e741ec3b63..5f01345357 100644 --- a/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj +++ b/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj @@ -8,8 +8,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Marten.PLv8/Marten.PLv8.csproj b/src/Marten.PLv8/Marten.PLv8.csproj index c6f58a2ab3..c83cb0eaff 100644 --- a/src/Marten.PLv8/Marten.PLv8.csproj +++ b/src/Marten.PLv8/Marten.PLv8.csproj @@ -2,7 +2,7 @@ Document transforms and patching extension for Marten - 6.1.0 + 6.3.0 net6.0;net7.0 true true diff --git a/src/Marten.Testing/Marten.Testing.csproj b/src/Marten.Testing/Marten.Testing.csproj index 4ed492771e..81135c7226 100644 --- a/src/Marten.Testing/Marten.Testing.csproj +++ b/src/Marten.Testing/Marten.Testing.csproj @@ -12,31 +12,31 @@ Never - + - - - + + + - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers - - - + + + - + @@ -47,7 +47,7 @@ - + diff --git a/src/Marten/Events/EventGraph.GeneratesCode.cs b/src/Marten/Events/EventGraph.GeneratesCode.cs index 08f510625e..72c8de6094 100644 --- a/src/Marten/Events/EventGraph.GeneratesCode.cs +++ b/src/Marten/Events/EventGraph.GeneratesCode.cs @@ -7,10 +7,10 @@ using Marten.Events.CodeGeneration; using Marten.Events.Projections; using Marten.Internal.Storage; -using Marten.Util; namespace Marten.Events; +#nullable enable public partial class EventGraph: ICodeFileCollection, ICodeFile { private readonly Type _storageType; diff --git a/src/Marten/Internal/CodeGeneration/DocumentProviderBuilder.cs b/src/Marten/Internal/CodeGeneration/DocumentProviderBuilder.cs index d03efbd4f7..78eeb93ae5 100644 --- a/src/Marten/Internal/CodeGeneration/DocumentProviderBuilder.cs +++ b/src/Marten/Internal/CodeGeneration/DocumentProviderBuilder.cs @@ -8,7 +8,6 @@ using Marten.Schema; using Marten.Schema.Arguments; using Marten.Schema.BulkLoading; -using Marten.Util; using Npgsql; using CommandExtensions = Weasel.Postgresql.CommandExtensions; diff --git a/src/Marten/Internal/CompiledQueries/CompiledQueryCodeFile.cs b/src/Marten/Internal/CompiledQueries/CompiledQueryCodeFile.cs index 2e5355490b..d2659a8707 100644 --- a/src/Marten/Internal/CompiledQueries/CompiledQueryCodeFile.cs +++ b/src/Marten/Internal/CompiledQueries/CompiledQueryCodeFile.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using JasperFx.CodeGeneration; using JasperFx.Core.Reflection; -using Marten.Util; namespace Marten.Internal.CompiledQueries; diff --git a/src/Marten/Internal/SecondaryStoreConfig.cs b/src/Marten/Internal/SecondaryStoreConfig.cs index 1ce34e7230..7f48536920 100644 --- a/src/Marten/Internal/SecondaryStoreConfig.cs +++ b/src/Marten/Internal/SecondaryStoreConfig.cs @@ -8,7 +8,6 @@ using JasperFx.Core.Reflection; using JasperFx.RuntimeCompiler; using Marten.Schema; -using Marten.Util; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -32,7 +31,7 @@ public GenerationRules Rules { get { - var rules = _files.FirstOrDefault().BuildStoreOptions(Services).CreateGenerationRules(); + var rules = _files.First().BuildStoreOptions(Services).CreateGenerationRules(); rules.GeneratedCodeOutputPath = rules.GeneratedCodeOutputPath.ParentDirectory().AppendPath("Stores"); diff --git a/src/Marten/Marten.csproj b/src/Marten/Marten.csproj index 1af8ebe0f7..66550a613a 100644 --- a/src/Marten/Marten.csproj +++ b/src/Marten/Marten.csproj @@ -12,38 +12,38 @@ true - - - - + + + + - - + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + @@ -59,7 +59,7 @@ snupkg - + - + diff --git a/src/Marten/Util/CodeGenExtensions.cs b/src/Marten/Util/CodeGenExtensions.cs index 180d4ad625..8fdef675c7 100644 --- a/src/Marten/Util/CodeGenExtensions.cs +++ b/src/Marten/Util/CodeGenExtensions.cs @@ -7,6 +7,7 @@ namespace Marten.Util; // TODO -- move this to JasperFx.CodeGeneration itself public static class CodeGenExtensions { + [Obsolete("Remove in v7, as it's moved to JasperFx.CodeGeneration")] public static Type FindPreGeneratedType(this Assembly assembly, string @namespace, string typeName) { var fullName = $"{@namespace}.{typeName}"; diff --git a/src/MartenBenchmarks/MartenBenchmarks.csproj b/src/MartenBenchmarks/MartenBenchmarks.csproj index df1be1b8ea..b46c48e4fe 100644 --- a/src/MartenBenchmarks/MartenBenchmarks.csproj +++ b/src/MartenBenchmarks/MartenBenchmarks.csproj @@ -12,7 +12,7 @@ - +