Skip to content

Commit 21e5b78

Browse files
TheAngryByrdTheAngryByrd
committed
use native tasks
1 parent e3749bb commit 21e5b78

4 files changed

Lines changed: 31 additions & 8 deletions

File tree

‎FSharp.Control.Websockets.sln‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "docsTool", "docsTool\docsTo
1515
EndProject
1616
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{40D2259D-991D-44C4-B45D-C88CE0710C23}"
1717
EndProject
18+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Websockets.TPL", "src\FSharp.Control.Websockets.TPL\FSharp.Control.Websockets.TPL.fsproj", "{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}"
19+
EndProject
20+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Websockets.TPL.Tests", "tests\FSharp.Control.Websockets.TPL.Tests\FSharp.Control.Websockets.TPL.Tests.fsproj", "{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}"
21+
EndProject
1822
Global
1923
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2024
Debug|Any CPU = Debug|Any CPU
@@ -76,9 +80,35 @@ Global
7680
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x64.Build.0 = Release|Any CPU
7781
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x86.ActiveCfg = Release|Any CPU
7882
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x86.Build.0 = Release|Any CPU
83+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Debug|Any CPU.Build.0 = Debug|Any CPU
85+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Debug|x64.ActiveCfg = Debug|Any CPU
86+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Debug|x64.Build.0 = Debug|Any CPU
87+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Debug|x86.ActiveCfg = Debug|Any CPU
88+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Debug|x86.Build.0 = Debug|Any CPU
89+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Release|Any CPU.ActiveCfg = Release|Any CPU
90+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Release|Any CPU.Build.0 = Release|Any CPU
91+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Release|x64.ActiveCfg = Release|Any CPU
92+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Release|x64.Build.0 = Release|Any CPU
93+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Release|x86.ActiveCfg = Release|Any CPU
94+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F}.Release|x86.Build.0 = Release|Any CPU
95+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Debug|Any CPU.Build.0 = Debug|Any CPU
97+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Debug|x64.ActiveCfg = Debug|Any CPU
98+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Debug|x64.Build.0 = Debug|Any CPU
99+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Debug|x86.ActiveCfg = Debug|Any CPU
100+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Debug|x86.Build.0 = Debug|Any CPU
101+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Release|Any CPU.ActiveCfg = Release|Any CPU
102+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Release|Any CPU.Build.0 = Release|Any CPU
103+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Release|x64.ActiveCfg = Release|Any CPU
104+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Release|x64.Build.0 = Release|Any CPU
105+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Release|x86.ActiveCfg = Release|Any CPU
106+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C}.Release|x86.Build.0 = Release|Any CPU
79107
EndGlobalSection
80108
GlobalSection(NestedProjects) = preSolution
81109
{5D30E174-2538-47AC-8443-318C8C5DC2C9} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216}
82110
{1CA2E092-2320-451D-A4F0-9ED7C7C528CA} = {ACBEE43C-7A88-4FB1-9B06-DB064D22B29F}
111+
{CC415BB9-4BB4-473E-A5ED-19B4B43BE64F} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216}
112+
{19D8CB7E-F7F9-4B9A-A646-21CB01A3A98C} = {ACBEE43C-7A88-4FB1-9B06-DB064D22B29F}
83113
EndGlobalSection
84114
EndGlobal

‎benchmarks/ReceiveBenchmarks.fs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ module Setup =
99
open System.Threading
1010
open System.Threading.Tasks
1111
open Microsoft.AspNetCore.Http
12-
open FSharp.Control.Tasks.V2.ContextInsensitive
1312
open System.Net.WebSockets
1413
// open System.Memory
1514

@@ -114,7 +113,6 @@ module UTF8Convertion =
114113

115114
open FSharp.Control.Websockets
116115
open System.Net.WebSockets
117-
open FSharp.Control.Tasks.V2.ContextInsensitive
118116
open System.Threading
119117
open System.Threading.Tasks
120118
open FSharp.Control.Websockets.Stream
@@ -186,7 +184,6 @@ module Receive =
186184

187185
open FSharp.Control.Websockets
188186
open System.Net.WebSockets
189-
open FSharp.Control.Tasks.V2.ContextInsensitive
190187
open System.Threading
191188
open System.Threading.Tasks
192189

‎src/FSharp.Control.Websockets.TPL/FSharp.Control.Websockets.TPL.fs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ module WebSocket =
6868
open Stream
6969
open System
7070
open System.Net.WebSockets
71-
open FSharp.Control.Tasks.V2
7271

7372
#if NETSTANDARD2_1
7473
open System.Buffers
@@ -436,7 +435,6 @@ module ThreadSafeWebSocket =
436435
open Stream
437436
open System.Threading.Tasks
438437
open System.Threading.Tasks.Dataflow
439-
open FSharp.Control.Tasks.V2
440438

441439
type SendMessages =
442440
| Send of

‎tests/FSharp.Control.Websockets.TPL.Tests/Tests.fs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module Tests
22

33
open Expecto
44
open FSharp.Control.Websockets.TPL
5-
open FSharp.Control.Tasks.V2
5+
open Infrastructure
66

77
open System
88
open System.Net
@@ -13,9 +13,7 @@ open Microsoft.AspNetCore.Hosting
1313
open Microsoft.AspNetCore.Http
1414
open Microsoft.AspNetCore.TestHost
1515
open Microsoft.Extensions.Configuration
16-
open Infrastructure
1716
open System.Threading
18-
open Infrastructure
1917

2018

2119
let testCaseTask name test =

0 commit comments

Comments
 (0)