Skip to content

Commit 352c204

Browse files
author
Jimmy Byrd
authored
Merge pull request #2 from TheAngryByrd/tests
Adds Tests
2 parents 45aa565 + 738416a commit 352c204

24 files changed

+2067
-1148
lines changed

‎.paket/Paket.Restore.targets‎

Lines changed: 69 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565

6666
<!-- Disable Paket restore under NCrunch build -->
6767
<PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
68+
69+
<PaketIntermediateOutputPath Condition=" '$(PaketIntermediateOutputPath)' == '' ">$(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/'))</PaketIntermediateOutputPath>
6870
</PropertyGroup>
6971

7072
<Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">
@@ -105,8 +107,8 @@
105107
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
106108
</PropertyGroup>
107109

108-
<!--
109-
This value should match the version in the props generated by paket
110+
<!--
111+
This value should match the version in the props generated by paket
110112
If they differ, this means we need to do a restore in order to ensure correct dependencies
111113
-->
112114
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
@@ -115,18 +117,18 @@
115117

116118
<!-- Do a global restore if required -->
117119
<Exec Command='$(PaketBootStrapperCommand)' Condition=" '$(PaketBootstrapperStyle)' == 'classic' AND Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
118-
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
119-
120+
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(PaketDisableGlobalRestore)' != 'true' " ContinueOnError="false" />
121+
120122
<!-- Step 2 Detect project specific changes -->
121123
<ItemGroup>
122124
<MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>
123125
<!-- Don't include all frameworks when msbuild explicitly asks for a single one -->
124126
<MyTargetFrameworks Condition="'$(TargetFrameworks)' != '' AND '$(TargetFramework)' == '' " Include="$(TargetFrameworks)"></MyTargetFrameworks>
125-
<PaketResolvedFilePaths Include="@(MyTargetFrameworks -> '$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).%(Identity).paket.resolved')"></PaketResolvedFilePaths>
127+
<PaketResolvedFilePaths Include="@(MyTargetFrameworks -> '$(PaketIntermediateOutputPath)\$(MSBuildProjectFile).%(Identity).paket.resolved')"></PaketResolvedFilePaths>
126128
</ItemGroup>
127129
<Message Importance="low" Text="MyTargetFrameworks=@(MyTargetFrameworks) PaketResolvedFilePaths=@(PaketResolvedFilePaths)" />
128130
<PropertyGroup>
129-
<PaketReferencesCachedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath>
131+
<PaketReferencesCachedFilePath>$(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath>
130132
<!-- MyProject.fsproj.paket.references has the highest precedence -->
131133
<PaketOriginalReferencesFilePath>$(MSBuildProjectFullPath).paket.references</PaketOriginalReferencesFilePath>
132134
<!-- MyProject.paket.references -->
@@ -161,8 +163,8 @@
161163

162164
<!-- Step 3 Restore project specific stuff if required -->
163165
<Message Condition=" '$(PaketRestoreRequired)' == 'true' " Importance="low" Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" />
164-
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" />
165-
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" />
166+
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --output-path "$(PaketIntermediateOutputPath)" --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" />
167+
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --output-path "$(PaketIntermediateOutputPath)" --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" />
166168

167169
<!-- This shouldn't actually happen, but just to be sure. -->
168170
<PropertyGroup>
@@ -195,7 +197,7 @@
195197
</ItemGroup>
196198

197199
<PropertyGroup>
198-
<PaketCliToolFilePath>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).paket.clitools</PaketCliToolFilePath>
200+
<PaketCliToolFilePath>$(PaketIntermediateOutputPath)/$(MSBuildProjectFile).paket.clitools</PaketCliToolFilePath>
199201
</PropertyGroup>
200202

201203
<ReadLinesFromFile File="$(PaketCliToolFilePath)" >
@@ -214,37 +216,39 @@
214216

215217
<!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
216218
<PropertyGroup>
217-
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
219+
<RestoreConfigFile>$(PaketIntermediateOutputPath)/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
218220
</PropertyGroup> -->
219221

220222
</Target>
221223

222-
<Target Name="PaketDisableDirectPack" AfterTargets="_IntermediatePack" BeforeTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
224+
<Target Name="PaketDisableDirectPack" AfterTargets="_IntermediatePack" BeforeTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(PaketIntermediateOutputPath)/$(MSBuildProjectFile).references')" >
223225
<PropertyGroup>
224226
<ContinuePackingAfterGeneratingNuspec>false</ContinuePackingAfterGeneratingNuspec>
225227
<DetectedMSBuildVersion>$(MSBuildVersion)</DetectedMSBuildVersion>
226228
<DetectedMSBuildVersion Condition="$(MSBuildVersion) == ''">15.8.0</DetectedMSBuildVersion>
227229
</PropertyGroup>
228230
</Target>
229231

230-
<Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
232+
<Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(PaketIntermediateOutputPath)/$(MSBuildProjectFile).references')" >
231233
<ItemGroup>
232-
<_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/>
234+
<_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/>
233235
<MSBuildMajorVersion Include="$(DetectedMSBuildVersion.Replace(`-`, `.`).Split(`.`)[0])" />
234236
<MSBuildMinorVersion Include="$(DetectedMSBuildVersion.Replace(`-`, `.`).Split(`.`)[1])" />
235237
</ItemGroup>
236238

237239
<PropertyGroup>
238240
<PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
239241
<ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
242+
<UseMSBuild16_0_Pack>false</UseMSBuild16_0_Pack>
243+
<UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' ">true</UseMSBuild16_0_Pack>
240244
<UseMSBuild15_9_Pack>false</UseMSBuild15_9_Pack>
241-
<UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' > '15' OR ('@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8') ">true</UseMSBuild15_9_Pack>
245+
<UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8' ">true</UseMSBuild15_9_Pack>
242246
<UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack>
243-
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) ">true</UseMSBuild15_8_Pack>
247+
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseMSBuild15_8_Pack>
244248
<UseNuGet4_Pack>false</UseNuGet4_Pack>
245-
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) ">true</UseNuGet4_Pack>
246-
<AdjustedNuspecOutputPath>$(BaseIntermediateOutputPath)$(Configuration)</AdjustedNuspecOutputPath>
247-
<AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(BaseIntermediateOutputPath)</AdjustedNuspecOutputPath>
249+
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseNuGet4_Pack>
250+
<AdjustedNuspecOutputPath>$(PaketIntermediateOutputPath)\$(Configuration)</AdjustedNuspecOutputPath>
251+
<AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(PaketIntermediateOutputPath)</AdjustedNuspecOutputPath>
248252
</PropertyGroup>
249253

