Skip to content

Commit f175e79

Browse files
ylibrachylibrach
committed
Bump to netstandard2.1 and net472
1 parent 48a874e commit f175e79

33 files changed

+86
-74
lines changed

Diff for: ‎Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Copyright>Copyright © 2016-20</Copyright>
1010

1111
<!-- Confluent don't support Mono OOTB https://github.com/confluentinc/confluent-kafka-dotnet/issues/400 -->
12-
<TestTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netcoreapp3.1;net461</TestTargetFrameworks>
12+
<TestTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netcoreapp3.1;net472</TestTargetFrameworks>
1313
<TestTargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.1</TestTargetFrameworks>
1414

1515
<ThisDirAbsolute>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)"))</ThisDirAbsolute>
@@ -25,7 +25,7 @@
2525
<!-- supress NU5105 triggered by trailing dotted elements such as .43 and .2 in e.g.: pr.43-rc1.2: The package version '<X>' uses SemVer 2.0.0 or components of SemVer 1.0.0 that are not supported on legacy clients. Change the package version to a SemVer 1.0.0 string. If the version contains a release label it must start with a letter. This message can be ignored if the package is not intended for older clients. -->
2626
<NoWarn>$(NoWarn);FS2003;NU5105</NoWarn>
2727
</PropertyGroup>
28-
<ItemGroup> <!-- net461 ref assemblies https://stackoverflow.com/a/57384175/11635 -->
28+
<ItemGroup> <!-- net472 ref assemblies https://stackoverflow.com/a/57384175/11635 -->
2929
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
3030
</ItemGroup>
3131
</Project>

Diff for: ‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Some aspects of the implementation are distilled from [`Jet.com` systems dating
4646

4747
## Components
4848

49-
The components within this repository are delivered as multi-targeted Nuget packages supporting `net461` (F# 3.1+) and `netstandard2.0` (F# 4.5+) profiles; each of the constituent elements is designed to be easily swappable as dictated by the task at hand. Each of the components can be inlined or customized easily:-
49+
The components within this repository are delivered as multi-targeted Nuget packages supporting `net472` (F# 3.1+) and `netstandard2.1` (F# 4.5+) profiles; each of the constituent elements is designed to be easily swappable as dictated by the task at hand. Each of the components can be inlined or customized easily:-
5050

5151
### Core library
5252

@@ -406,7 +406,7 @@ Run, including running the tests that assume you've got a local EventStore and p
406406
Continually reads and writes very small events across multiple streams on .NET Full Framework
407407
408408
dotnet pack -c Release ./build.proj
409-
& ./tools/Equinox.Tool/bin/Release/net461/eqx.exe run -f 2500 -C -U es
409+
& ./tools/Equinox.Tool/bin/Release/net472/eqx.exe run -f 2500 -C -U es
410410
411411
### Run EventStore benchmark on .NET Core (when provisioned)
412412
@@ -433,7 +433,7 @@ The CLI can drive the Store and TodoBackend samples in the `samples/Web` ASP.NET
433433
$env:EQUINOX_COSMOS_DATABASE="equinox-test"
434434
$env:EQUINOX_COSMOS_CONTAINER="equinox-test"
435435
436-
tools/Equinox.Tool/bin/Release/net461/eqx run `
436+
tools/Equinox.Tool/bin/Release/net472/eqx run `
437437
cosmos -s $env:EQUINOX_COSMOS_CONNECTION -d $env:EQUINOX_COSMOS_DATABASE -c $env:EQUINOX_COSMOS_CONTAINER
438438
dotnet run -f netcoreapp3.1 -p tools/Equinox.Tool -- run `
439439
cosmos -s $env:EQUINOX_COSMOS_CONNECTION -d $env:EQUINOX_COSMOS_DATABASE -c $env:EQUINOX_COSMOS_CONTAINER

Diff for: ‎samples/Infrastructure/Storage.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module Cosmos =
6565

6666
/// Standing up an Equinox instance is necessary to run for test purposes; You'll need to either:
6767
/// 1) replace connection below with a connection string or Uri+Key for an initialized Equinox instance with a database and collection named "equinox-test"
68-
/// 2) Set the 3x environment variables and create a local Equinox using tools/Equinox.Tool/bin/Release/net461/eqx.exe `
68+
/// 2) Set the 3x environment variables and create a local Equinox using tools/Equinox.Tool/bin/Release/net472/eqx.exe `
6969
/// init -ru 1000 cosmos -s $env:EQUINOX_COSMOS_CONNECTION -d $env:EQUINOX_COSMOS_DATABASE -c $env:EQUINOX_COSMOS_CONTAINER
7070
open Equinox.Cosmos
7171
open Serilog

Diff for: ‎samples/Store/Backend/Backend.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -23,8 +23,8 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
27-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
26+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net472' " />
27+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
2828
</ItemGroup>
2929

3030
</Project>

Diff for: ‎samples/Store/Domain/Domain.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
22-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
21+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net472' " />
22+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
2323

2424
<PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.1" />
2525
</ItemGroup>

Diff for: ‎samples/Store/Domain/Infrastructure.fs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ open FSharp.UMX
66
open Newtonsoft.Json
77
open System
88

9-
#if NET461
9+
#if NET472
1010
module Seq =
1111
let tryLast (source : seq<_>) =
1212
use e = source.GetEnumerator()
@@ -82,4 +82,4 @@ module ClientId = let toString (value : ClientId) : string = Guid.toStringN %val
8282
/// InventoryItemId strongly typed id
8383
type InventoryItemId = Guid<inventoryItemId>
8484
and [<Measure>] inventoryItemId
85-
module InventoryItemId = let toString (value : InventoryItemId) : string = Guid.toStringN %value
85+
module InventoryItemId = let toString (value : InventoryItemId) : string = Guid.toStringN %value

Diff for: ‎samples/TodoBackend/TodoBackend.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -13,8 +13,8 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
17-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
16+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net472' " />
17+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
1818
</ItemGroup>
1919

2020
<ItemGroup>

Diff for: ‎samples/Tutorial/AsAt.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#if VISUALSTUDIO
1717
#r "netstandard"
1818
#endif
19-
#I "bin/Debug/netstandard2.0/"
19+
#I "bin/Debug/netstandard2.1/"
2020
#r "Serilog.dll"
2121
#r "Serilog.Sinks.Console.dll"
2222
#r "Newtonsoft.Json.dll"

Diff for: ‎samples/Tutorial/Cosmos.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#if VISUALSTUDIO
44
#r "netstandard"
55
#endif
6-
#I "bin/Debug/netstandard2.0/"
6+
#I "bin/Debug/netstandard2.1/"
77
#r "Serilog.dll"
88
#r "Serilog.Sinks.Console.dll"
99
#r "Newtonsoft.Json.dll"

Diff for: ‎samples/Tutorial/Counter.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Compile Tutorial.fsproj before attempting to send this to FSI with Alt-Enter by either:
22
// a) right-clicking or
33
// b) typing dotnet build samples/Tutorial
4-
#I "bin/Debug/netstandard2.0/"
4+
#I "bin/Debug/netstandard2.1/"
55
#r "Serilog.dll"
66
#r "Serilog.Sinks.Console.dll"
77
#r "Equinox.dll"

Diff for: ‎samples/Tutorial/Favorites.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Compile Tutorial.fsproj by either a) right-clicking or b) typing
22
// dotnet build samples/Tutorial before attempting to send this to FSI with Alt-Enter
3-
#I "bin/Debug/netstandard2.0/"
3+
#I "bin/Debug/netstandard2.1/"
44
#r "Serilog.dll"
55
#r "Serilog.Sinks.Console.dll"
66
#r "Equinox.dll"

Diff for: ‎samples/Tutorial/FulfilmentCenter.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#I "bin/Debug/netstandard2.0/"
1+
#I "bin/Debug/netstandard2.1/"
22
#r "Serilog.dll"
33
#r "Serilog.Sinks.Console.dll"
44
#r "Newtonsoft.Json.dll"

Diff for: ‎samples/Tutorial/Sequence.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module Sequence
44

55
open System
66

7-
// shim for net461
7+
// shim for net472
88
module Seq =
99
let tryLast (source : seq<_>) =
1010
use e = source.GetEnumerator()

Diff for: ‎samples/Tutorial/Todo.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#if VISUALSTUDIO
44
#r "netstandard"
55
#endif
6-
#I "bin/Debug/netstandard2.0/"
6+
#I "bin/Debug/netstandard2.1/"
77
#r "Serilog.dll"
88
#r "Serilog.Sinks.Console.dll"
99
#r "Newtonsoft.Json.dll"

Diff for: ‎samples/Tutorial/Upload.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module Upload
44
open System
55
open FSharp.UMX
66

7-
// shim for net461
7+
// shim for net472
88
module Seq =
99
let tryLast (source : seq<_>) =
1010
use e = source.GetEnumerator()

Diff for: ‎src/Equinox.Core/Equinox.Core.fsproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
9-
<DefineConstants Condition=" '$(TargetFramework)' == 'net461' ">$(DefineConstants);NET461</DefineConstants>
9+
<DefineConstants Condition=" '$(TargetFramework)' == 'net472' ">$(DefineConstants);net472</DefineConstants>
1010
<DefineConstants>$(DefineConstants);NO_ASYNCSEQ</DefineConstants>
1111
</PropertyGroup>
1212

@@ -27,10 +27,10 @@
2727
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
2828
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
2929

30-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
31-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
32-
<PackageReference Include="System.Runtime.Caching" Version="4.5.0" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
33-
<Reference Include="System.Runtime.Caching" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
30+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.1' " />
31+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
32+
<PackageReference Include="System.Runtime.Caching" Version="4.5.0" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
33+
<Reference Include="System.Runtime.Caching" Condition=" '$(TargetFramework)' != 'netstandard2.1' " />
3434
</ItemGroup>
3535

3636
</Project>

Diff for: ‎src/Equinox.Core/Infrastructure.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ open System.Threading
1111
type OAttribute = System.Runtime.InteropServices.OptionalAttribute
1212
type DAttribute = System.Runtime.InteropServices.DefaultParameterValueAttribute
1313

14-
#if NET461
14+
#if NET472
1515
module Array =
1616
let tryHead (array : 'T[]) =
1717
if array.Length = 0 then None

Diff for: ‎src/Equinox.Cosmos/Equinox.Cosmos.fsproj

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,10 @@
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
9-
<DefineConstants Condition=" '$(TargetFramework)' == 'net461' ">$(DefineConstants);NET461</DefineConstants>
9+
<DefineConstants Condition=" '$(TargetFramework)' == 'net472' ">$(DefineConstants);net472</DefineConstants>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<Compile Include="Json\JsonElementHelpers.fs" />
14-
<Compile Include="Json\Utf8JsonReaderExtensions.fs" />
15-
<Compile Include="Json\JsonRecordConverter.fs" />
16-
<Compile Include="Json\Options.fs" />
1713
<Compile Include="..\Equinox.Core\Infrastructure.fs" Link="Infrastructure.fs" />
1814
<Compile Include="CosmosJsonSerializer.fs" />
1915
<Compile Include="Cosmos.fs" />
@@ -28,7 +24,7 @@
2824
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
2925
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
3026

31-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
27+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
3228
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
3329

3430
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />

Diff for: ‎src/Equinox.EventStore/Equinox.EventStore.fsproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
9-
<DefineConstants Condition=" '$(TargetFramework)' == 'net461' ">$(DefineConstants);NET461</DefineConstants>
9+
<DefineConstants Condition=" '$(TargetFramework)' == 'net472' ">$(DefineConstants);net472</DefineConstants>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
@@ -22,8 +22,8 @@
2222
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
2323
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
2424

25-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.0' " />
26-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
25+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' != 'netstandard2.1' " />
26+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
2727

2828
<PackageReference Include="EventStore.Client" Version="5.0.1" />
2929
<PackageReference Include="FsCodec" Version="2.0.1" />

Diff for: ‎src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -20,8 +20,8 @@
2020
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
2121
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
2222

23-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
24-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
23+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net472' " />
24+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
2525

2626
<!-- only uses FsCodec.Box, which happens to be housed in the NewtonsoftJson package-->
2727
<PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.1" />

Diff for: ‎src/Equinox.SqlStreamStore.MsSql/Equinox.SqlStreamStore.MsSql.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -17,8 +17,8 @@
1717
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
1818
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
1919

20-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
21-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
20+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net472' " />
21+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
2222

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

Diff for: ‎src/Equinox.SqlStreamStore.MySql/Equinox.SqlStreamStore.MySql.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -17,8 +17,8 @@
1717
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
1818
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
1919

20-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
21-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
20+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net472' " />
21+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
2222

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

Diff for: ‎src/Equinox.SqlStreamStore.Postgres/Equinox.SqlStreamStore.Postgres.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -17,8 +17,8 @@
1717
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
1818
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
1919

20-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
21-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
20+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net472' " />
21+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
2222

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

Diff for: ‎src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
55
<WarningLevel>5</WarningLevel>
66
<IsTestProject>false</IsTestProject>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
@@ -21,8 +21,8 @@
2121
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
2222
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
2323

24-
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net461' " />
25-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
24+
<PackageReference Include="FSharp.Core" Version="3.1.2.5" Condition=" '$(TargetFramework)' == 'net472' " />
25+
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition=" '$(TargetFramework)' == 'netstandard2.1' " />
2626

2727
<PackageReference Include="FsCodec" Version="2.0.1" />
2828
<PackageReference Include="FSharp.Control.AsyncSeq" Version="2.0.23" />

0 commit comments

Comments
 (0)