Merge pull request #9 from TheAngryByrd/net-7-preview

TheAngryByrd · web-flow · commit 8c715d9290a9 · 2022-11-06T23:31:47.000-05:00
Net 7 preview
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "paket": {
-      "version": "6.2.1",
+      "version": "7.1.5",
       "commands": [
         "paket"
       ]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,27 +10,26 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use .NET Core 3.1 SDK
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v3
+    - name: Setup necessary dotnet SDKs
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '3.1.x'
-    - name: Use .NET Core 5.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
+        dotnet-version: |
+          2.1.x
+          3.1.x
+          5.x
+          6.x
     # Not specifying a version will attempt to install via global.json
     - name: Use .NET Core global.json
-      uses: actions/setup-dotnet@v1
-
-    - name: Build
+      uses: actions/setup-dotnet@v3
+    - name: Build via Bash
       if: runner.os != 'Windows'
       run: |
         chmod +x ./build.sh
         ./build.sh
       env:
         CI: true
-    - name: Build
+    - name: Build via Windows
       if: runner.os == 'Windows'
       run: ./build.cmd
       env:
diff --git a/benchmarks/CSharpTaskBenchmarks/CSharpTaskBenchmarks.csproj b/benchmarks/CSharpTaskBenchmarks/CSharpTaskBenchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
diff --git a/benchmarks/FSharpBenchmarks/benchmarks.fsproj b/benchmarks/FSharpBenchmarks/benchmarks.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/build/build.fs b/build/build.fs
@@ -357,7 +357,7 @@ let updateChangelog ctx =
     let linkReferenceForUnreleased = sprintf "[Unreleased]: %s/compare/%s...%s" gitHubRepoUrl (tagFromVersionNumber newVersion.AsString) "HEAD"
     let tailLines = File.read changelogFilename |> List.ofSeq |> List.rev
 
-    let isRef line = System.Text.RegularExpressions.Regex.IsMatch(line, @"^\[.+?\]:\s?[a-z]+://.*$")
+    let isRef (line: string) = System.Text.RegularExpressions.Regex.IsMatch(line, @"^\[.+?\]:\s?[a-z]+://.*$")
     let linkReferenceTargets =
         tailLines
         |> List.skipWhile String.isNullOrWhiteSpace
@@ -726,7 +726,6 @@ let initTargets () =
     "DotnetRestore"
         ==> "CheckFormatCode"
         ==> "DotnetBuild"
-        ==> "FSharpAnalyzers"
         ==> "DotnetTest"
         =?> ("GenerateCoverageReport", not disableCodeCoverage)
         ==> "DotnetPack"
diff --git a/build/build.fsproj b/build/build.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <WarnOn>3390;$(WarnOn)</WarnOn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/docsTool/Program.fs b/docsTool/Program.fs
@@ -205,7 +205,7 @@ module GenerateDocs =
                     { opts
                         with
                             OutputPath = Some cfg.PublishPath.FullName
-                            Framework = Some "net6.0"
+                            Framework = Some "net7.0"
                     })
                 p
         )
diff --git a/docsTool/docsTool.fsproj b/docsTool/docsTool.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/global.json b/global.json
@@ -1,6 +1,5 @@
 {
-    "sdk": {
-        "version": "6.0.100",
-        "rollForward": "feature"
-    }
-}
+  "sdk": {
+    "version": "7.0.100-rc.2.22477.23"
+  }
+}
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,7 +1,7 @@
 source https://www.nuget.org/api/v2
 source https://api.nuget.org/v3/index.json
 storage: none
-nuget FSharp.Core ~> 6
+nuget FSharp.Core 7.0.0-beta.22473.1
 nuget Microsoft.SourceLink.GitHub 1.1.0 copy_local: true
 nuget Expecto 9.0.4
 nuget YoloDev.Expecto.TestSdk 0.12.12
diff --git a/paket.lock b/paket.lock
diff --git a/src/IcedTasks/IcedTasks.fsproj b/src/IcedTasks/IcedTasks.fsproj
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <NoWarn>FS3513</NoWarn>
   </PropertyGroup>
diff --git a/tests/IcedTasks.Tests/CancellableTaskTests.fs b/tests/IcedTasks.Tests/CancellableTaskTests.fs
@@ -6,6 +6,13 @@ open System.Threading
 open System.Threading.Tasks
 open IcedTasks
 
+module CancellableTaskHelpers =
+    let map (mapper: 'a -> 'b) (item: CancellableTask<'a>) : CancellableTask<'b> = cancellableTask {
+        let! i = item
+        return mapper i
+    }
+
+
 module CancellableTaskTests =
 
 
@@ -423,6 +430,7 @@ module CancellableTaskTests =
                 use cts = new CancellationTokenSource()
                 Async.RunSynchronously(outerAsync, cancellationToken = cts.Token)
                 Expect.equal actual cts.Token ""
+
             testCase "AsyncBuilder can ReturnFrom CancellableTask"
             <| fun () ->
                 let mutable actual = CancellationToken.None
@@ -432,4 +440,15 @@ module CancellableTaskTests =
                 use cts = new CancellationTokenSource()
                 Async.RunSynchronously(outerAsync, cancellationToken = cts.Token)
                 Expect.equal actual cts.Token ""
+
+            testCaseAsync "Generic coldTask parameter"
+            <| async {
+                let innerCall = cancellableTask { return "lol" }
+
+                let! someTask =
+                    innerCall
+                    |> CancellableTaskHelpers.map (fun x -> x + "fooo")
+
+                Expect.equal "lolfooo" someTask ""
+            }
         ]
diff --git a/tests/IcedTasks.Tests/ColdTaskTests.fs b/tests/IcedTasks.Tests/ColdTaskTests.fs
@@ -5,6 +5,13 @@ open Expecto
 open System.Threading.Tasks
 open IcedTasks
 
+module ColdTaskHelpers =
+    let map (mapper: 'a -> 'b) (item: ColdTask<'a>) : ColdTask<'b> = coldTask {
+        let! i = item
+        return mapper i
+    }
+
+
 module ColdTaskTests =
     open System.Threading
 
@@ -332,4 +339,16 @@ module ColdTaskTests =
                 Expect.hasLength values 2 ""
             }
 
+            testCaseAsync "Generic coldTask parameter"
+            <| async {
+                let innerCall = coldTask { return "lol" }
+
+                let! someTask =
+                    innerCall
+                    |> ColdTaskHelpers.map (fun x -> x + "fooo")
+
+                Expect.equal "lolfooo" someTask ""
+
+            }
+
         ]
diff --git a/tests/IcedTasks.Tests/IcedTasks.Tests.fsproj b/tests/IcedTasks.Tests/IcedTasks.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`]`
`16`	`16`	`},`
`17`	`17`	`"paket": {`
`18`		`- "version": "6.2.1",`
	`18`	`+ "version": "7.1.5",`
`19`	`19`	`"commands": [`
`20`	`20`	`"paket"`
`21`	`21`	`]`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ module GenerateDocs =`
`205`	`205`	`{ opts`
`206`	`206`	`with`
`207`	`207`	`OutputPath = Some cfg.PublishPath.FullName`
`208`		`- Framework = Some "net6.0"`
	`208`	`+ Framework = Some "net7.0"`
`209`	`209`	`})`
`210`	`210`	`p`
`211`	`211`	`)`