Skip to content

Commit a598ab9

Browse files
hafhaf
committed
[infra] bump Expecto
1 parent 9fde112 commit a598ab9

File tree

4 files changed

+115
-44
lines changed

4 files changed

+115
-44
lines changed

‎paket.lock‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
FRAMEWORK: NET46
22
NUGET
33
remote: https://www.nuget.org/api/v2
4+
Argu (3.7)
45
DotLiquid (2.0.64)
6+
Expecto (3.2)
7+
Argu (>= 3.2)
8+
FSharp.Core (>= 3.1.2.5)
9+
Mono.Cecil (>= 0.9.6.4)
510
FSharp.Core (3.1.2.5)
611
Microsoft.AspNet.Razor (3.2.3)
12+
Mono.Cecil (0.9.6.4)
713
openssl.redist (1.0.1.25)
814
RazorEngine (3.9.3)
915
Microsoft.AspNet.Razor (>= 3.0)
@@ -169,18 +175,19 @@ NUGET
169175
Microsoft.CodeAnalysis.CSharp (>= 1.3.2)
170176
System.Threading.Tasks (>= 4.0)
171177
DotLiquid (2.0.64)
172-
Expecto (2.1.1)
178+
Expecto (3.2)
173179
Argu (>= 3.2)
174180
FSharp.Core (>= 3.1.2.5)
175-
Expecto.BenchmarkDotNet (2.1.1)
176-
BenchmarkDotNet (>= 0.10)
177-
Expecto (>= 2.1.1)
181+
Mono.Cecil (>= 0.9.6.4)
182+
Expecto.BenchmarkDotNet (3.2)
183+
BenchmarkDotNet (>= 0.9.9)
184+
Expecto (>= 3.2)
178185
FSharp.Core (>= 3.1.2.5)
179-
Expecto.FsCheck (2.1.1)
180-
Expecto (>= 2.1.1)
186+
Expecto.FsCheck (3.2)
187+
Expecto (>= 3.2)
181188
FsCheck (>= 2.6.2)
182189
FSharp.Core (>= 3.1.2.5)
183-
FsCheck (2.6.2)
190+
FsCheck (2.7)
184191
FSharp.Core (>= 3.1.2.5)
185192
FSharp.Charting (0.90.14)
186193
FSharp.Core (4.0.0.1) - redirects: force
@@ -234,6 +241,7 @@ NUGET
234241
System.Xml.XPath.XDocument (>= 4.0.1)
235242
Microsoft.CodeAnalysis.CSharp (1.3.2)
236243
Microsoft.CodeAnalysis.Common (1.3.2)
244+
Mono.Cecil (0.9.6.4)
237245
System.AppContext (4.3)
238246
System.Collections (4.3)
239247
System.Collections.Concurrent (4.3)
@@ -251,8 +259,8 @@ NUGET
251259
System.Linq (4.3)
252260
System.Linq.Expressions (4.3)
253261
System.Reflection (4.3)
254-
System.Reflection.Metadata (1.4.1)
255-
System.Collections.Immutable (>= 1.3)
262+
System.Reflection.Metadata (1.4.2)
263+
System.Collections.Immutable (>= 1.3.1)
256264
System.Reflection.Primitives (4.3)
257265
System.Resources.ResourceManager (4.3)
258266
System.Runtime (4.3)

‎src/Suave.Testing/Suave.Testing.fsproj‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -125,4 +125,30 @@
125125
</ItemGroup>
126126
</When>
127127
</Choose>
128-
</Project>
128+
<Choose>
129+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
130+
<ItemGroup>
131+
<Reference Include="Mono.Cecil.Mdb">
132+
<HintPath>..\..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
133+
<Private>True</Private>
134+
<Paket>True</Paket>
135+
</Reference>
136+
<Reference Include="Mono.Cecil.Pdb">
137+
<HintPath>..\..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
138+
<Private>True</Private>
139+
<Paket>True</Paket>
140+
</Reference>
141+
<Reference Include="Mono.Cecil.Rocks">
142+
<HintPath>..\..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
143+
<Private>True</Private>
144+
<Paket>True</Paket>
145+
</Reference>
146+
<Reference Include="Mono.Cecil">
147+
<HintPath>..\..\packages\Mono.Cecil\lib\net45\Mono.Cecil.dll</HintPath>
148+
<Private>True</Private>
149+
<Paket>True</Paket>
150+
</Reference>
151+
</ItemGroup>
152+
</When>
153+
</Choose>
154+
</Project>

src/Suave.Tests/FuchuExtensions.fs renamed to src/Suave.Tests/ExpectoExtensions.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ let defaultMainThisAssemblyWithParam param args =
5858
match testFromAssemblyWithParam (Assembly.GetEntryAssembly()) param with
5959
| Some t -> t
6060
| None -> failwith "Found no tests."
61-
61+
6262
let (cfg,_) = ExpectoConfig.fillFromArgs defaultConfig args
63-
runTests cfg tests
63+
runTests cfg tests

‎src/Suave.Tests/Suave.Tests.fsproj‎

