Skip to content

Commit 13ff2c6

Browse files
wallymathieuwallymathieu
committed
Revert "Upgrade tests and build to net7 except for Fable (net6) (#525)"
This reverts commit 80616e3. The reason being that we ended up encountering F# issue dotnet/fsharp#14313
1 parent 8751a49 commit 13ff2c6

File tree

10 files changed

+55
-73
lines changed

10 files changed

+55
-73
lines changed

‎.github/workflows/dotnetcore.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup .NET Core
2626
uses: actions/setup-dotnet@v1
2727
with:
28-
dotnet-version: 7.0.100
28+
dotnet-version: 6.0.201
2929
- name: Restore
3030
run: git submodule update --init --recursive
3131
- name: Build with dotnet
@@ -38,11 +38,7 @@ jobs:
3838

3939
steps:
4040
- uses: actions/checkout@v2
41-
- name: Setup .NET Core 7
42-
uses: actions/setup-dotnet@v1
43-
with:
44-
dotnet-version: 7.0.100
45-
- name: Setup .NET Core 6
41+
- name: Setup .NET Core
4642
uses: actions/setup-dotnet@v1
4743
with:
4844
dotnet-version: 6.0.201
@@ -82,10 +78,6 @@ jobs:
8278
runs-on: windows-latest
8379
steps:
8480
- uses: actions/checkout@v2
85-
- name: Setup .NET Core 7
86-
uses: actions/setup-dotnet@v1
87-
with:
88-
dotnet-version: 7.0.100
8981
- name: Setup .NET Core 6
9082
uses: actions/setup-dotnet@v1
9183
with:

‎.github/workflows/fable.yml‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Restore
17-
run: git submodule update --init --recursive
18-
- name: Remove global json
19-
run: rm global.json
2016
- name: Setup .NET Core
2117
uses: actions/setup-dotnet@v1
2218
with:
2319
dotnet-version: 6.0.201
20+
- name: Restore
21+
run: git submodule update --init --recursive
2422
- name: Restore tools
2523
run: dotnet tool restore
2624
- name: Use Node.js
@@ -43,14 +41,7 @@ jobs:
4341
run: git submodule update --init --recursive
4442
- name: Remove global json
4543
run: rm global.json
46-
- name: Remove global json in subfolder
47-
run: rm global.json
48-
working-directory: tests/FSharpPlusFable.Tests
49-
- name: Setup .NET Core 7
50-
uses: actions/setup-dotnet@v1
51-
with:
52-
dotnet-version: 7.0.100
53-
- name: Setup .NET Core 6
44+
- name: Setup .NET Core
5445
uses: actions/setup-dotnet@v1
5546
with:
5647
dotnet-version: 6.0.201

‎docsrc/tools/docsTool.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎global.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"sdk": {
3-
"version": "7.0.100",
3+
"version": "6.0.200",
44
"rollForward": "latestFeature"
55
},
66

77
"additionalSdks": [
8-
"5.0.405",
9-
"6.0.201"
8+
"5.0.405"
109
]
1110
}

‎src/FSharpPlus.Docs/FSharpPlus.Docs.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Exe</OutputType>
99
<Configurations>Debug;Release;Fable</Configurations>
1010
<Platforms>AnyCPU</Platforms>
11-
<TargetFramework>net7.0</TargetFramework>
11+
<TargetFramework>net6.0</TargetFramework>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎src/FSharpPlus/Control/Numeric.fs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,11 @@ type TryNegate' =
305305
type DivRem =
306306
inherit Default1
307307
static member inline DivRem (x: ^t when ^t: null and ^t: struct, y: ^t, _thisClass: DivRem) = (x, y)
308-
static member inline DivRem (D: 'T, d: 'T, _impl: Default2) = let q = D / d in q, D - q * d
309-
static member inline DivRem (D: 'T, d: 'T, _impl: Default1) =
308+
static member inline DivRem (D: 'T, d: 'T, [<Optional>]_impl: Default1) = let q = D / d in q, D - q * d
309+
static member inline DivRem (D: 'T, d: 'T, [<Optional>]_impl: DivRem ) =
310310
let mutable r = Unchecked.defaultof<'T>
311311
(^T: (static member DivRem : _ * _ -> _ -> _) (D, d, &r)), r
312312

