Skip to content

Commit 6f8cef4

Browse files
wallymathieuwallymathieu
authored
+github action (#83)
1 parent e22f670 commit 6f8cef4

File tree

9 files changed

+59
-23
lines changed

9 files changed

+59
-23
lines changed

‎.github/workflows/dotnetcore.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: .NET Core
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Setup .NET Core
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: 3.1.101
20+
- name: Install dependencies
21+
run: dotnet restore
22+
- name: Build
23+
run: dotnet build -c Release
24+
- name: Test SystemJson
25+
run: dotnet run --no-build -p ./test/Tests.SystemJson/Tests.SystemJson.fsproj -c Release -f netcoreapp3.1
26+
- name: Test FSharpData
27+
run: dotnet run --no-build -p ./test/Tests.FSharpData/Tests.FSharpData.fsproj -c Release -f netcoreapp3.1
28+
- name: Test NewtonsoftJson
29+
run: dotnet run --no-build -p ./test/Tests.NewtonsoftJson/Tests.NewtonsoftJson.fsproj -c Release -f netcoreapp3.1
30+
- name: Test SystemTextJson
31+
run: dotnet run --no-build -p ./test/Tests.SystemTextJson/Tests.SystemTextJson.fsproj -c Release -f netcoreapp3.1

‎Directory.Build.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,10 @@
3333
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net471'">$(MonoLibFolder)/4.7.1-api</FrameworkPathOverride>
3434
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net472'">$(MonoLibFolder)/4.7.2-api</FrameworkPathOverride>
3535
</PropertyGroup>
36+
<ItemGroup>
37+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
38+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
39+
<PrivateAssets>all</PrivateAssets>
40+
</PackageReference>
41+
</ItemGroup>
3642
</Project>

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ test_script:
1717
- cmd: dotnet run -p .\test\Tests.SystemJson\Tests.SystemJson.fsproj -c Release -f net461
1818
- cmd: dotnet run -p .\test\Tests.FSharpData\Tests.FSharpData.fsproj -c Release -f net461
1919
- cmd: dotnet run -p .\test\Tests.NewtonsoftJson\Tests.NewtonsoftJson.fsproj -c Release -f net461
20-
- cmd: dotnet run -p .\test\Tests.SystemTextJson\Tests.SystemTextJson.fsproj -c Release -f net461
20+
- cmd: dotnet run -p .\test\Tests.SystemTextJson\Tests.SystemTextJson.fsproj -c Release -f netcoreapp3.1
2121

2222
artifacts:
2323
# pushing all *.nupkg files in build directory recursively

‎docsrc/tool/manually_build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ dotnet tool restore
1010
msbuild /t:Build /p:Configuration=Release
1111

1212
# Gen docs
13-
dotnet run --project ./docsrc/tool
13+
dotnet run --project ./docsrc/tool ReleaseDocs
1414

‎test/Tests.FSharpData/Tests.FSharpData.fsproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
66
<DefineConstants>FSHARPDATA;$(DefineConstants)</DefineConstants>
77
</PropertyGroup>
88
<ItemGroup>
@@ -11,12 +11,12 @@
1111
</ItemGroup>
1212
<ItemGroup>
1313
<PackageReference Update="FSharp.Core" Version="4.6.2" />
14-
<PackageReference Include="FsCheck" Version="0.9.4.0" />
15-
<PackageReference Include="Fuchu" Version="0.4.0.0" />
16-
<PackageReference Include="Fuchu.FsCheck" Version="0.4.0.0" />
14+
<PackageReference Include="FsCheck" Version="2.14.2" />
15+
<PackageReference Include="Fuchu" Version="1.1.0" />
16+
<PackageReference Include="Fuchu.FsCheck" Version="1.1.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\..\src\Fleece.FSharpData\Fleece.FSharpData.fsproj" />
2020
</ItemGroup>
2121

22-
</Project>
22+
</Project>

‎test/Tests.NewtonsoftJson/Tests.NewtonsoftJson.fsproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
66
<DefineConstants>NEWTONSOFT;$(DefineConstants)</DefineConstants>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
88
</PropertyGroup>
@@ -12,11 +12,11 @@
1212
</ItemGroup>
1313
<ItemGroup>
1414
<PackageReference Update="FSharp.Core" Version="4.6.2" />
15-
<PackageReference Include="FsCheck" Version="0.9.4.0" />
16-
<PackageReference Include="Fuchu" Version="0.4.0.0" />
17-
<PackageReference Include="Fuchu.FsCheck" Version="0.4.0.0" />
15+
<PackageReference Include="FsCheck" Version="2.14.2" />
16+
<PackageReference Include="Fuchu" Version="1.1.0" />
17+
<PackageReference Include="Fuchu.FsCheck" Version="1.1.0" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\..\src\Fleece.NewtonsoftJson\Fleece.NewtonsoftJson.fsproj" />
2121
</ItemGroup>
22-
</Project>
22+
</Project>

‎test/Tests.SystemJson/Tests.SystemJson.fsproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
5+
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
66
<DefineConstants>SYSTEMJSON;$(DefineConstants)</DefineConstants>
77
</PropertyGroup>
88
<ItemGroup>
@@ -11,11 +11,11 @@
1111
</ItemGroup>
1212
<ItemGroup>
1313
<PackageReference Update="FSharp.Core" Version="4.6.2" />
14-
<PackageReference Include="FsCheck" Version="0.9.4.0" />
15-
<PackageReference Include="Fuchu" Version="0.4.0.0" />
16-
<PackageReference Include="Fuchu.FsCheck" Version="0.4.0.0" />
14+
<PackageReference Include="FsCheck" Version="2.14.2" />
15+
<PackageReference Include="Fuchu" Version="1.1.0" />
16+
<PackageReference Include="Fuchu.FsCheck" Version="1.1.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\..\src\Fleece.SystemJson\Fleece.SystemJson.fsproj" />
2020
</ItemGroup>
21-
</Project>
21+
</Project>

‎test/Tests.SystemTextJson/Tests.SystemTextJson.fsproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
5+
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
66
<DefineConstants>SYSTEMTEXTJSON;$(DefineConstants)</DefineConstants>
77
</PropertyGroup>
88
<ItemGroup>
@@ -11,9 +11,9 @@
1111
</ItemGroup>
1212
<ItemGroup>
1313
<PackageReference Update="FSharp.Core" Version="4.6.2" />
14-
<PackageReference Include="FsCheck" Version="0.9.4.0" />
15-
<PackageReference Include="Fuchu" Version="0.4.0.0" />
16-
<PackageReference Include="Fuchu.FsCheck" Version="0.4.0.0" />
14+
<PackageReference Include="FsCheck" Version="2.14.2" />
15+
<PackageReference Include="Fuchu" Version="1.1.0" />
16+
<PackageReference Include="Fuchu.FsCheck" Version="1.1.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\..\src\Fleece.SystemTextJson\Fleece.SystemTextJson.fsproj" />

‎test/Tests/Tests.fs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ type Assert with
171171

172172

173173
open FsCheck
174-
open FsCheck.GenOperators
175174

176175
type ArraySegmentGenerator =
177176
static member ArraySegment() =
@@ -432,7 +431,7 @@ let tests = [
432431
let expectedU = "\"[{bike:[]}]\""
433432
let expectedV = "\"[{motorBike:[]}]\""
434433
let expectedW = "\"[{car:Renault}]\""
435-
let expectedX = "\"[{van:[Fiat,5.7999999999999998]}]\""
434+
let expectedX = "\"[{van:[Fiat,5.8]}]\""
436435
let expectedY = "\"[{truck:{make:Ford,capacity:20}}]\""
437436
let expectedZ = "\"[{aircraft:{make:Airbus,capacity:200}}]\""
438437
#endif

0 commit comments

Comments
 (0)