250254
<ItemGroup>
@@ -258,6 +262,53 @@
258262
</ConvertToAbsolutePath>
259263

260264
<!-- Call Pack -->
265+
<PackTask Condition="$(UseMSBuild16_0_Pack)"
266+
PackItem="$(PackProjectInputFile)"
267+
PackageFiles="@(_PackageFiles)"
268+
PackageFilesToExclude="@(_PackageFilesToExclude)"
269+
PackageVersion="$(PackageVersion)"
270+
PackageId="$(PackageId)"
271+
Title="$(Title)"
272+
Authors="$(Authors)"
273+
Description="$(Description)"
274+
Copyright="$(Copyright)"
275+
RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
276+
LicenseUrl="$(PackageLicenseUrl)"
277+
ProjectUrl="$(PackageProjectUrl)"
278+
IconUrl="$(PackageIconUrl)"
279+
ReleaseNotes="$(PackageReleaseNotes)"
280+
Tags="$(PackageTags)"
281+
DevelopmentDependency="$(DevelopmentDependency)"
282+
BuildOutputInPackage="@(_BuildOutputInPackage)"
283+
TargetPathsToSymbols="@(_TargetPathsToSymbols)"
284+
SymbolPackageFormat="symbols.nupkg"
285+
TargetFrameworks="@(_TargetFrameworks)"
286+
AssemblyName="$(AssemblyName)"
287+
PackageOutputPath="$(PackageOutputAbsolutePath)"
288+
IncludeSymbols="$(IncludeSymbols)"
289+
IncludeSource="$(IncludeSource)"
290+
PackageTypes="$(PackageType)"
291+
IsTool="$(IsTool)"
292+
RepositoryUrl="$(RepositoryUrl)"
293+
RepositoryType="$(RepositoryType)"
294+
SourceFiles="@(_SourceFiles->Distinct())"
295+
NoPackageAnalysis="$(NoPackageAnalysis)"
296+
MinClientVersion="$(MinClientVersion)"
297+
Serviceable="$(Serviceable)"
298+
FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
299+
ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
300+
NuspecOutputPath="$(AdjustedNuspecOutputPath)"
301+
IncludeBuildOutput="$(IncludeBuildOutput)"
302+
BuildOutputFolders="$(BuildOutputTargetFolder)"
303+
ContentTargetFolders="$(ContentTargetFolders)"
304+
RestoreOutputPath="$(RestoreOutputAbsolutePath)"
305+
NuspecFile="$(NuspecFileAbsolutePath)"
306+
NuspecBasePath="$(NuspecBasePath)"
307+
NuspecProperties="$(NuspecProperties)"
308+
PackageLicenseFile="$(PackageLicenseFile)"
309+
PackageLicenseExpression="$(PackageLicenseExpression)"
310+
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)" />
311+
261312
<PackTask Condition="$(UseMSBuild15_9_Pack)"
262313
PackItem="$(PackProjectInputFile)"
263314
PackageFiles="@(_PackageFiles)"