313-
static member inline DivRem (D: 'T, d: 'T, _impl: DivRem ) =
314-
let (struct (x, y)) = (^T: (static member DivRem : _ * _ -> _) (D, d))
315-
(x, y)
316-
317313
static member inline Invoke (D: 'T) (d: 'T) : 'T*'T =
318314
let inline call_3 (a: ^a, b: ^b, c: ^c) = ((^a or ^b or ^c) : (static member DivRem : _*_*_ -> _) b, c, a)
319315
let inline call (a: 'a, b: 'b, c: 'c) = call_3 (a, b, c)

‎tests/FSharpPlus.Tests/FSharpPlus.Tests.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</PropertyGroup>
77
<PropertyGroup>
88
<TargetFrameworks>net7.0;net462</TargetFrameworks>
9+
<TargetFrameworks>net6.0</TargetFrameworks>
910
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1011
<LangVersion Condition=" '$(Configuration)' == 'Fable' OR '$(Configuration)' == 'Fable3' ">6.0</LangVersion>
1112
<IsPackable>false</IsPackable>

‎tests/FSharpPlusFable.Tests/FSharpPlusFable.Tests.fsproj‎

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,50 @@
1010
<TargetFramework>net6.0</TargetFramework>
1111
</PropertyGroup>
1212

13+
<PropertyGroup>
14+
<OutputType>Exe</OutputType>
15+
<Configurations>Debug;Release;Fable;Fable3</Configurations>
16+
<Platforms>AnyCPU</Platforms>
17+
<LangVersion Condition=" '$(Configuration)' == 'Fable' OR '$(Configuration)' == 'Fable3' ">6.0</LangVersion>
18+
<DefineConstants Condition=" '$(Configuration)' == 'Fable'">$(DefineConstants);FABLE_COMPILER;FABLE_COMPILER_FAKE</DefineConstants>
19+
<DefineConstants Condition=" '$(Configuration)' == 'Fable3'">$(DefineConstants);FABLE_COMPILER;FABLE_COMPILER_3;FABLE_COMPILER_FAKE</DefineConstants>
20+
<TargetFramework>net6.0</TargetFramework>
21+
</PropertyGroup>
1322

14-
<ItemGroup>
15-
<Compile Include="Util.fs" />
16-
<Compile Include="FSharpTests/General/Util.fs" />
17-
<Compile Include="FSharpTests/General/Splits.fs" />
18-
<Compile Include="FSharpTests/General/MonoidCompile.fs" />
19-
<Compile Include="FSharpTests/General/Monoid.fs" />
20-
<Compile Include="FSharpTests/General/Functor.fs" />
21-
<Compile Include="FSharpTests/General/Collections.fs" />
22-
<Compile Include="FSharpTests/General/Monad.fs" />
23-
<Compile Include="FSharpTests/General/Applicative.fs" />
24-
<Compile Include="FSharpTests/General/Alternative.fs" />
25-
<Compile Include="FSharpTests/General/Foldable.fs" />
26-
<Compile Include="FSharpTests/General/Indexable.fs" />
27-
<Compile Include="FSharpTests/General/Parsing.fs" />
28-
<Compile Include="FSharpTests/General/Traversable.fs" />
29-
<Compile Include="FSharpTests/General/Lensing.fs" />
30-
<Compile Include="FSharpTests/General/Numeric.fs" />
31-
<Compile Include="FSharpTests/General.fs" />
32-
<Compile Include="FSharpTests/Extensions.fs" />
33-
<Compile Include="Tests.fs" />
34-
</ItemGroup>
23+
<ItemGroup>
24+
<Compile Include="Util.fs" />
25+
<Compile Include="FSharpTests/General/Util.fs" />
26+
<Compile Include="FSharpTests/General/Splits.fs" />
27+
<Compile Include="FSharpTests/General/MonoidCompile.fs" />
28+
<Compile Include="FSharpTests/General/Monoid.fs" />
29+
<Compile Include="FSharpTests/General/Functor.fs" />
30+
<Compile Include="FSharpTests/General/Collections.fs" />
31+
<Compile Include="FSharpTests/General/Monad.fs" />
32+
<Compile Include="FSharpTests/General/Applicative.fs" />
33+
<Compile Include="FSharpTests/General/Alternative.fs" />
34+
<Compile Include="FSharpTests/General/Foldable.fs" />
35+
<Compile Include="FSharpTests/General/Indexable.fs" />
36+
<Compile Include="FSharpTests/General/Parsing.fs" />
37+
<Compile Include="FSharpTests/General/Traversable.fs" />
38+
<Compile Include="FSharpTests/General/Lensing.fs" />
39+
<Compile Include="FSharpTests/General/Numeric.fs" />
40+
<Compile Include="FSharpTests/General.fs" />
41+
<Compile Include="FSharpTests/Extensions.fs" />
42+
<Compile Include="Tests.fs" />
43+
</ItemGroup>
3544

3645

37-
<ItemGroup>
38-
<PackageReference Include="Fable.Core" Version="3.2.5" />
39-
<PackageReference Include="Fable.Promise" Version="2.2.0" />
40-
<PackageReference Include="Fable.Fetch" Version="2.2.0" />
41-
<PackageReference Include="Fuchu" Version="1.2.0-beta-1" />
42-
</ItemGroup>
46+
<ItemGroup>
47+
<PackageReference Include="Fable.Core" Version="3.2.5" />
48+
<PackageReference Include="Fable.Promise" Version="2.2.0" />
49+
<PackageReference Include="Fable.Fetch" Version="2.2.0" />
50+
<PackageReference Include="Fuchu" Version="1.2.0-beta-1" />
51+
</ItemGroup>
4352

44-
<ItemGroup>
45-
<ProjectReference Include="..\..\src\FSharpPlus\FSharpPlus.fsproj">
46-
<Private>True</Private>
47-
</ProjectReference>
48-
<PackageReference Update="FSharp.Core" Version="6.0.6" />
49-
</ItemGroup>
53+
<ItemGroup>
54+
<ProjectReference Include="..\..\src\FSharpPlus\FSharpPlus.fsproj">
55+
<Private>True</Private>
56+
</ProjectReference>
57+
<PackageReference Update="FSharp.Core" Version="6.0.6" />
58+
</ItemGroup>
5059
</Project>

‎tests/FSharpPlusFable.Tests/global.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎tests/benchmarks/Benchmarks.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<PlatformTarget>AnyCPU</PlatformTarget>
66
<Optimize>true</Optimize>

0 commit comments

Comments
 (0)