diff --git a/CHANGELOG.md b/CHANGELOG.md index 998c6a1b5..a15df8bdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ The `Unreleased` section name is replaced by the expected version of next releas - `CosmosStore`: Only log `bytes` when log level is `Debug` [#305](https://github.com/jet/equinox/pull/305) - `EventStore`: Target `EventStore.Client` v `22.0.0-preview`; rename `Connector` -> `EventStoreConnector` [#317](https://github.com/jet/equinox/pull/317) - `Equinox.Tool`/`samples/`: switched to use `Equinox.EventStoreDb` [#196](https://github.com/jet/equinox/pull/196) -- Update all non-Client dependencies except `FSharp.Core`, `FSharp.Control.AsyncSeq` [#310](https://github.com/jet/equinox/pull/310) +- Update all non-Client dependencies except `FSharp.Core`, `FSharp.Control.AsyncSeq` [#310](https://github.com/jet/equinox/pull/310), use [Central Package Management](https://docs.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management) - Update all Stores to use `FsCodec` v `3.0.0`, with [`EventBody` types switching from `byte[]` to `ReadOnlyMemory`, see FsCodec#75](https://github.com/jet/FsCodec/pull/75) [#323](https://github.com/jet/equinox/pull/323) - `CosmosStore.Core.Initialization.initAux`: Replace hard-coded manual 400 RU with `mode` parameter [#328](https://github.com/jet/equinox/pull/328) :pray: [@brihadish](https://github.com/brihadish) diff --git a/Directory.Build.props b/Directory.Build.props index 6109ec27a..92544d747 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,6 +16,6 @@ - + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..3a3242de4 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,51 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Equinox.sln b/Equinox.sln index f3bda112f..7e1144368 100644 --- a/Equinox.sln +++ b/Equinox.sln @@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{7E CONTRIBUTING.md = CONTRIBUTING.md Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets + Directory.Packages.props = Directory.Packages.props docker-compose.env = docker-compose.env docker-compose.yml = docker-compose.yml DOCUMENTATION.md = DOCUMENTATION.md diff --git a/nuget.config b/nuget.config index cf2367b1d..081b6dba3 100644 --- a/nuget.config +++ b/nuget.config @@ -1,6 +1,13 @@ - + + - \ No newline at end of file + + + + + + + diff --git a/samples/Infrastructure/Infrastructure.fsproj b/samples/Infrastructure/Infrastructure.fsproj index 294075d40..04a6b99e3 100644 --- a/samples/Infrastructure/Infrastructure.fsproj +++ b/samples/Infrastructure/Infrastructure.fsproj @@ -22,12 +22,12 @@ - - - - - - + + + + + + diff --git a/samples/Store/Domain.Tests/Domain.Tests.fsproj b/samples/Store/Domain.Tests/Domain.Tests.fsproj index 02f67dd0f..91ccb79b5 100644 --- a/samples/Store/Domain.Tests/Domain.Tests.fsproj +++ b/samples/Store/Domain.Tests/Domain.Tests.fsproj @@ -17,14 +17,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers - + diff --git a/samples/Store/Domain/Domain.fsproj b/samples/Store/Domain/Domain.fsproj index a3ab4dc39..202c0e304 100644 --- a/samples/Store/Domain/Domain.fsproj +++ b/samples/Store/Domain/Domain.fsproj @@ -15,10 +15,10 @@ - + - - + + diff --git a/samples/Store/Integration/Integration.fsproj b/samples/Store/Integration/Integration.fsproj index 96dfb4eb3..2b06b118c 100644 --- a/samples/Store/Integration/Integration.fsproj +++ b/samples/Store/Integration/Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false @@ -26,12 +25,13 @@ - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/samples/TodoBackend/TodoBackend.fsproj b/samples/TodoBackend/TodoBackend.fsproj index 88d401fcc..bfb1bd965 100644 --- a/samples/TodoBackend/TodoBackend.fsproj +++ b/samples/TodoBackend/TodoBackend.fsproj @@ -9,7 +9,7 @@ - + diff --git a/samples/Tutorial/Tutorial.fsproj b/samples/Tutorial/Tutorial.fsproj index c5f0c95f1..9454ce2f2 100644 --- a/samples/Tutorial/Tutorial.fsproj +++ b/samples/Tutorial/Tutorial.fsproj @@ -27,10 +27,10 @@ - - - - + + + + diff --git a/samples/Web/Web.fsproj b/samples/Web/Web.fsproj index 374bfaaed..8971c90e8 100644 --- a/samples/Web/Web.fsproj +++ b/samples/Web/Web.fsproj @@ -13,7 +13,7 @@ - + diff --git a/src/Equinox.Core/Equinox.Core.fsproj b/src/Equinox.Core/Equinox.Core.fsproj index 97dac9760..07583d794 100644 --- a/src/Equinox.Core/Equinox.Core.fsproj +++ b/src/Equinox.Core/Equinox.Core.fsproj @@ -19,10 +19,10 @@ - + - - + + diff --git a/src/Equinox.CosmosStore.Prometheus/Equinox.CosmosStore.Prometheus.fsproj b/src/Equinox.CosmosStore.Prometheus/Equinox.CosmosStore.Prometheus.fsproj index b5fb8ed3a..f3a8d0528 100644 --- a/src/Equinox.CosmosStore.Prometheus/Equinox.CosmosStore.Prometheus.fsproj +++ b/src/Equinox.CosmosStore.Prometheus/Equinox.CosmosStore.Prometheus.fsproj @@ -13,11 +13,11 @@ - + - + - + diff --git a/src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj b/src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj index 83cc1caa6..7b40e72e6 100644 --- a/src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj +++ b/src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj @@ -15,14 +15,14 @@ - + - + - - - - + + + + diff --git a/src/Equinox.DynamoStore.Prometheus/Equinox.DynamoStore.Prometheus.fsproj b/src/Equinox.DynamoStore.Prometheus/Equinox.DynamoStore.Prometheus.fsproj index b5bf22f16..7d285352c 100644 --- a/src/Equinox.DynamoStore.Prometheus/Equinox.DynamoStore.Prometheus.fsproj +++ b/src/Equinox.DynamoStore.Prometheus/Equinox.DynamoStore.Prometheus.fsproj @@ -13,11 +13,11 @@ - + - + - + diff --git a/src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj b/src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj index 6f17fc5f7..ece6a1473 100644 --- a/src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj +++ b/src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj @@ -10,14 +10,14 @@ - + - + - - - + + + diff --git a/src/Equinox.EventStore/Equinox.EventStore.fsproj b/src/Equinox.EventStore/Equinox.EventStore.fsproj index c4d289ff1..1863fd3e4 100644 --- a/src/Equinox.EventStore/Equinox.EventStore.fsproj +++ b/src/Equinox.EventStore/Equinox.EventStore.fsproj @@ -15,13 +15,13 @@ - + - + - - - + + + diff --git a/src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj b/src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj index dc41a1449..c0a4b49be 100644 --- a/src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj +++ b/src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj @@ -15,13 +15,13 @@ - + - + - - - + + + diff --git a/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj b/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj index 2898013cb..4d992b38b 100644 --- a/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj +++ b/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj @@ -13,11 +13,11 @@ - + - + - + diff --git a/src/Equinox.SqlStreamStore.MsSql/Equinox.SqlStreamStore.MsSql.fsproj b/src/Equinox.SqlStreamStore.MsSql/Equinox.SqlStreamStore.MsSql.fsproj index d75c75540..bc2ba09bc 100644 --- a/src/Equinox.SqlStreamStore.MsSql/Equinox.SqlStreamStore.MsSql.fsproj +++ b/src/Equinox.SqlStreamStore.MsSql/Equinox.SqlStreamStore.MsSql.fsproj @@ -10,11 +10,11 @@ - + - + - + diff --git a/src/Equinox.SqlStreamStore.MySql/Equinox.SqlStreamStore.MySql.fsproj b/src/Equinox.SqlStreamStore.MySql/Equinox.SqlStreamStore.MySql.fsproj index c1ff56138..389112da0 100644 --- a/src/Equinox.SqlStreamStore.MySql/Equinox.SqlStreamStore.MySql.fsproj +++ b/src/Equinox.SqlStreamStore.MySql/Equinox.SqlStreamStore.MySql.fsproj @@ -10,11 +10,11 @@ - + - + - + diff --git a/src/Equinox.SqlStreamStore.Postgres/Equinox.SqlStreamStore.Postgres.fsproj b/src/Equinox.SqlStreamStore.Postgres/Equinox.SqlStreamStore.Postgres.fsproj index 22f5fc465..6c2737b10 100644 --- a/src/Equinox.SqlStreamStore.Postgres/Equinox.SqlStreamStore.Postgres.fsproj +++ b/src/Equinox.SqlStreamStore.Postgres/Equinox.SqlStreamStore.Postgres.fsproj @@ -10,11 +10,11 @@ - + - + - + diff --git a/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj b/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj index f53271376..087b06868 100644 --- a/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj +++ b/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj @@ -15,13 +15,13 @@ - + - + - - - + + + diff --git a/src/Equinox/Equinox.fsproj b/src/Equinox/Equinox.fsproj index 40a6dd57a..dc541d37b 100644 --- a/src/Equinox/Equinox.fsproj +++ b/src/Equinox/Equinox.fsproj @@ -10,10 +10,10 @@ - + - - + + diff --git a/tests/Equinox.CosmosStore.Integration/Equinox.CosmosStore.Integration.fsproj b/tests/Equinox.CosmosStore.Integration/Equinox.CosmosStore.Integration.fsproj index 416909925..66c9a1008 100644 --- a/tests/Equinox.CosmosStore.Integration/Equinox.CosmosStore.Integration.fsproj +++ b/tests/Equinox.CosmosStore.Integration/Equinox.CosmosStore.Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false @@ -23,13 +22,14 @@ - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Equinox.DynamoStore.Integration/Equinox.DynamoStore.Integration.fsproj b/tests/Equinox.DynamoStore.Integration/Equinox.DynamoStore.Integration.fsproj index 707999cd3..8deeab608 100644 --- a/tests/Equinox.DynamoStore.Integration/Equinox.DynamoStore.Integration.fsproj +++ b/tests/Equinox.DynamoStore.Integration/Equinox.DynamoStore.Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false $(DefineConstants);STORE_DYNAMO @@ -31,12 +30,13 @@ - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj b/tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj index 61e9574b1..eb694670d 100644 --- a/tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj +++ b/tests/Equinox.EventStore.Integration/Equinox.EventStore.Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false $(DefineConstants);STORE_EVENTSTORE_LEGACY @@ -20,12 +19,13 @@ - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/tests/Equinox.EventStoreDb.Integration/Equinox.EventStoreDb.Integration.fsproj b/tests/Equinox.EventStoreDb.Integration/Equinox.EventStoreDb.Integration.fsproj index bb46d07a3..85465d3a1 100644 --- a/tests/Equinox.EventStoreDb.Integration/Equinox.EventStoreDb.Integration.fsproj +++ b/tests/Equinox.EventStoreDb.Integration/Equinox.EventStoreDb.Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false $(DefineConstants);STORE_EVENTSTOREDB @@ -20,12 +19,13 @@ - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/tests/Equinox.MemoryStore.Integration/Equinox.MemoryStore.Integration.fsproj b/tests/Equinox.MemoryStore.Integration/Equinox.MemoryStore.Integration.fsproj index dab3dd76e..9683921e5 100644 --- a/tests/Equinox.MemoryStore.Integration/Equinox.MemoryStore.Integration.fsproj +++ b/tests/Equinox.MemoryStore.Integration/Equinox.MemoryStore.Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false @@ -17,15 +16,16 @@ - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers - diff --git a/tests/Equinox.SqlStreamStore.MsSql.Integration/Equinox.SqlStreamStore.MsSql.Integration.fsproj b/tests/Equinox.SqlStreamStore.MsSql.Integration/Equinox.SqlStreamStore.MsSql.Integration.fsproj index 79f3ecada..e427b427b 100644 --- a/tests/Equinox.SqlStreamStore.MsSql.Integration/Equinox.SqlStreamStore.MsSql.Integration.fsproj +++ b/tests/Equinox.SqlStreamStore.MsSql.Integration/Equinox.SqlStreamStore.MsSql.Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false $(DefineConstants);STORE_MSSQL @@ -19,12 +18,13 @@ - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/tests/Equinox.SqlStreamStore.MySql.Integration/Equinox.SqlStreamStore.MySql.Integration.fsproj b/tests/Equinox.SqlStreamStore.MySql.Integration/Equinox.SqlStreamStore.MySql.Integration.fsproj index f054297d1..d37a3a2f4 100644 --- a/tests/Equinox.SqlStreamStore.MySql.Integration/Equinox.SqlStreamStore.MySql.Integration.fsproj +++ b/tests/Equinox.SqlStreamStore.MySql.Integration/Equinox.SqlStreamStore.MySql.Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false $(DefineConstants);STORE_MYSQL @@ -19,12 +18,13 @@ - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/tests/Equinox.SqlStreamStore.Postgres.Integration/Equinox.SqlStreamStore.Postgres.Integration.fsproj b/tests/Equinox.SqlStreamStore.Postgres.Integration/Equinox.SqlStreamStore.Postgres.Integration.fsproj index 0c32d3aca..ffd567222 100644 --- a/tests/Equinox.SqlStreamStore.Postgres.Integration/Equinox.SqlStreamStore.Postgres.Integration.fsproj +++ b/tests/Equinox.SqlStreamStore.Postgres.Integration/Equinox.SqlStreamStore.Postgres.Integration.fsproj @@ -2,7 +2,6 @@ net6.0 - false $(DefineConstants);STORE_POSTGRES @@ -19,12 +18,13 @@ - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/tools/Equinox.Tool/Equinox.Tool.fsproj b/tools/Equinox.Tool/Equinox.Tool.fsproj index 1e7fa66da..07b10ad79 100644 --- a/tools/Equinox.Tool/Equinox.Tool.fsproj +++ b/tools/Equinox.Tool/Equinox.Tool.fsproj @@ -2,7 +2,6 @@ net6.0 - false Exe Equinox.Tool @@ -31,7 +30,9 @@ - + + + diff --git a/tools/Equinox.Tools.TestHarness/Equinox.Tools.TestHarness.fsproj b/tools/Equinox.Tools.TestHarness/Equinox.Tools.TestHarness.fsproj index 72ec63d0d..2f106f96c 100644 --- a/tools/Equinox.Tools.TestHarness/Equinox.Tools.TestHarness.fsproj +++ b/tools/Equinox.Tools.TestHarness/Equinox.Tools.TestHarness.fsproj @@ -14,14 +14,14 @@ - + - + - - - + + +