Skip to content

Commit 852e94e

Browse files
wallymathieugusty
authored andcommitted
Net8 configuration (#555)
1 parent 8b35146 commit 852e94e

File tree

6 files changed

+46
-48
lines changed

6 files changed

+46
-48
lines changed

.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"fsdocs-tool": {
12-
"version": "17.2.3",
12+
"version": "19.1.1",
1313
"commands": [
1414
"fsdocs"
1515
]

.github/workflows/dotnetcore.yml

+17-20
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v2
2525
- name: Setup .NET Core
26-
uses: actions/setup-dotnet@v1
26+
uses: actions/setup-dotnet@v3
2727
with:
28-
dotnet-version: 7.0.100
28+
dotnet-version: |
29+
8.0.x
30+
7.0.x
2931
- name: Restore
3032
run: git submodule update --init --recursive
3133
- name: Build with dotnet
@@ -42,14 +44,13 @@ jobs:
4244

4345
steps:
4446
- uses: actions/checkout@v2
45-
- name: Setup .NET Core 7
46-
uses: actions/setup-dotnet@v1
47-
with:
48-
dotnet-version: 7.0.100
49-
- name: Setup .NET Core 6
50-
uses: actions/setup-dotnet@v1
47+
- name: Setup .NET Core
48+
uses: actions/setup-dotnet@v3
5149
with:
52-
dotnet-version: 6.0.201
50+
dotnet-version: |
51+
8.0.x
52+
7.0.x
53+
6.0.x
5354
- name: Restore
5455
run: git submodule update --init --recursive
5556
- name: Extract branch name
@@ -85,18 +86,14 @@ jobs:
8586
runs-on: windows-latest
8687
steps:
8788
- uses: actions/checkout@v2
88-
- name: Setup .NET Core 7
89-
uses: actions/setup-dotnet@v1
90-
with:
91-
dotnet-version: 7.0.100
92-
- name: Setup .NET Core 6
93-
uses: actions/setup-dotnet@v1
94-
with:
95-
dotnet-version: 6.0.201
96-
- name: Setup .NET Core 5
97-
uses: actions/setup-dotnet@v1
89+
- name: Setup .NET Core
90+
uses: actions/setup-dotnet@v3
9891
with:
99-
dotnet-version: 5.0.405
92+
dotnet-version: |
93+
8.0.x
94+
7.0.x
95+
6.0.x
96+
5.0.x
10097
- name: Restore
10198
run: git submodule update --init --recursive
10299
- name: Build All Docs

.github/workflows/fable.yml

+18-21
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ jobs:
1717
run: git submodule update --init --recursive
1818
- name: Remove global json
1919
run: rm global.json
20-
- name: Setup .NET Core 7
21-
uses: actions/setup-dotnet@v1
20+
- name: Setup .NET Core
21+
uses: actions/setup-dotnet@v3
2222
with:
23-
dotnet-version: 7.0.200
24-
- name: Setup .NET Core 6
25-
uses: actions/setup-dotnet@v1
26-
with:
27-
dotnet-version: 6.0.201
23+
dotnet-version: |
24+
8.0.x
25+
7.0.x
26+
6.0.x
2827
- name: Restore tools
2928
run: dotnet tool restore
3029
- name: Install fable
@@ -49,14 +48,13 @@ jobs:
4948
run: git submodule update --init --recursive
5049
- name: Remove global json
5150
run: rm global.json
52-
- name: Setup .NET Core 7
53-
uses: actions/setup-dotnet@v1
54-
with:
55-
dotnet-version: 7.0.200
56-
- name: Setup .NET Core 6
57-
uses: actions/setup-dotnet@v1
51+
- name: Setup .NET Core
52+
uses: actions/setup-dotnet@v3
5853
with:
59-
dotnet-version: 6.0.201
54+
dotnet-version: |
55+
8.0.x
56+
7.0.x
57+
6.0.x
6058
- name: Restore tools
6159
run: dotnet tool restore
6260
- name: Install jq
@@ -88,14 +86,13 @@ jobs:
8886
- name: Remove global json in subfolder
8987
run: rm global.json
9088
working-directory: tests/FSharpPlusFable.Tests
91-
- name: Setup .NET Core 7
92-
uses: actions/setup-dotnet@v1
93-
with:
94-
dotnet-version: 7.0.200
95-
- name: Setup .NET Core 6
96-
uses: actions/setup-dotnet@v1
89+
- name: Setup .NET Core
90+
uses: actions/setup-dotnet@v3
9791
with:
98-
dotnet-version: 6.0.201
92+
dotnet-version: |
93+
8.0.x
94+
7.0.x
95+
6.0.x
9996
- name: Restore tools
10097
run: dotnet tool restore
10198
# - name: Run tests (Fable2 subset but on .net)

appveyor.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ before_build:
1111
init:
1212
- git config --global core.autocrlf input
1313
install:
14-
- cmd: choco install dotnetcore-sdk -y
14+
- ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
15+
- ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet"
16+
#- cmd: winget install Microsoft.DotNet.SDK.8
1517
- cmd: git submodule update --init --recursive
1618
build_script:
1719
- cmd: dotnet restore ./FSharpPlus.sln

global.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
{
22
"sdk": {
3-
"version": "7.0.100",
4-
"rollForward": "latestFeature"
3+
"version": "8.0.0",
4+
"rollForward": "latestFeature",
5+
"allowPrerelease": true
56
},
67

78
"additionalSdks": [
89
"5.0.405",
9-
"6.0.201"
10+
"6.0.201",
11+
"7.0.100"
1012
]
1113
}

src/FSharpPlus/FSharpPlus.fsproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2222
<Configurations>Debug;Release;Fable;Fable3;Test</Configurations>
2323
<Platforms>AnyCPU</Platforms>
24-
<LangVersion>6.0</LangVersion>
24+
<LangVersion>8.0</LangVersion>
2525
<DefineConstants Condition=" '$(Configuration)' == 'Test'">$(DefineConstants);TEST_TRACE</DefineConstants>
2626
<DefineConstants Condition=" '$(Configuration)' == 'Fable'">$(DefineConstants);FABLE_COMPILER</DefineConstants>
2727
<DefineConstants Condition=" '$(Configuration)' == 'Fable3'">$(DefineConstants);FABLE_COMPILER;FABLE_COMPILER_3</DefineConstants>
@@ -56,7 +56,6 @@
5656
<Compile Include="Extensions/Extensions.fs" />
5757
<Compile Include="Extensions/Tuple.fs" />
5858
<Compile Include="Extensions/ValueTuple.fs" />
59-
<Compile Include="Data/NonEmptySeq.fs" />
6059
<Compile Include="Control/Converter.fs" />
6160
<Compile Include="Control/Numeric.fs" />
6261
<Compile Include="Control/Monoid.fs" />
@@ -83,6 +82,7 @@
8382
<Compile Include="Math/Applicative.fs" />
8483
<Compile Include="Math/Generic.fs" />
8584
<Compile Include="Builders.fs" />
85+
<Compile Include="Data/NonEmptySeq.fs" />
8686
<Compile Include="Data/Identity.fs" />
8787
<Compile Include="Data/List.fs" />
8888
<Compile Include="Data/Seq.fs" />

0 commit comments

Comments
 (0)