diff --git a/.github/workflows/docs-prs.yml b/.github/workflows/docs-prs.yml index 561f10909c..283661b9fe 100644 --- a/.github/workflows/docs-prs.yml +++ b/.github/workflows/docs-prs.yml @@ -42,6 +42,11 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + + - name: Install .NET 9.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 9.0.x - name: Build docs run: ./build.sh docs-build \ No newline at end of file diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3bafbf1f77..8cdeb7ec51 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -41,6 +41,11 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + + - name: Install .NET 9.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 9.0.x - name: Build & Deploy docs preview run: | diff --git a/.github/workflows/on-manual-do-nuget-publish.yml b/.github/workflows/on-manual-do-nuget-publish.yml index 290cd437fe..69898a0e07 100644 --- a/.github/workflows/on-manual-do-nuget-publish.yml +++ b/.github/workflows/on-manual-do-nuget-publish.yml @@ -30,6 +30,11 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + + - name: Install .NET 9.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 9.0.x - name: Install .NET Aspire workload run: | diff --git a/.github/workflows/on-push-do-ci-build-pg12-plv8-jsonnet.yml b/.github/workflows/on-push-do-ci-build-pg12-plv8-jsonnet.yml index c69f41f656..6246c36abe 100644 --- a/.github/workflows/on-push-do-ci-build-pg12-plv8-jsonnet.yml +++ b/.github/workflows/on-push-do-ci-build-pg12-plv8-jsonnet.yml @@ -23,7 +23,7 @@ env: pg_db: marten_testing pg_user: postgres CONFIGURATION: Release - FRAMEWORK: net7.0 + FRAMEWORK: net9.0 DISABLE_TEST_PARALLELIZATION: true DEFAULT_SERIALIZER: "Newtonsoft" NUKE_TELEMETRY_OPTOUT: true @@ -66,6 +66,11 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + + - name: Install .NET 9.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 9.0.x - name: Install .NET Aspire workload run: | diff --git a/.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml b/.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml index 9cbb8e8a59..2ff0fc9653 100644 --- a/.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml +++ b/.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml @@ -66,6 +66,11 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + + - name: Install .NET 9.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 9.0.x - name: Install .NET Aspire workload run: | diff --git a/.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml b/.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml index d88170238b..ec2432003d 100644 --- a/.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml +++ b/.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml @@ -23,7 +23,7 @@ env: pg_db: marten_testing pg_user: postgres CONFIGURATION: Release - FRAMEWORK: net8.0 + FRAMEWORK: net9.0 DISABLE_TEST_PARALLELIZATION: true DEFAULT_SERIALIZER: "Newtonsoft" NUKE_TELEMETRY_OPTOUT: true @@ -66,6 +66,11 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + + - name: Install .NET 9.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 9.0.x - name: Install .NET Aspire workload run: | diff --git a/.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml b/.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml index 50ed2d84f5..60a47b5bf5 100644 --- a/.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml +++ b/.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml @@ -66,6 +66,11 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: 8.0.x + + - name: Install .NET 9.0.x + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 9.0.x - name: Install .NET Aspire workload run: | diff --git a/Directory.Build.props b/Directory.Build.props index 9516383072..011fe277cb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 7.31.3 + 7.32.0 12.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 5f32668e62..af02c2ec3a 100644 --- a/src/CoreTests/CoreTests.csproj +++ b/src/CoreTests/CoreTests.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 true false @@ -16,9 +16,7 @@ - - - + diff --git a/src/DaemonTests/DaemonTests.csproj b/src/DaemonTests/DaemonTests.csproj index 0cd78f0f66..a443367e05 100644 --- a/src/DaemonTests/DaemonTests.csproj +++ b/src/DaemonTests/DaemonTests.csproj @@ -1,15 +1,12 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 latest - - - - + diff --git a/src/DocumentDbTests/DocumentDbTests.csproj b/src/DocumentDbTests/DocumentDbTests.csproj index bc3030ffe5..57e373dd0b 100644 --- a/src/DocumentDbTests/DocumentDbTests.csproj +++ b/src/DocumentDbTests/DocumentDbTests.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 true false @@ -16,10 +16,8 @@ - - - + all diff --git a/src/EventSourceWorker/EventSourceWorker.csproj b/src/EventSourceWorker/EventSourceWorker.csproj index e28a2b499f..3058c5b53d 100644 --- a/src/EventSourceWorker/EventSourceWorker.csproj +++ b/src/EventSourceWorker/EventSourceWorker.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 dotnet-EventSourceWorker-01BE20B5-3C2D-434B-8822-823B56E3F401 enable diff --git a/src/EventSourcingTests/EventSourcingTests.csproj b/src/EventSourcingTests/EventSourcingTests.csproj index 59d99d9042..cd090ea37d 100644 --- a/src/EventSourcingTests/EventSourcingTests.csproj +++ b/src/EventSourcingTests/EventSourcingTests.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 true false @@ -13,8 +13,6 @@ - - diff --git a/src/IssueService/IssueService.csproj b/src/IssueService/IssueService.csproj index 6daf9ce288..50edb56f46 100644 --- a/src/IssueService/IssueService.csproj +++ b/src/IssueService/IssueService.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 diff --git a/src/LinqTests/LinqTests.csproj b/src/LinqTests/LinqTests.csproj index d7b5357e5b..4a0c790db4 100644 --- a/src/LinqTests/LinqTests.csproj +++ b/src/LinqTests/LinqTests.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 true false @@ -13,8 +13,7 @@ - - + all diff --git a/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj b/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj index 1d29f9ac04..a5cc86d417 100644 --- a/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj +++ b/src/Marten.AspNetCore.Testing/Marten.AspNetCore.Testing.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 false diff --git a/src/Marten.AspNetCore/Marten.AspNetCore.csproj b/src/Marten.AspNetCore/Marten.AspNetCore.csproj index d2c63f2cae..1abf9eaf4b 100644 --- a/src/Marten.AspNetCore/Marten.AspNetCore.csproj +++ b/src/Marten.AspNetCore/Marten.AspNetCore.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 Helpers for Marten-backed AspNetCore applications 7.0.0-beta.5 true diff --git a/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj b/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj index 065abe2855..74a80ec04b 100644 --- a/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj +++ b/src/Marten.CommandLine.Tests/Marten.CommandLine.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 enable enable false diff --git a/src/Marten.CommandLine/Marten.CommandLine.csproj b/src/Marten.CommandLine/Marten.CommandLine.csproj index 5066ae4f9a..9ccfe45106 100644 --- a/src/Marten.CommandLine/Marten.CommandLine.csproj +++ b/src/Marten.CommandLine/Marten.CommandLine.csproj @@ -2,7 +2,7 @@ Command line tooling for Marten - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 false false false diff --git a/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj b/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj index 3b155abfd9..8ccd655917 100644 --- a/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj +++ b/src/Marten.NodaTime.Testing/Marten.NodaTime.Testing.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 Marten.NodaTimePlugin.Testing diff --git a/src/Marten.NodaTime/Marten.NodaTime.csproj b/src/Marten.NodaTime/Marten.NodaTime.csproj index 2f1208d502..e87839429b 100644 --- a/src/Marten.NodaTime/Marten.NodaTime.csproj +++ b/src/Marten.NodaTime/Marten.NodaTime.csproj @@ -2,7 +2,7 @@ NodaTime extension for Marten 7.0.0-beta.5 - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 true true true diff --git a/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj b/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj index f7c30e4c5d..30fa632e73 100644 --- a/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj +++ b/src/Marten.PLv8.Testing/Marten.PLv8.Testing.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 false @@ -17,9 +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 91529f6be2..4058f8d1dc 100644 --- a/src/Marten.PLv8/Marten.PLv8.csproj +++ b/src/Marten.PLv8/Marten.PLv8.csproj @@ -3,7 +3,7 @@ Document transforms and patching extension for Marten 7.0.0-beta.5 - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 true true true diff --git a/src/Marten.Testing.OtherAssembly/Marten.Testing.OtherAssembly.csproj b/src/Marten.Testing.OtherAssembly/Marten.Testing.OtherAssembly.csproj index 900229155b..d0a94de9ed 100644 --- a/src/Marten.Testing.OtherAssembly/Marten.Testing.OtherAssembly.csproj +++ b/src/Marten.Testing.OtherAssembly/Marten.Testing.OtherAssembly.csproj @@ -2,7 +2,7 @@ Dummy project for test scenario - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 false false false diff --git a/src/Marten.Testing.ThirdAssembly/Marten.Testing.ThirdAssembly.csproj b/src/Marten.Testing.ThirdAssembly/Marten.Testing.ThirdAssembly.csproj index 900229155b..d0a94de9ed 100644 --- a/src/Marten.Testing.ThirdAssembly/Marten.Testing.ThirdAssembly.csproj +++ b/src/Marten.Testing.ThirdAssembly/Marten.Testing.ThirdAssembly.csproj @@ -2,7 +2,7 @@ Dummy project for test scenario - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 false false false diff --git a/src/Marten.Testing/Marten.Testing.csproj b/src/Marten.Testing/Marten.Testing.csproj index 409c8faac7..5396167ecb 100644 --- a/src/Marten.Testing/Marten.Testing.csproj +++ b/src/Marten.Testing/Marten.Testing.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 true false @@ -22,10 +22,8 @@ - - - + all diff --git a/src/Marten.sln b/src/Marten.sln index da1ab0c037..0a0ec93f4c 100644 --- a/src/Marten.sln +++ b/src/Marten.sln @@ -25,6 +25,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\docker-compose.yml = ..\docker-compose.yml ..\package.json = ..\package.json ..\README.md = ..\README.md + ..\.github\workflows\docs-prs.yml = ..\.github\workflows\docs-prs.yml + ..\.github\workflows\docs.yml = ..\.github\workflows\docs.yml + ..\.github\workflows\on-manual-do-nuget-publish.yml = ..\.github\workflows\on-manual-do-nuget-publish.yml + ..\.github\workflows\on-push-do-ci-build-pg12-plv8-jsonnet.yml = ..\.github\workflows\on-push-do-ci-build-pg12-plv8-jsonnet.yml + ..\.github\workflows\on-push-do-ci-build-pg12-plv8-systemtextjson.yml = ..\.github\workflows\on-push-do-ci-build-pg12-plv8-systemtextjson.yml + ..\.github\workflows\on-push-do-ci-build-pg15-jsonnet.yml = ..\.github\workflows\on-push-do-ci-build-pg15-jsonnet.yml + ..\.github\workflows\on-push-do-ci-build-pgLatest-systemtextjson.yml = ..\.github\workflows\on-push-do-ci-build-pgLatest-systemtextjson.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreWithMarten", "AspNetCoreWithMarten\AspNetCoreWithMarten.csproj", "{739B657C-4E0D-40E8-853E-ADF5C2D3D89D}" @@ -84,16 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marten.CommandLine.Tests", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqTests", "LinqTests\LinqTests.csproj", "{94EF979D-F2C0-4479-9D1D-63647042E915}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Helpdesk", "Helpdesk", "{F3DADE49-9C89-4F74-BCCE-7DAFD35675E9}" - ProjectSection(SolutionItems) = preProject - samples\Helpdesk\docker-compose.yml = samples\Helpdesk\docker-compose.yml - samples\Helpdesk\README.md = samples\Helpdesk\README.md - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Helpdesk.Api", "samples\Helpdesk\Helpdesk.Api\Helpdesk.Api.csproj", "{5E18DEBD-C768-4636-B167-7DA2A4954F43}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Helpdesk.Api.Tests", "samples\Helpdesk\Helpdesk.Api.Tests\Helpdesk.Api.Tests.csproj", "{B0629D41-CA4E-4123-BC98-79A04D708A3E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PatchingTests", "PatchingTests\PatchingTests.csproj", "{EE82EFC4-FBC1-4181-9AB8-671222B60C3F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiTenancyTests", "MultiTenancyTests\MultiTenancyTests.csproj", "{34AE89FF-76B5-4B50-9190-4E7C602F5C2F}" @@ -230,14 +227,6 @@ Global {94EF979D-F2C0-4479-9D1D-63647042E915}.Debug|Any CPU.Build.0 = Debug|Any CPU {94EF979D-F2C0-4479-9D1D-63647042E915}.Release|Any CPU.ActiveCfg = Release|Any CPU {94EF979D-F2C0-4479-9D1D-63647042E915}.Release|Any CPU.Build.0 = Release|Any CPU - {5E18DEBD-C768-4636-B167-7DA2A4954F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E18DEBD-C768-4636-B167-7DA2A4954F43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E18DEBD-C768-4636-B167-7DA2A4954F43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E18DEBD-C768-4636-B167-7DA2A4954F43}.Release|Any CPU.Build.0 = Release|Any CPU - {B0629D41-CA4E-4123-BC98-79A04D708A3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0629D41-CA4E-4123-BC98-79A04D708A3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0629D41-CA4E-4123-BC98-79A04D708A3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0629D41-CA4E-4123-BC98-79A04D708A3E}.Release|Any CPU.Build.0 = Release|Any CPU {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE82EFC4-FBC1-4181-9AB8-671222B60C3F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -300,9 +289,6 @@ Global {7B710A53-373B-4A7D-B49E-53C15E6A8CA8} = {79961196-DB50-4AD3-B749-D231799BCF2E} {0962E83F-482B-4316-A8AB-3B714EEEC3AA} = {DA7EC300-12F5-4B80-B5DF-B7B71E344E24} {94EF979D-F2C0-4479-9D1D-63647042E915} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} - {F3DADE49-9C89-4F74-BCCE-7DAFD35675E9} = {79961196-DB50-4AD3-B749-D231799BCF2E} - {5E18DEBD-C768-4636-B167-7DA2A4954F43} = {F3DADE49-9C89-4F74-BCCE-7DAFD35675E9} - {B0629D41-CA4E-4123-BC98-79A04D708A3E} = {F3DADE49-9C89-4F74-BCCE-7DAFD35675E9} {EE82EFC4-FBC1-4181-9AB8-671222B60C3F} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {34AE89FF-76B5-4B50-9190-4E7C602F5C2F} = {91D87D73-EC07-4067-8A64-26A2E4F6BC83} {93FC8079-48C4-4D3B-8C17-3944A903674F} = {79961196-DB50-4AD3-B749-D231799BCF2E} diff --git a/src/Marten/Marten.csproj b/src/Marten/Marten.csproj index ce856613fb..5b509be11e 100644 --- a/src/Marten/Marten.csproj +++ b/src/Marten/Marten.csproj @@ -1,7 +1,7 @@ .NET Transactional Document DB and Event Store on PostgreSQL - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 true true true @@ -24,24 +24,36 @@ + + + + + + + + + + + + + - - - + + + - - + diff --git a/src/MartenBenchmarks/MartenBenchmarks.csproj b/src/MartenBenchmarks/MartenBenchmarks.csproj index a48c53b7e4..3b62765bd8 100644 --- a/src/MartenBenchmarks/MartenBenchmarks.csproj +++ b/src/MartenBenchmarks/MartenBenchmarks.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 Exe false false diff --git a/src/MultiTenancyTests/MultiTenancyTests.csproj b/src/MultiTenancyTests/MultiTenancyTests.csproj index 64c6e21ffc..ee45f4e110 100644 --- a/src/MultiTenancyTests/MultiTenancyTests.csproj +++ b/src/MultiTenancyTests/MultiTenancyTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 true false diff --git a/src/PatchingTests/PatchingTests.csproj b/src/PatchingTests/PatchingTests.csproj index c437a6a1fa..d34b7239fe 100644 --- a/src/PatchingTests/PatchingTests.csproj +++ b/src/PatchingTests/PatchingTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 false @@ -17,9 +17,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + diff --git a/src/StressTests/StressTests.csproj b/src/StressTests/StressTests.csproj index 525c12d98e..a0d0862ea0 100644 --- a/src/StressTests/StressTests.csproj +++ b/src/StressTests/StressTests.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0;net8.0 + net7.0;net8.0;net9.0 true false @@ -13,11 +13,8 @@ - - - - + diff --git a/src/ValueTypeTests/ValueTypeTests.csproj b/src/ValueTypeTests/ValueTypeTests.csproj index b5081f2633..b240818d6c 100644 --- a/src/ValueTypeTests/ValueTypeTests.csproj +++ b/src/ValueTypeTests/ValueTypeTests.csproj @@ -2,7 +2,7 @@ - net8.0 + net8.0;net9.0 false @@ -20,8 +20,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - -