Skip to content
This repository was archived by the owner on Apr 5, 2025. It is now read-only.

Commit c0b1f09

Browse files
thinkbeforecodingthinkbeforecoding
authored
Merge pull request #5 from Tarmil/paket
Use paket and lower minimum FSharp.Core to 6
2 parents 29032ef + 363bd35 commit c0b1f09

File tree

6 files changed

+46
-44
lines changed

6 files changed

+46
-44
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
"commands": [
88
"nbgv"
99
]
10+
},
11+
"paket": {
12+
"version": "7.2.1",
13+
"commands": [
14+
"paket"
15+
]
1016
}
1117
}
1218
}

‎paket.dependencies‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
source https://api.nuget.org/v3/index.json
22
storage: None
3-
framework: netstandard2.0, net7.0
3+
framework: netstandard2.0, net6.0, net7.0
44
nuget DEdge.Diffract
5-
nuget FSharp.Core
5+
nuget FSharp.Core >= 6.0 lowest_matching: true
66
nuget FsCheck.Xunit
77
nuget Microsoft.NET.Test.Sdk
88
nuget Xunit
9-
nuget xunit.runner.visualstudio
9+
nuget xunit.runner.visualstudio

‎paket.lock‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
STORAGE: NONE
2-
RESTRICTION: || (== net7.0) (== netstandard2.0)
2+
RESTRICTION: || (== net6.0) (== net7.0) (== netstandard2.0)
33
NUGET
44
remote: https://api.nuget.org/v3/index.json
55
DEdge.Diffract (0.2)
@@ -10,46 +10,48 @@ NUGET
1010
FsCheck.Xunit (2.16.6)
1111
FsCheck (2.16.6)
1212
xunit.extensibility.execution (>= 2.2 < 3.0)
13-
FSharp.Core (7.0.300)
14-
Microsoft.CodeCoverage (17.6.3) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
15-
Microsoft.NET.Test.Sdk (17.6.3)
16-
Microsoft.CodeCoverage (>= 17.6.3) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
17-
Microsoft.TestPlatform.TestHost (>= 17.6.3) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
13+
FSharp.Core (6.0)
14+
Microsoft.CodeCoverage (17.7.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
15+
Microsoft.NET.Test.Sdk (17.7.2)
16+
Microsoft.CodeCoverage (>= 17.7.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
17+
Microsoft.TestPlatform.TestHost (>= 17.7.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
1818
Microsoft.NETCore.Platforms (7.0.3)
19-
Microsoft.TestPlatform.ObjectModel (17.6.3) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
19+
Microsoft.TestPlatform.ObjectModel (17.7.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
2020
NuGet.Frameworks (>= 6.5)
2121
System.Reflection.Metadata (>= 1.6)
22-
Microsoft.TestPlatform.TestHost (17.6.3) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
23-
Microsoft.TestPlatform.ObjectModel (>= 17.6.3) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
24-
Newtonsoft.Json (>= 13.0.1) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
22+
Microsoft.TestPlatform.TestHost (17.7.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
23+
Microsoft.TestPlatform.ObjectModel (>= 17.7.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
24+
Newtonsoft.Json (>= 13.0.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
2525
NETStandard.Library (2.0.3)
2626
Microsoft.NETCore.Platforms (>= 1.1)
27-
Newtonsoft.Json (13.0.3) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
28-
NuGet.Frameworks (6.6.1) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
29-
System.Collections.Immutable (7.0) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
30-
System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net7.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (< portable-net45+wp8)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.0)
31-
System.Reflection.Emit.Lightweight (4.7) - restriction: || (&& (== net7.0) (< netcoreapp3.1)) (== netstandard2.0)
32-
System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net7.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (< portable-net45+wp8)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.0)
33-
System.Reflection.Metadata (7.0.2) - restriction: || (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
27+
Newtonsoft.Json (13.0.3) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
28+
NuGet.Frameworks (6.6.1) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
29+
System.Collections.Immutable (7.0) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
30+
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (== netstandard2.0)
31+
System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (< portable-net45+wp8)) (&& (== net6.0) (>= uap10.1)) (&& (== net7.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (< portable-net45+wp8)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.0)
32+
System.Reflection.Emit.Lightweight (4.7) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net7.0) (< netcoreapp3.1)) (== netstandard2.0)
33+
System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== net6.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (< portable-net45+wp8)) (&& (== net6.0) (>= uap10.1)) (&& (== net7.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net7.0) (< netstandard2.0)) (&& (== net7.0) (< portable-net45+wp8)) (&& (== net7.0) (>= uap10.1)) (== netstandard2.0)
34+
System.Reflection.Metadata (7.0.2) - restriction: || (== net6.0) (== net7.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
3435
System.Collections.Immutable (>= 7.0)
36+
System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (== net6.0) (&& (== net7.0) (== netstandard2.0)) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) (&& (== netstandard2.0) (>= net6.0)) (&& (== netstandard2.0) (>= netcoreapp3.1))
3537
TypeShape (10.0)
3638
FSharp.Core (>= 4.5.4)
37-
System.Reflection.Emit.Lightweight (>= 4.7) - restriction: || (&& (== net7.0) (< netcoreapp3.1)) (== netstandard2.0)
38-
xunit (2.5)
39-
xunit.analyzers (>= 1.2)
40-
xunit.assert (>= 2.5)
41-
xunit.core (2.5)
39+
System.Reflection.Emit.Lightweight (>= 4.7) - restriction: || (&& (== net6.0) (< netcoreapp3.1)) (&& (== net7.0) (< netcoreapp3.1)) (== netstandard2.0)
40+
xunit (2.5.3)
41+
xunit.analyzers (>= 1.4)
42+
xunit.assert (>= 2.5.3)
43+
xunit.core (2.5.3)
4244
xunit.abstractions (2.0.3)
43-
xunit.analyzers (1.2)
44-
xunit.assert (2.5)
45+
xunit.analyzers (1.4)
46+
xunit.assert (2.5.3)
4547
NETStandard.Library (>= 1.6.1)
46-
xunit.core (2.5)
47-
xunit.extensibility.core (2.5)
48-
xunit.extensibility.execution (2.5)
49-
xunit.extensibility.core (2.5)
48+
xunit.core (2.5.3)
49+
xunit.extensibility.core (2.5.3)
50+
xunit.extensibility.execution (2.5.3)
51+
xunit.extensibility.core (2.5.3)
5052
NETStandard.Library (>= 1.6.1)
5153
xunit.abstractions (>= 2.0.3)
52-
xunit.extensibility.execution (2.5)
54+
xunit.extensibility.execution (2.5.3)
5355
NETStandard.Library (>= 1.6.1)
54-
xunit.extensibility.core (2.5)
55-
xunit.runner.visualstudio (2.5)
56+
xunit.extensibility.core (2.5.3)
57+
xunit.runner.visualstudio (2.5.3)

‎src/Fargo/Fargo.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@
2222
<ItemGroup>
2323
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
2424
</ItemGroup>
25+
<Import Project="..\..\.paket\Paket.Restore.targets" />
2526
</Project>

‎src/Fargo/paket.references‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FSharp.Core

‎tests/Fargo.Test/Fargo.Test.fsproj‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,8 @@
1212
<Compile Include="Completion.fs" />
1313
<Compile Include="AllAtOnce.fs" />
1414
</ItemGroup>
15-
<ItemGroup>
16-
<PackageReference Include="DEdge.Diffract" Version="0.2.0" />
17-
<PackageReference Include="FsCheck.Xunit" Version="2.16.6" />
18-
<PackageReference Include="xunit" Version="2.5.0" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22-
</PackageReference>
23-
</ItemGroup>
2415
<ItemGroup>
2516
<ProjectReference Include="..\..\src\Fargo\Fargo.fsproj" />
2617
</ItemGroup>
27-
</Project>
18+
<Import Project="..\..\.paket\Paket.Restore.targets" />
19+
</Project>

0 commit comments

Comments
 (0)