Lines changed: 68 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -112,7 +112,7 @@
112112
<Compile Include="WebSocket.fs" />
113113
<Compile Include="Razor.fs" />
114114
<Compile Include="DotLiquid.fs" />
115-
<Compile Include="FuchuExtensions.fs" />
115+
<Compile Include="ExpectoExtensions.fs" />
116116
<Compile Include="Program.fs" />
117117
<None Include="paket.references" />
118118
<None Include="suave.p12">
@@ -265,6 +265,17 @@
265265
</Choose>
266266
<Choose>
267267
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
268+
<ItemGroup>
269+
<Reference Include="Expecto.BenchmarkDotNet">
270+
<HintPath>..\..\packages\tests\Expecto.BenchmarkDotNet\lib\net40\Expecto.BenchmarkDotNet.dll</HintPath>
271+
<Private>True</Private>
272+
<Paket>True</Paket>
273+
</Reference>
274+
</ItemGroup>
275+
</When>
276+
</Choose>
277+
<Choose>
278+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
268279
<ItemGroup>
269280
<Reference Include="Expecto.FsCheck">
270281
<HintPath>..\..\packages\tests\Expecto.FsCheck\lib\net40\Expecto.FsCheck.dll</HintPath>
@@ -363,10 +374,36 @@
363374
</Choose>
364375
<Choose>
365376
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
377+
<ItemGroup>
378+
<Reference Include="Mono.Cecil.Mdb">
379+
<HintPath>..\..\packages\tests\Mono.Cecil\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
380+
<Private>True</Private>
381+
<Paket>True</Paket>
382+
</Reference>
383+
<Reference Include="Mono.Cecil.Pdb">
384+
<HintPath>..\..\packages\tests\Mono.Cecil\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
385+
<Private>True</Private>
386+
<Paket>True</Paket>
387+
</Reference>
388+
<Reference Include="Mono.Cecil.Rocks">
389+
<HintPath>..\..\packages\tests\Mono.Cecil\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
390+
<Private>True</Private>
391+
<Paket>True</Paket>
392+
</Reference>
393+
<Reference Include="Mono.Cecil">
394+
<HintPath>..\..\packages\tests\Mono.Cecil\lib\net45\Mono.Cecil.dll</HintPath>
395+
<Private>True</Private>
396+
<Paket>True</Paket>
397+
</Reference>
398+
</ItemGroup>
399+
</When>
400+
</Choose>
401+
<Choose>
402+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6.1'">
366403
<ItemGroup>
367404
<Reference Include="System.AppContext">
368-
<HintPath>..\..\packages\tests\System.AppContext\ref\net46\System.AppContext.dll</HintPath>
369-
<Private>False</Private>
405+
<HintPath>..\..\packages\tests\System.AppContext\lib\net46\System.AppContext.dll</HintPath>
406+
<Private>True</Private>
370407
<Paket>True</Paket>
371408
</Reference>
372409
</ItemGroup>
@@ -387,8 +424,8 @@
387424
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
388425
<ItemGroup>
389426
<Reference Include="System.Console">
390-
<HintPath>..\..\packages\tests\System.Console\ref\net46\System.Console.dll</HintPath>
391-
<Private>False</Private>
427+
<HintPath>..\..\packages\tests\System.Console\lib\net46\System.Console.dll</HintPath>
428+
<Private>True</Private>
392429
<Paket>True</Paket>
393430
</Reference>
394431
</ItemGroup>
@@ -398,8 +435,8 @@
398435
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
399436
<ItemGroup>
400437
<Reference Include="System.Diagnostics.FileVersionInfo">
401-
<HintPath>..\..\packages\tests\System.Diagnostics.FileVersionInfo\ref\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
402-
<Private>False</Private>
438+
<HintPath>..\..\packages\tests\System.Diagnostics.FileVersionInfo\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
439+
<Private>True</Private>
403440
<Paket>True</Paket>
404441
</Reference>
405442
</ItemGroup>
@@ -409,8 +446,8 @@
409446
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
410447
<ItemGroup>
411448
<Reference Include="System.Diagnostics.StackTrace">
412-
<HintPath>..\..\packages\tests\System.Diagnostics.StackTrace\ref\net46\System.Diagnostics.StackTrace.dll</HintPath>
413-
<Private>False</Private>
449+
<HintPath>..\..\packages\tests\System.Diagnostics.StackTrace\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
450+
<Private>True</Private>
414451
<Paket>True</Paket>
415452
</Reference>
416453
</ItemGroup>
@@ -420,8 +457,8 @@
420457
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
421458
<ItemGroup>
422459
<Reference Include="System.IO.FileSystem">
423-
<HintPath>..\..\packages\tests\System.IO.FileSystem\ref\net46\System.IO.FileSystem.dll</HintPath>
424-
<Private>False</Private>
460+
<HintPath>..\..\packages\tests\System.IO.FileSystem\lib\net46\System.IO.FileSystem.dll</HintPath>
461+
<Private>True</Private>
425462
<Paket>True</Paket>
426463
</Reference>
427464
</ItemGroup>
@@ -431,8 +468,8 @@
431468
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
432469
<ItemGroup>
433470
<Reference Include="System.IO.FileSystem.Primitives">
434-
<HintPath>..\..\packages\tests\System.IO.FileSystem.Primitives\ref\net46\System.IO.FileSystem.Primitives.dll</HintPath>
435-
<Private>False</Private>
471+
<HintPath>..\..\packages\tests\System.IO.FileSystem.Primitives\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
472+
<Private>True</Private>
436473
<Paket>True</Paket>
437474
</Reference>
438475
</ItemGroup>
@@ -473,8 +510,8 @@
473510
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
474511
<ItemGroup>
475512
<Reference Include="System.Security.Cryptography.Encoding">
476-
<HintPath>..\..\packages\tests\System.Security.Cryptography.Encoding\ref\net46\System.Security.Cryptography.Encoding.dll</HintPath>
477-
<Private>False</Private>
513+
<HintPath>..\..\packages\tests\System.Security.Cryptography.Encoding\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
514+
<Private>True</Private>
478515
<Paket>True</Paket>
479516
</Reference>
480517
</ItemGroup>
@@ -484,8 +521,8 @@
484521
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
485522
<ItemGroup>
486523
<Reference Include="System.Security.Cryptography.Primitives">
487-
<HintPath>..\..\packages\tests\System.Security.Cryptography.Primitives\ref\net46\System.Security.Cryptography.Primitives.dll</HintPath>
488-
<Private>False</Private>
524+
<HintPath>..\..\packages\tests\System.Security.Cryptography.Primitives\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
525+
<Private>True</Private>
489526
<Paket>True</Paket>
490527
</Reference>
491528
</ItemGroup>
@@ -506,8 +543,8 @@
506543
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
507544
<ItemGroup>
508545
<Reference Include="System.Text.Encoding.CodePages">
509-
<HintPath>..\..\packages\tests\System.Text.Encoding.CodePages\ref\netstandard1.3\System.Text.Encoding.CodePages.dll</HintPath>
510-
<Private>False</Private>
546+
<HintPath>..\..\packages\tests\System.Text.Encoding.CodePages\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
547+
<Private>True</Private>
511548
<Paket>True</Paket>
512549
</Reference>
513550
</ItemGroup>
@@ -528,8 +565,8 @@
528565
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
529566
<ItemGroup>
530567
<Reference Include="System.Threading.Thread">
531-
<HintPath>..\..\packages\tests\System.Threading.Thread\ref\net46\System.Threading.Thread.dll</HintPath>
532-
<Private>False</Private>
568+
<HintPath>..\..\packages\tests\System.Threading.Thread\lib\net46\System.Threading.Thread.dll</HintPath>
569+
<Private>True</Private>
533570
<Paket>True</Paket>
534571
</Reference>
535572
</ItemGroup>
@@ -539,8 +576,8 @@
539576
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
540577
<ItemGroup>
541578
<Reference Include="System.Xml.ReaderWriter">
542-
<HintPath>..\..\packages\tests\System.Xml.ReaderWriter\ref\net46\System.Xml.ReaderWriter.dll</HintPath>
543-
<Private>False</Private>
579+
<HintPath>..\..\packages\tests\System.Xml.ReaderWriter\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
580+
<Private>True</Private>
544581
<Paket>True</Paket>
545582
</Reference>
546583
</ItemGroup>
@@ -559,8 +596,8 @@
559596
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
560597
<ItemGroup>
561598
<Reference Include="System.Xml.XmlDocument">
562-
<HintPath>..\..\packages\tests\System.Xml.XmlDocument\ref\net46\System.Xml.XmlDocument.dll</HintPath>
563-
<Private>False</Private>
599+
<HintPath>..\..\packages\tests\System.Xml.XmlDocument\lib\net46\System.Xml.XmlDocument.dll</HintPath>
600+
<Private>True</Private>
564601
<Paket>True</Paket>
565602
</Reference>
566603
</ItemGroup>
@@ -570,8 +607,8 @@
570607
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
571608
<ItemGroup>
572609
<Reference Include="System.Xml.XPath">
573-
<HintPath>..\..\packages\tests\System.Xml.XPath\ref\net46\System.Xml.XPath.dll</HintPath>
574-
<Private>False</Private>
610+
<HintPath>..\..\packages\tests\System.Xml.XPath\lib\net46\System.Xml.XPath.dll</HintPath>
611+
<Private>True</Private>
575612
<Paket>True</Paket>
576613
</Reference>
577614
</ItemGroup>
@@ -581,8 +618,8 @@
581618
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
582619
<ItemGroup>
583620
<Reference Include="System.Xml.XPath.XDocument">
584-
<HintPath>..\..\packages\tests\System.Xml.XPath.XDocument\ref\net46\System.Xml.XPath.XDocument.dll</HintPath>
585-
<Private>False</Private>
621+
<HintPath>..\..\packages\tests\System.Xml.XPath.XDocument\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
622+
<Private>True</Private>
586623
<Paket>True</Paket>
587624
</Reference>
588625
</ItemGroup>
@@ -599,4 +636,4 @@
599636
</ItemGroup>
600637
</When>
601638
</Choose>
602-
</Project>
639+
</Project>

0 commit comments

Comments
 (0)