Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Apply Centralized Package Management #330

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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<byte>`, 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)

Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
</PropertyGroup>
<ItemGroup>
<!-- SourceLink etc -->
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
</ItemGroup>
</Project>
51 changes: 51 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
<PackageVersion Include="MinVer" Version="4.0.0" />

<!-- NOTE see also usage of FSCorePackageVersion in Tool and Tests -->
<PackageVersion Include="FSharp.Core" Version="4.5.4" />

<!-- Direct deps of public packages -->
<PackageVersion Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
<PackageVersion Include="EventStore.Client" Version="22.0.0-preview" />
<PackageVersion Include="FsCodec" Version="3.0.0-rc.2.2" />
<PackageVersion Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
<PackageVersion Include="FSharp.AWS.DynamoDB" Version="0.11.0-beta" />
<PackageVersion Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
<PackageVersion Include="MathNet.Numerics" Version="5.0.0" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.27.0" />
<PackageVersion Include="prometheus-net" Version="3.6.0" />
<PackageVersion Include="Serilog" Version="2.7.1" />
<PackageVersion Include="System.Reactive" Version="5.0.0" />
<PackageVersion Include="System.Runtime.Caching" Version="6.0.0" />
<PackageVersion Include="System.Text.Json" Version="6.0.1" />

<!-- Used by samples -->
<PackageVersion Include="Argu" Version="6.1.1" />
<PackageVersion Include="Destructurama.FSharp" Version="1.2.0" />
<PackageVersion Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.2.2" />
<PackageVersion Include="FsCodec.SystemTextJson" Version="3.0.0-rc.2.2" />
<PackageVersion Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageVersion Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageVersion Include="Serilog.Sinks.Seq" Version="5.1.1" />
<PackageVersion Include="SqlStreamStore" Version="1.2.0-beta.8" />
<PackageVersion Include="SqlStreamStore.MySql" Version="1.2.0-beta.8" />
<PackageVersion Include="SqlStreamStore.MsSql" Version="1.2.0-beta.8" />
<PackageVersion Include="SqlStreamStore.Postgres" Version="1.2.0-beta.8" />

<!-- Used by tests -->
<PackageVersion Include="FsCheck.xUnit" Version="2.16.4" />
<PackageVersion Include="JsonDiffPatch.Net" Version="2.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="xunit" Version="2.4.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageVersion Include="unquote" Version="6.1.0" />

</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions Equinox.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions nuget.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
<!-- (Hopefully temporary) Workaround warning NU1507: There are 2 package sources defined in your configuration. When using central package management, please map your package sources with package source mapping (https://aka.ms/nuget-package-source-mapping) or specify a single package source-->
<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
12 changes: 6 additions & 6 deletions samples/Infrastructure/Infrastructure.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="FSharp.Core" Version="4.7.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
<PackageReference Include="Argu" />
<PackageReference Include="Destructurama.FSharp" />
<PackageReference Include="FSharp.Core" VersionOverride="4.7.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Seq" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions samples/Store/Domain.Tests/Domain.Tests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FsCheck.xUnit" Version="2.16.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="FsCheck.xUnit" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="unquote" Version="6.1.0" />
<PackageReference Include="unquote" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions samples/Store/Domain/Domain.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.2.2" />
<PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.2.2" />
<PackageReference Include="FsCodec.NewtonsoftJson" />
<PackageReference Include="FsCodec.SystemTextJson" />

<ProjectReference Include="..\..\..\src\Equinox\Equinox.fsproj" />
</ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions samples/Store/Integration/Integration.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<DisableImplicitFSharpCoreReference>false</DisableImplicitFSharpCoreReference>
</PropertyGroup>

<ItemGroup>
Expand All @@ -26,12 +25,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FsCheck.xUnit" Version="2.16.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
<PackageReference Include="unquote" Version="6.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="FSharp.Core" VersionOverride="$(FSCorePackageVersion)" />
<PackageReference Include="FsCheck.xUnit" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Serilog.Sinks.Seq" />
<PackageReference Include="unquote" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion samples/TodoBackend/TodoBackend.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions samples/Tutorial/Tutorial.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.2.2" />
<PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.2.2" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
<PackageReference Include="FsCodec.NewtonsoftJson" />
<PackageReference Include="FsCodec.SystemTextJson" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Seq" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion samples/Web/Web.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.AspNetCore" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Equinox.Core/Equinox.Core.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
<PackageReference Include="FSharp.Core" />
<PackageReference Include="System.Runtime.Caching" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="prometheus-net" Version="3.6.0" />
<PackageReference Include="prometheus-net" />
</ItemGroup>

</Project>
12 changes: 6 additions & 6 deletions src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.27.0" />
<PackageReference Include="System.Text.Json" Version="6.0.1" />
<PackageReference Include="FsCodec" />
<PackageReference Include="FSharp.Control.AsyncSeq" />
<PackageReference Include="Microsoft.Azure.Cosmos" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.7.2" />
<PackageReference Include="FSharp.Core" VersionOverride="4.7.2" />

<PackageReference Include="prometheus-net" Version="3.6.0" />
<PackageReference Include="prometheus-net" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<!-- FSharp.AWS.DynamoDB has this as a minimum requirement -->
<PackageReference Include="FSharp.Core" Version="4.7.2" />
<PackageReference Include="FSharp.Core" VersionOverride="4.7.2" />

<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
<PackageReference Include="FSharp.AWS.DynamoDB" Version="0.11.0-beta" />
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
<PackageReference Include="FsCodec" />
<PackageReference Include="FSharp.AWS.DynamoDB" />
<PackageReference Include="FSharp.Control.AsyncSeq" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/Equinox.EventStore/Equinox.EventStore.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="EventStore.Client" Version="22.0.0-preview" />
<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
<PackageReference Include="EventStore.Client" />
<PackageReference Include="FsCodec" />
<PackageReference Include="FSharp.Control.AsyncSeq" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
<PackageReference Include="EventStore.Client.Grpc.Streams" />
<PackageReference Include="FsCodec" />
<PackageReference Include="FSharp.Control.AsyncSeq" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
<PackageReference Include="FsCodec" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="SqlStreamStore.MsSql" Version="1.2.0-beta.8" />
<PackageReference Include="SqlStreamStore.MsSql" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="SqlStreamStore.MySql" Version="1.2.0-beta.8" />
<PackageReference Include="SqlStreamStore.MySql" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="MinVer" PrivateAssets="All" />

<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="FSharp.Core" />

<PackageReference Include="SqlStreamStore.Postgres" Version="1.2.0-beta.8" />
<PackageReference Include="SqlStreamStore.Postgres" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading