Skip to content

Commit e1b54a1

Browse files
committed
RC2 compile using net6
1 parent fedc4fd commit e1b54a1

File tree

9 files changed

+13
-30
lines changed

9 files changed

+13
-30
lines changed

.github/workflows/dotnetcore.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ jobs:
2626
uses: actions/setup-dotnet@v3
2727
with:
2828
dotnet-version: |
29-
8.0.x
30-
7.0.x
29+
6.0.x
3130
- name: Restore
3231
run: git submodule update --init --recursive
3332
- name: Build with dotnet
@@ -48,8 +47,6 @@ jobs:
4847
uses: actions/setup-dotnet@v3
4948
with:
5049
dotnet-version: |
51-
8.0.x
52-
7.0.x
5350
6.0.x
5451
- name: Restore
5552
run: git submodule update --init --recursive
@@ -90,8 +87,6 @@ jobs:
9087
uses: actions/setup-dotnet@v3
9188
with:
9289
dotnet-version: |
93-
8.0.x
94-
7.0.x
9590
6.0.x
9691
5.0.x
9792
- name: Restore

.github/workflows/fable.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,10 @@ jobs:
1717
run: git submodule update --init --recursive
1818
- name: Remove global json
1919
run: rm global.json
20-
- name: Set target framework to net6 instead of net8
21-
uses: Mudlet/xmlstarlet-action@master
22-
with:
23-
args: edit --inplace --update "/Project/PropertyGroup/TargetFrameworks" --value "netstandard2.0;netstandard2.1;net6.0" ./src/FSharpPlus/FSharpPlus.fsproj
2420
- name: Setup .NET Core
2521
uses: actions/setup-dotnet@v3
2622
with:
2723
dotnet-version: |
28-
8.0.x
29-
7.0.x
3024
6.0.x
3125
- name: Restore tools
3226
run: dotnet tool restore
@@ -59,8 +53,6 @@ jobs:
5953
uses: actions/setup-dotnet@v3
6054
with:
6155
dotnet-version: |
62-
8.0.x
63-
7.0.x
6456
6.0.x
6557
- name: Restore tools
6658
run: dotnet tool restore
@@ -94,8 +86,6 @@ jobs:
9486
uses: actions/setup-dotnet@v3
9587
with:
9688
dotnet-version: |
97-
8.0.x
98-
7.0.x
9989
6.0.x
10090
- name: Restore tools
10191
run: dotnet tool restore

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReadmeFile>README.md</PackageReadmeFile>
1515
<PackageTags>f# FSharp Applicative Monad MonadTransformer Arrow Overloading</PackageTags>
1616
<VersionPrefix>1.6.0</VersionPrefix>
17-
<VersionSuffix>RC1</VersionSuffix>
17+
<VersionSuffix>RC2</VersionSuffix>
1818
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
1919
<Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
2020

RELEASE_NOTES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#### 1.6.0-RC1 - December 17 2023
2-
- Target net 8
1+
#### 1.6.0-RC2 - December 17 2023
2+
- Compile using net6
33
- Add Result.Sequence
44
- Add Validation.ofOptionWith
55
- Add List.chunkBy

RELEASE_NOTES.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Release Notes for FSharpPlus 1.6.0-RC1 - December 17 2023
1+
Release Notes for FSharpPlus 1.6.0-RC2 - December 17 2023
22
----------------------------------------------------------
33

4-
Target net 8
4+
Compile using net6
55
Add Result.Sequence
66
Add Validation.ofOptionWith
77
Add List.chunkBy

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ init:
1212
- git config --global core.autocrlf input
1313
install:
1414
- 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"
15+
#- ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet"
1616
#- cmd: winget install Microsoft.DotNet.SDK.8
1717
- cmd: git submodule update --init --recursive
1818
build_script:
1919
- cmd: dotnet restore ./FSharpPlus.sln
2020
- cmd: dotnet build -c Release ./FSharpPlus.sln
21-
- cmd: dotnet test -f net8.0 -c Test tests/FSharpPlus.Tests
21+
- cmd: dotnet test -f net6.0 -c Test tests/FSharpPlus.Tests
2222
- ps: if ($env:VersionSuffix) { dotnet pack build.proj --version-suffix $env:VersionSuffix } else { dotnet pack build.proj }
2323
test: off
2424
artifacts:

global.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
{
22
"sdk": {
3-
"version": "8.0.0",
3+
"version": "6.0.0",
44
"rollForward": "latestFeature",
55
"allowPrerelease": true
66
},
77

88
"additionalSdks": [
9-
"5.0.405",
10-
"6.0.201",
11-
"7.0.100"
9+
"5.0.405"
1210
]
1311
}

src/FSharpPlus/FSharpPlus.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2424
<Configurations>Debug;Release;Fable;Fable3;Test</Configurations>
2525
<Platforms>AnyCPU</Platforms>
26-
<LangVersion>8.0</LangVersion>
26+
<!--<LangVersion>8.0</LangVersion>-->
2727
<LangVersion Condition=" '$(Configuration)' == 'Fable' OR '$(Configuration)' == 'Fable3' ">6.0</LangVersion>
2828

2929
<DefineConstants Condition=" '$(Configuration)' == 'Test'">$(DefineConstants);TEST_TRACE</DefineConstants>
3030
<DefineConstants Condition=" '$(Configuration)' == 'Fable'">$(DefineConstants);FABLE_COMPILER</DefineConstants>
3131
<DefineConstants Condition=" '$(Configuration)' == 'Fable3'">$(DefineConstants);FABLE_COMPILER;FABLE_COMPILER_3</DefineConstants>
3232
<DefineConstants Condition=" '$(Configuration)' == 'Fable4'">$(DefineConstants);FABLE_COMPILER;FABLE_COMPILER_4</DefineConstants>
33-
<TargetFrameworks>netstandard2.0;netstandard2.1;net45;net6.0;net8.0</TargetFrameworks>
33+
<TargetFrameworks>netstandard2.0;netstandard2.1;net45;net6.0</TargetFrameworks>
3434
<!--<OutputPath>..\..\bin</OutputPath>-->
3535
</PropertyGroup>
3636
<ItemGroup>

tests/FSharpPlus.Tests/FSharpPlus.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Platforms>AnyCPU</Platforms>
1313
<DefineConstants Condition=" '$(Configuration)' == 'Test'">$(DefineConstants);TEST_TRACE</DefineConstants>
1414
<DefineConstants Condition=" '$(Configuration)' == 'Fable'">$(DefineConstants);FABLE_COMPILER</DefineConstants>
15-
<TargetFrameworks>net462;net6.0;net7.0;net8.0</TargetFrameworks>
15+
<TargetFrameworks>net462;net6.0</TargetFrameworks>
1616
</PropertyGroup>
1717
<ItemGroup>
1818
<Compile Include="Helpers.fs" />

0 commit comments

Comments
 (0)