‎.vscode/launch.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Core Attach",
9+
"type": "coreclr",
10+
"request": "attach",
11+
"processId": "${command:pickProcess}"
12+
},
13+
{
14+
"name": ".NET Core Launch (console)",
15+
"type": "coreclr",
16+
"request": "launch",
17+
"WARNING01": "*********************************************************************************",
18+
"WARNING02": "The C# extension was unable to automatically to decode projects in the current",
19+
"WARNING03": "workspace to create a runnable lanch.json file. A template launch.json file has",
20+
"WARNING04": "been created as a placeholder.",
21+
"WARNING05": "",
22+
"WARNING06": "If OmniSharp is currently unable to load your project, you can attempt to resolve",
23+
"WARNING07": "this by restoring any missing project dependencies (example: run 'dotnet restore')",
24+
"WARNING08": "and by fixing any reported errors from building the projects in your workspace.",
25+
"WARNING09": "If this allows OmniSharp to now load your project then --",
26+
"WARNING10": " * Delete this file",
27+
"WARNING11": " * Open the Visual Studio Code command palette (View->Command Palette)",
28+
"WARNING12": " * run the command: '.NET: Generate Assets for Build and Debug'.",
29+
"WARNING13": "",
30+
"WARNING14": "If your project requires a more complex launch configuration, you may wish to delete",
31+
"WARNING15": "this configuration and pick a different template using the 'Add Configuration...'",
32+
"WARNING16": "button at the bottom of this file.",
33+
"WARNING17": "*********************************************************************************",
34+
"preLaunchTask": "build",
35+
"program": "${workspaceFolder}/bin/Debug/<insert-target-framework-here>/<insert-project-name-here>.dll",
36+
"args": [],
37+
"cwd": "${workspaceFolder}",
38+
"console": "internalConsole",
39+
"stopAtEntry": false
40+
},
41+
{
42+
"name": ".NET Core Attach",
43+
"type": "coreclr",
44+
"request": "attach",
45+
"processId": "${command:pickProcess}"
46+
}
47+
]
48+
}

‎FSharp.Control.Websockets.sln‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Websockets.T
1313
EndProject
1414
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Websockets.TPL", "src\FSharp.Control.Websockets.TPL\FSharp.Control.Websockets.TPL.fsproj", "{FCCFCDFC-C38F-406E-A956-D8D1D73F45E7}"
1515
EndProject
16+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Control.Websockets.TPL.Tests", "tests\FSharp.Control.Websockets.TPL.Tests\FSharp.Control.Websockets.TPL.Tests.fsproj", "{8E727778-52E1-49F0-A4D2-5A11F8216216}"
17+
EndProject
1618
Global
1719
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1820
Debug|Any CPU = Debug|Any CPU
@@ -62,10 +64,23 @@ Global
6264
{FCCFCDFC-C38F-406E-A956-D8D1D73F45E7}.Release|x64.Build.0 = Release|Any CPU
6365
{FCCFCDFC-C38F-406E-A956-D8D1D73F45E7}.Release|x86.ActiveCfg = Release|Any CPU
6466
{FCCFCDFC-C38F-406E-A956-D8D1D73F45E7}.Release|x86.Build.0 = Release|Any CPU
67+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Debug|x64.ActiveCfg = Debug|Any CPU
70+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Debug|x64.Build.0 = Debug|Any CPU
71+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Debug|x86.ActiveCfg = Debug|Any CPU
72+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Debug|x86.Build.0 = Debug|Any CPU
73+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Release|Any CPU.ActiveCfg = Release|Any CPU
74+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Release|Any CPU.Build.0 = Release|Any CPU
75+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Release|x64.ActiveCfg = Release|Any CPU
76+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Release|x64.Build.0 = Release|Any CPU
77+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Release|x86.ActiveCfg = Release|Any CPU
78+
{8E727778-52E1-49F0-A4D2-5A11F8216216}.Release|x86.Build.0 = Release|Any CPU
6579
EndGlobalSection
6680
GlobalSection(NestedProjects) = preSolution
6781
{5D30E174-2538-47AC-8443-318C8C5DC2C9} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216}
6882
{1CA2E092-2320-451D-A4F0-9ED7C7C528CA} = {ACBEE43C-7A88-4FB1-9B06-DB064D22B29F}
6983
{FCCFCDFC-C38F-406E-A956-D8D1D73F45E7} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216}
84+
{8E727778-52E1-49F0-A4D2-5A11F8216216} = {ACBEE43C-7A88-4FB1-9B06-DB064D22B29F}
7085
EndGlobalSection
7186
EndGlobal

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
MacOS/Linux | Windows
1010
--- | ---
11-
[![Travis Badge](https://travis-ci.org/MyGithubUsername/FSharp.Control.Websockets.svg?branch=master)](https://travis-ci.org/MyGithubUsername/FSharp.Control.Websockets) | [![Build status](https://ci.appveyor.com/api/projects/status/github/MyGithubUsername/FSharp.Control.Websockets?svg=true)](https://ci.appveyor.com/project/MyGithubUsername/FSharp.Control.Websockets)
12-
[![Build History](https://buildstats.info/travisci/chart/MyGithubUsername/FSharp.Control.Websockets)](https://travis-ci.org/MyGithubUsername/FSharp.Control.Websockets/builds) | [![Build History](https://buildstats.info/appveyor/chart/MyGithubUsername/FSharp.Control.Websockets)](https://ci.appveyor.com/project/MyGithubUsername/FSharp.Control.Websockets)
11+
[![Travis Badge](https://travis-ci.org/TheAngryByrd/FSharp.Control.Websockets.svg?branch=master)](https://travis-ci.org/TheAngryByrd/FSharp.Control.Websockets) | [![Build status](https://ci.appveyor.com/api/projects/status/github/TheAngryByrd/fsharp-control-websockets?svg=true)](https://ci.appveyor.com/project/TheAngryByrd/fsharp-control-websockets)
12+
[![Build History](https://buildstats.info/travisci/chart/TheAngryByrd/FSharp.Control.Websockets)](https://travis-ci.org/TheAngryByrd/FSharp.Control.Websockets/builds) | [![Build History](https://buildstats.info/appveyor/chart/TheAngryByrd/fsharp-control-websockets)](https://ci.appveyor.com/project/TheAngryByrd/fsharp-control-websockets)
1313

1414

1515
## Nuget

‎build.fsx‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,17 +139,24 @@ let invokeAsync f = async { f () }
139139

140140
let coverageThresholdPercent = 80
141141

142+
let altCoverArgs proj = [
143+
"/p:AltCover=true"
144+
// sprintf "/p:AltCoverThreshold=%d" coverageThresholdPercent
145+
sprintf "/p:AltCoverLcovReport=%s" "lcov.info"
146+
sprintf "/p:AltCoverAssemblyExcludeFilter=%s" (IO.Path.GetFileNameWithoutExtension(proj))
147+
]
148+
142149
Target.create "DotnetTest" <| fun ctx ->
143150
!! testsGlob
144151
|> Seq.iter (fun proj ->
145152
DotNet.test(fun c ->
146153
let args =
147154
[
148155
"--no-build"
149-
"/p:AltCover=true"
150-
sprintf "/p:AltCoverThreshold=%d" coverageThresholdPercent
151-
sprintf "/p:AltCoverAssemblyExcludeFilter=%s" (IO.Path.GetFileNameWithoutExtension(proj))
152-
] |> String.concat " "
156+
157+
]
158+
@ altCoverArgs proj
159+
|> String.concat " "
153160
{ c with
154161
Configuration = configuration (ctx.Context.AllExecutingTargets)
155162
Common =
@@ -186,11 +193,12 @@ Target.create "GenerateCoverageReport" <| fun _ ->
186193
Target.create "WatchTests" <| fun _ ->
187194
!! testsGlob
188195
|> Seq.map(fun proj -> fun () ->
196+
let args = altCoverArgs proj
189197
dotnet.watch
190198
(fun opt ->
191199
opt |> DotNet.Options.withWorkingDirectory (IO.Path.GetDirectoryName proj))
192200
"test"
193-
""
201+
(args |> String.concat " ")
194202
|> ignore
195203
)
196204
|> Seq.iter (invokeAsync >> Async.Catch >> Async.Ignore >> Async.Start)

‎global.json‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎paket.dependencies‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@ clitool dotnet-sourcelink 2.8.1
66
clitool dotnet-fantomas 2.8.0
77
clitool dotnet-reportgenerator-cli 4.0.0-rc4
88
nuget FSharp.Core 4.3.4
9-
nuget Expecto 8.0.0
9+
nuget Expecto 8.7
1010
nuget SourceLink.Create.CommandLine 2.8.1 copy_local: true
11-
nuget YoloDev.Expecto.TestSdk 0.5.0
11+
nuget YoloDev.Expecto.TestSdk 0.7.0
1212
nuget Microsoft.NET.Test.Sdk 15.7.2
1313
nuget altcover 4.0.603
1414
nuget System.Threading.Tasks.Dataflow
1515
nuget TaskBuilder.fs
16+
nuget Microsoft.AspNetCore.TestHost
17+
nuget Microsoft.AspNetCore.WebSockets
18+
nuget Microsoft.AspNetCore.Server.Kestrel
1619

1720
// [ FAKE GROUP ]
1821
group Build

0 commit comments

Comments
 (0)