RC2 compile using net6

fsprojects · Dec 17, 2023 · e1b54a1 · e1b54a1
1 parent fedc4fd
commit e1b54a1
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 30 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -26,8 +26,7 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          8.0.x
-          7.0.x
+          6.0.x
     - name: Restore
       run: git submodule update --init --recursive
     - name: Build with dotnet
@@ -48,8 +47,6 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          8.0.x
-          7.0.x
           6.0.x
     - name: Restore
       run: git submodule update --init --recursive
@@ -90,8 +87,6 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          8.0.x
-          7.0.x
           6.0.x
           5.0.x
     - name: Restore

diff --git a/.github/workflows/fable.yml b/.github/workflows/fable.yml
@@ -17,16 +17,10 @@ jobs:
       run: git submodule update --init --recursive
     - name: Remove global json
       run: rm global.json
-    - name: Set target framework to net6 instead of net8
-      uses: Mudlet/xmlstarlet-action@master
-      with:
-        args: edit --inplace --update "/Project/PropertyGroup/TargetFrameworks" --value "netstandard2.0;netstandard2.1;net6.0" ./src/FSharpPlus/FSharpPlus.fsproj
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          8.0.x
-          7.0.x
           6.0.x
     - name: Restore tools
       run: dotnet tool restore
@@ -59,8 +53,6 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          8.0.x
-          7.0.x
           6.0.x
     - name: Restore tools
       run: dotnet tool restore
@@ -94,8 +86,6 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          8.0.x
-          7.0.x
           6.0.x
     - name: Restore tools
       run: dotnet tool restore

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,7 +14,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageTags>f# FSharp Applicative Monad MonadTransformer Arrow Overloading</PackageTags>
     <VersionPrefix>1.6.0</VersionPrefix>
-    <VersionSuffix>RC1</VersionSuffix>
+    <VersionSuffix>RC2</VersionSuffix>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
     <Version Condition=" '$(VersionSuffix)' == '' ">$(VersionPrefix)</Version>
 

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,5 @@
-#### 1.6.0-RC1  - December 17 2023
- - Target net 8
+#### 1.6.0-RC2  - December 17 2023
+ - Compile using net6
  - Add Result.Sequence
  - Add Validation.ofOptionWith
  - Add List.chunkBy

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -1,7 +1,7 @@
-Release Notes for FSharpPlus 1.6.0-RC1  - December 17 2023
+Release Notes for FSharpPlus 1.6.0-RC2  - December 17 2023
 ----------------------------------------------------------
 
-Target net 8
+Compile using net6
 Add Result.Sequence
 Add Validation.ofOptionWith
 Add List.chunkBy

diff --git a/appveyor.yml b/appveyor.yml
@@ -12,13 +12,13 @@ init:
   - git config --global core.autocrlf input
 install:
   - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
-  - ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet"
+  #- ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet"
   #- cmd: winget install Microsoft.DotNet.SDK.8
   - cmd: git submodule update --init --recursive
 build_script:
   - cmd: dotnet restore ./FSharpPlus.sln
   - cmd: dotnet build -c Release ./FSharpPlus.sln
-  - cmd: dotnet test -f net8.0 -c Test tests/FSharpPlus.Tests
+  - cmd: dotnet test -f net6.0 -c Test tests/FSharpPlus.Tests
   - ps: if ($env:VersionSuffix) { dotnet pack build.proj --version-suffix $env:VersionSuffix } else { dotnet pack build.proj }
 test: off
 artifacts:

diff --git a/global.json b/global.json
@@ -1,13 +1,11 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "6.0.0",
     "rollForward": "latestFeature",
     "allowPrerelease": true
   },
 
   "additionalSdks": [
-    "5.0.405",
-    "6.0.201",
-    "7.0.100"
+    "5.0.405"
   ]
 }
diff --git a/src/FSharpPlus/FSharpPlus.fsproj b/src/FSharpPlus/FSharpPlus.fsproj
@@ -23,14 +23,14 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Configurations>Debug;Release;Fable;Fable3;Test</Configurations>
     <Platforms>AnyCPU</Platforms>
-    <LangVersion>8.0</LangVersion>
+    <!--<LangVersion>8.0</LangVersion>-->
     <LangVersion Condition=" '$(Configuration)' == 'Fable' OR '$(Configuration)' == 'Fable3' ">6.0</LangVersion>
 
     <DefineConstants Condition=" '$(Configuration)' == 'Test'">$(DefineConstants);TEST_TRACE</DefineConstants>
     <DefineConstants Condition=" '$(Configuration)' == 'Fable'">$(DefineConstants);FABLE_COMPILER</DefineConstants>
     <DefineConstants Condition=" '$(Configuration)' == 'Fable3'">$(DefineConstants);FABLE_COMPILER;FABLE_COMPILER_3</DefineConstants>
     <DefineConstants Condition=" '$(Configuration)' == 'Fable4'">$(DefineConstants);FABLE_COMPILER;FABLE_COMPILER_4</DefineConstants>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net6.0</TargetFrameworks>
     <!--<OutputPath>..\..\bin</OutputPath>-->
   </PropertyGroup>
   <ItemGroup>

diff --git a/tests/FSharpPlus.Tests/FSharpPlus.Tests.fsproj b/tests/FSharpPlus.Tests/FSharpPlus.Tests.fsproj
@@ -12,7 +12,7 @@
     <Platforms>AnyCPU</Platforms>
     <DefineConstants Condition=" '$(Configuration)' == 'Test'">$(DefineConstants);TEST_TRACE</DefineConstants>
     <DefineConstants Condition=" '$(Configuration)' == 'Fable'">$(DefineConstants);FABLE_COMPILER</DefineConstants>
-    <TargetFrameworks>net462;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Helpers.fs" />