Skip to content

Commit 1919c31

Browse files
bartelinkbartelink
committed
Apply Centralized Package Management
1 parent b7e2207 commit 1919c31

File tree

36 files changed

+207
-148
lines changed

36 files changed

+207
-148
lines changed

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The `Unreleased` section name is replaced by the expected version of next releas
2727
- `CosmosStore`: Only log `bytes` when log level is `Debug` [#305](https://github.com/jet/equinox/pull/305)
2828
- `EventStore`: Target `EventStore.Client` v `22.0.0-preview`; rename `Connector` -> `EventStoreConnector` [#317](https://github.com/jet/equinox/pull/317)
2929
- `Equinox.Tool`/`samples/`: switched to use `Equinox.EventStoreDb` [#196](https://github.com/jet/equinox/pull/196)
30-
- Update all non-Client dependencies except `FSharp.Core`, `FSharp.Control.AsyncSeq` [#310](https://github.com/jet/equinox/pull/310)
30+
- 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)
3131
- 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)
3232
- `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)
3333

‎Directory.Build.props

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
<Copyright>Copyright © 2016-22</Copyright>
1010

1111
<WarningLevel>5</WarningLevel>
12+
<!-- For packages we produce, we want to be explicit; For libs we reference FSCorePackageVersion to workaround ManagePackageVersionsCentrally conflict -->
1213
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1314
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
1415
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1516
</PropertyGroup>
1617
<ItemGroup>
1718
<!-- SourceLink etc -->
18-
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
19+
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
1920
</ItemGroup>
2021
</Project>

‎Directory.Packages.props

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
7+
<PackageVersion Include="MinVer" Version="4.0.0" />
8+
9+
<!-- NOTE see also usage of FSCorePackageVersion in Tool and Tests -->
10+
<PackageVersion Include="FSharp.Core" Version="4.5.4" />
11+
12+
<!-- Direct deps of public packages -->
13+
<PackageVersion Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
14+
<PackageVersion Include="EventStore.Client" Version="22.0.0-preview" />
15+
<PackageVersion Include="FsCodec" Version="3.0.0-rc.2.2" />
16+
<PackageVersion Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
17+
<PackageVersion Include="FSharp.AWS.DynamoDB" Version="0.11.0-beta" />
18+
<PackageVersion Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
19+
<PackageVersion Include="MathNet.Numerics" Version="5.0.0" />
20+
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.27.0" />
21+
<PackageVersion Include="prometheus-net" Version="3.6.0" />
22+
<PackageVersion Include="Serilog" Version="2.7.1" />
23+
<PackageVersion Include="System.Reactive" Version="5.0.0" />
24+
<PackageVersion Include="System.Runtime.Caching" Version="6.0.0" />
25+
<PackageVersion Include="System.Text.Json" Version="6.0.1" />
26+
27+
<!-- Used by samples -->
28+
<PackageVersion Include="Argu" Version="6.1.1" />
29+
<PackageVersion Include="Destructurama.FSharp" Version="1.2.0" />
30+
<PackageVersion Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.2.2" />
31+
<PackageVersion Include="FsCodec.SystemTextJson" Version="3.0.0-rc.2.2" />
32+
<PackageVersion Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
33+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
34+
<PackageVersion Include="Serilog.AspNetCore" Version="3.2.0" />
35+
<PackageVersion Include="Serilog.Sinks.Console" Version="4.0.1" />
36+
<PackageVersion Include="Serilog.Sinks.Seq" Version="5.1.1" />
37+
<PackageVersion Include="SqlStreamStore" Version="1.2.0-beta.8" />
38+
<PackageVersion Include="SqlStreamStore.MySql" Version="1.2.0-beta.8" />
39+
<PackageVersion Include="SqlStreamStore.MsSql" Version="1.2.0-beta.8" />
40+
<PackageVersion Include="SqlStreamStore.Postgres" Version="1.2.0-beta.8" />
41+
42+
<!-- Used by tests -->
43+
<PackageVersion Include="FsCheck.xUnit" Version="2.16.4" />
44+
<PackageVersion Include="JsonDiffPatch.Net" Version="2.3.0" />
45+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
46+
<PackageVersion Include="xunit" Version="2.4.1" />
47+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
48+
<PackageVersion Include="unquote" Version="6.1.0" />
49+
50+
</ItemGroup>
51+
</Project>

‎Equinox.sln

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{7E
1616
CONTRIBUTING.md = CONTRIBUTING.md
1717
Directory.Build.props = Directory.Build.props
1818
Directory.Build.targets = Directory.Build.targets
19+
Directory.Packages.props = Directory.Packages.props
1920
docker-compose.env = docker-compose.env
2021
docker-compose.yml = docker-compose.yml
2122
DOCUMENTATION.md = DOCUMENTATION.md

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.201",
3+
"version": "6.0.300",
44
"rollForward": "latestMajor"
55
}
66
}

‎nuget.config

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
4+
<clear />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
56
</packageSources>
6-
</configuration>
7+
<!-- (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-->
8+
<packageSourceMapping>
9+
<packageSource key="nuget.org">
10+
<package pattern="*" />
11+
</packageSource>
12+
</packageSourceMapping>
13+
</configuration>

‎samples/Infrastructure/Infrastructure.fsproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Argu" Version="6.1.1" />
26-
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
27-
<PackageReference Include="FSharp.Core" Version="4.7.2" />
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
29-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
30-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
25+
<PackageReference Include="Argu" />
26+
<PackageReference Include="Destructurama.FSharp" />
27+
<PackageReference Include="FSharp.Core" VersionOverride="4.7.2" />
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
29+
<PackageReference Include="Serilog.Sinks.Console" />
30+
<PackageReference Include="Serilog.Sinks.Seq" />
3131
</ItemGroup>
3232

3333
</Project>

‎samples/Store/Domain.Tests/Domain.Tests.fsproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="FsCheck.xUnit" Version="2.16.4" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
22-
<PackageReference Include="xunit" Version="2.4.1" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
20+
<PackageReference Include="FsCheck.xUnit" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
22+
<PackageReference Include="xunit" />
23+
<PackageReference Include="xunit.runner.visualstudio">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="unquote" Version="6.1.0" />
27+
<PackageReference Include="unquote" />
2828
</ItemGroup>
2929

3030
</Project>

‎samples/Store/Domain/Domain.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
18+
<PackageReference Include="FSharp.Core" />
1919

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

2323
<ProjectReference Include="..\..\..\src\Equinox\Equinox.fsproj" />
2424
</ItemGroup>

‎samples/Store/Integration/Integration.fsproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
5-
<DisableImplicitFSharpCoreReference>false</DisableImplicitFSharpCoreReference>
65
</PropertyGroup>
76

87
<ItemGroup>
@@ -26,12 +25,13 @@
2625
</ItemGroup>
2726

2827
<ItemGroup>
29-
<PackageReference Include="FsCheck.xUnit" Version="2.16.4" />
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
31-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
32-
<PackageReference Include="unquote" Version="6.1.0" />
33-
<PackageReference Include="xunit" Version="2.4.1" />
34-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
28+
<PackageReference Include="FSharp.Core" VersionOverride="$(FSCorePackageVersion)" />
29+
<PackageReference Include="FsCheck.xUnit" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
31+
<PackageReference Include="Serilog.Sinks.Seq" />
32+
<PackageReference Include="unquote" />
33+
<PackageReference Include="xunit" />
34+
<PackageReference Include="xunit.runner.visualstudio">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3737
</PackageReference>

‎samples/TodoBackend/TodoBackend.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
12+
<PackageReference Include="FSharp.Core" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎samples/Tutorial/Tutorial.fsproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.2.2" />
31-
<PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.2.2" />
32-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
33-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
30+
<PackageReference Include="FsCodec.NewtonsoftJson" />
31+
<PackageReference Include="FsCodec.SystemTextJson" />
32+
<PackageReference Include="Serilog.Sinks.Console" />
33+
<PackageReference Include="Serilog.Sinks.Seq" />
3434
</ItemGroup>
3535

3636
</Project>

‎samples/Web/Web.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
16+
<PackageReference Include="Serilog.AspNetCore" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/Equinox.Core/Equinox.Core.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
22+
<PackageReference Include="MinVer" PrivateAssets="All" />
2323

24-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
25-
<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
24+
<PackageReference Include="FSharp.Core" />
25+
<PackageReference Include="System.Runtime.Caching" />
2626
</ItemGroup>
2727

2828
</Project>

‎src/Equinox.CosmosStore.Prometheus/Equinox.CosmosStore.Prometheus.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
16+
<PackageReference Include="MinVer" PrivateAssets="All" />
1717

18-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
18+
<PackageReference Include="FSharp.Core" />
1919

20-
<PackageReference Include="prometheus-net" Version="3.6.0" />
20+
<PackageReference Include="prometheus-net" />
2121
</ItemGroup>
2222

2323
</Project>

‎src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
18+
<PackageReference Include="MinVer" PrivateAssets="All" />
1919

20-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
20+
<PackageReference Include="FSharp.Core" />
2121

22-
<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
23-
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
24-
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.27.0" />
25-
<PackageReference Include="System.Text.Json" Version="6.0.1" />
22+
<PackageReference Include="FsCodec" />
23+
<PackageReference Include="FSharp.Control.AsyncSeq" />
24+
<PackageReference Include="Microsoft.Azure.Cosmos" />
25+
<PackageReference Include="System.Text.Json" />
2626
</ItemGroup>
2727

2828
</Project>

‎src/Equinox.DynamoStore.Prometheus/Equinox.DynamoStore.Prometheus.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
16+
<PackageReference Include="MinVer" PrivateAssets="All" />
1717

18-
<PackageReference Include="FSharp.Core" Version="4.7.2" />
18+
<PackageReference Include="FSharp.Core" VersionOverride="4.7.2" />
1919

20-
<PackageReference Include="prometheus-net" Version="3.6.0" />
20+
<PackageReference Include="prometheus-net" />
2121
</ItemGroup>
2222

2323
</Project>

‎src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
13+
<PackageReference Include="MinVer" PrivateAssets="All" />
1414

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

18-
<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
19-
<PackageReference Include="FSharp.AWS.DynamoDB" Version="0.11.0-beta" />
20-
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
18+
<PackageReference Include="FsCodec" />
19+
<PackageReference Include="FSharp.AWS.DynamoDB" />
20+
<PackageReference Include="FSharp.Control.AsyncSeq" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/Equinox.EventStore/Equinox.EventStore.fsproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
18+
<PackageReference Include="MinVer" PrivateAssets="All" />
1919

20-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
20+
<PackageReference Include="FSharp.Core" />
2121

22-
<PackageReference Include="EventStore.Client" Version="22.0.0-preview" />
23-
<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
24-
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />
22+
<PackageReference Include="EventStore.Client" />
23+
<PackageReference Include="FsCodec" />
24+
<PackageReference Include="FSharp.Control.AsyncSeq" />
2525
</ItemGroup>
2626

2727
</Project>

‎src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
18+
<PackageReference Include="MinVer" PrivateAssets="All" />
1919

20-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
20+
<PackageReference Include="FSharp.Core" />
2121

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

2727
</Project>

‎src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
16+
<PackageReference Include="MinVer" PrivateAssets="All" />
1717

18-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
18+
<PackageReference Include="FSharp.Core" />
1919

20-
<PackageReference Include="FsCodec" Version="3.0.0-rc.2.2" />
20+
<PackageReference Include="FsCodec" />
2121
</ItemGroup>
2222

2323
</Project>

‎src/Equinox.SqlStreamStore.MsSql/Equinox.SqlStreamStore.MsSql.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
13+
<PackageReference Include="MinVer" PrivateAssets="All" />
1414

15-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
15+
<PackageReference Include="FSharp.Core" />
1616

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

2020
<ItemGroup>

‎src/Equinox.SqlStreamStore.MySql/Equinox.SqlStreamStore.MySql.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
13+
<PackageReference Include="MinVer" PrivateAssets="All" />
1414

15-
<PackageReference Include="FSharp.Core" Version="4.5.4" />
15+
<PackageReference Include="FSharp.Core" />
1616

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

2020
<ItemGroup>

0 commit comments

Comments
 (0)