From 1891b5dce5e889ee6bb8929a4c183b7858c61616 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 19 Feb 2017 14:05:38 +1000 Subject: [PATCH 01/43] Expect.equal netstandard compatible --- Expecto/Expect.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Expecto/Expect.fs b/Expecto/Expect.fs index 2d19ff2d..3ed12b55 100644 --- a/Expecto/Expect.fs +++ b/Expecto/Expect.fs @@ -174,8 +174,8 @@ let isNotWhitespace (actual : string) format = let inline equal (actual : 'a) (expected : 'a) format = match box actual, box expected with | (:? string as a), (:? string as e) -> - use ai = a.GetEnumerator() - use ei = e.GetEnumerator() + let ai = a.ToCharArray().GetEnumerator() + let ei = e.ToCharArray().GetEnumerator() let mutable i = 0 let baseMsg errorIndex = let diffString = new String(' ', errorIndex + 1) + "↑" From 1e6d346dbe5c3e974c60c34ef2199976c07e75f7 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 19 Feb 2017 14:06:00 +1000 Subject: [PATCH 02/43] Travis build --- .travis.yml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 806a4717..43b9ac4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,27 @@ --- language: csharp -mono: - - 4.6.1 - - latest # => "stable release" - - weekly # => "latest commits" +matrix: + include: + - os: linux # Ubuntu 14.04 + dist: trusty + sudo: required + dotnet: 1.0.0-preview2-003121 + env: + - CLI_VERSION=1.0.0-rc4-004771 + - os: osx # OSX 10.11 + osx_image: xcode7.3 + dotnet: 1.0.0-preview2-003121 + env: + - CLI_VERSION=1.0.0-rc4-004771 install: - - rvm install 2.2.3 - - gem install bundler - - sudo apt-get update -y + - rvm install 2.2.3 + - gem install bundler + - export DOTNET_INSTALL_DIR="$PWD/.dotnetcli" + - curl -sSL https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR" + - export PATH="$DOTNET_INSTALL_DIR:$PATH" script: - bundle && bundle exec rake - -matrix: - allow_failures: - - mono: latest - - mono: weekly + - ./build.sh From 4d20429558636b9c87bdb86cf7bc27f4b8817bee Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 19 Feb 2017 14:06:13 +1000 Subject: [PATCH 03/43] AppVeyor build --- appveyor.yml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 25b811bd..63ecf40e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,26 +2,24 @@ os: Visual Studio 2015 environment: matrix: - - CLI_VERSION: 1.0.0-preview3-003857 + - CLI_VERSION: 1.0.0-rc4-004771 install: - bundle install - + # .NET Core SDK binaries + - ps: $url = "https://dotnetcli.azureedge.net/dotnet/Sdk/$($env:CLI_VERSION)/dotnet-dev-win-x64.$($env:CLI_VERSION.ToLower()).zip" + # Download .NET Core SDK and add to PATH + - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" + - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null + - ps: $tempFile = [System.IO.Path]::GetTempFileName() + - ps: (New-Object System.Net.WebClient).DownloadFile($url, $tempFile) + - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFile, $env:DOTNET_INSTALL_DIR) + - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" + - dotnet --info + build_script: - bundle exec rake - -# # .NET Core SDK binaries -# - ps: $url = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-win-x64.latest.zip" -# -# # Download .NET Core SDK and add to PATH -# - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" -# - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null -# - ps: $tempFile = [System.IO.Path]::GetTempFileName() -# - ps: (New-Object System.Net.WebClient).DownloadFile($url, $tempFile) -# - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFile, $env:DOTNET_INSTALL_DIR) -# - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" -# - dotnet --info -# - cmd: build.cmd + - cmd: build.cmd # artifacts: # - path: 'bin' From c85ae6d66f19891ff5d492f2c1b0ee1347608e12 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 19 Feb 2017 14:06:35 +1000 Subject: [PATCH 04/43] Fix global.json for rc4-004771 --- global.json | 5 +++++ globals.json | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 global.json delete mode 100644 globals.json diff --git a/global.json b/global.json new file mode 100644 index 00000000..fb8768bb --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "1.0.0-rc4-004771" + } +} \ No newline at end of file diff --git a/globals.json b/globals.json deleted file mode 100644 index 1118bfb9..00000000 --- a/globals.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - // "version": "1.0.0-preview4-004130" - "version": "1.0.0-preview4-004079" - - } -} \ No newline at end of file From 958fe8a45cd5ff7e90f868fec06582badaecff95 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 19 Feb 2017 14:06:54 +1000 Subject: [PATCH 05/43] fsproj for rc4-004771 --- Expecto.netcore/Expecto.netcore.fsproj | 50 ++++++-------------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj index 5ba2f556..21a55614 100644 --- a/Expecto.netcore/Expecto.netcore.fsproj +++ b/Expecto.netcore/Expecto.netcore.fsproj @@ -1,5 +1,5 @@ - - + + Expecto 1.1.2 @@ -7,48 +7,20 @@ netstandard1.6 pdbonly - - $(DefineConstants);RELEASE - + + + - - 1.0.0-alpha-20161104-2 - All - - - 4.0.1.7-alpha - - - 3.3.0 - - - 4.3.0 - - - - - 1.6.1 - - - 1.0.0-alpha-000009 - - - 4.3.0 - - - 1.0.0-alpha-20161104-2 - - - - - 1.0.0-preview2-020000 - + + + + + + - - \ No newline at end of file From 0370de53570f65737ba40b19dc5482b266e026d0 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 20 Feb 2017 06:42:04 +1000 Subject: [PATCH 06/43] Stop running FAKE build steps on CI --- .travis.yml | 4 ++-- Expecto.sln | 9 ++++++--- appveyor.yml | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43b9ac4f..4c80c0b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ ---- +--- language: csharp matrix: @@ -24,4 +24,4 @@ install: script: - bundle && bundle exec rake - - ./build.sh +# - ./build.sh diff --git a/Expecto.sln b/Expecto.sln index 1f1209df..c7164987 100644 --- a/Expecto.sln +++ b/Expecto.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26206.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{3786E131-11FB-4606-AFE0-5E6CDA744DD0}" ProjectSection(SolutionItems) = preProject @@ -18,17 +18,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{1870 ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig .gitignore = .gitignore + .semver = .semver .travis.yml = .travis.yml appveyor.yml = appveyor.yml build.cmd = build.cmd build.fsx = build.fsx build.sh = build.sh + DEVGUIDE.md = DEVGUIDE.md docker-build.sh = docker-build.sh Gemfile = Gemfile - globals.json = globals.json + global.json = global.json paket.dependencies = paket.dependencies Rakefile = Rakefile README.md = README.md + Settings.FSharpLint = Settings.FSharpLint EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5B9D0E5F-378A-4310-B9F3-4ECF67AA5A23}" diff --git a/appveyor.yml b/appveyor.yml index 63ecf40e..1e66c2d6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -os: Visual Studio 2015 +os: Visual Studio 2015 environment: matrix: @@ -19,7 +19,7 @@ install: build_script: - bundle exec rake - - cmd: build.cmd +# - cmd: build.cmd # artifacts: # - path: 'bin' From 283aa712162928bd24864155bb40404d2a3bdca3 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 20 Feb 2017 06:42:34 +1000 Subject: [PATCH 07/43] Compile Expecto.netcore via Rake build --- .travis.yml | 2 +- Rakefile | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c80c0b2..a5cb9790 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ ---- +--- language: csharp matrix: diff --git a/Rakefile b/Rakefile index e7218672..946a22e7 100644 --- a/Rakefile +++ b/Rakefile @@ -43,15 +43,23 @@ task :restore_quick do system 'tools/paket.exe', 'restore', clr_command: true end +task :restore_dotnetcli do + system "dotnet", %W|restore Expecto.netcore/Expecto.netcore.fsproj| +end + desc 'restore all nugets as per the packages.config files' -task :restore => [:paket_bootstrap, :restore_quick, :paket_files] +task :restore => [:paket_bootstrap, :restore_quick, :paket_files, :restore_dotnetcli] desc 'Perform full build' -build :compile => [:versioning, :restore, :assembly_info] do |b| +build :compile => [:versioning, :restore, :assembly_info, :build_dotnetcli] do |b| b.prop 'Configuration', Configuration b.sln = 'Expecto.Tests/Expecto.Tests.fsproj' end +task :build_dotnetcli => [:versioning, :restore_dotnetcli, :assembly_info] do + system "dotnet", %W|build -c #{Configuration} -f netstandard1.6 Expecto.netcore/Expecto.netcore.fsproj| +end + directory 'build/pkg' desc 'package nugets - finds all projects and package them' From 3122e8215cc9b39bd3a2377a5c4041bcd33f5f5e Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 20 Feb 2017 06:51:26 +1000 Subject: [PATCH 08/43] Add a comment about travis dotnet support --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5cb9790..6fe2f110 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ ---- +--- language: csharp matrix: @@ -7,6 +7,9 @@ matrix: dist: trusty sudo: required dotnet: 1.0.0-preview2-003121 + # Note that travis doesn't support dotnet cli rc4 via 'dotnet' yet, + # so we just use the old preview2 support to get things setup + # first, then manually add dotnet CLI RC4 during install. env: - CLI_VERSION=1.0.0-rc4-004771 - os: osx # OSX 10.11 From 6584664f672d1ab31d3606d27c88944910ec6925 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 20 Feb 2017 07:24:25 +1000 Subject: [PATCH 09/43] Reduce netcore errors with #if NETSTANDARD1_6 --- Expecto.netcore/Expecto.netcore.fsproj | 5 +++-- Expecto/Expecto.fs | 21 +++++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj index 21a55614..03907c74 100644 --- a/Expecto.netcore/Expecto.netcore.fsproj +++ b/Expecto.netcore/Expecto.netcore.fsproj @@ -5,9 +5,10 @@ 1.1.2 Library netstandard1.6 - pdbonly + portable + NETSTANDARD1_6;@(DefineConstants) - + diff --git a/Expecto/Expecto.fs b/Expecto/Expecto.fs index ca372a6d..4861460b 100644 --- a/Expecto/Expecto.fs +++ b/Expecto/Expecto.fs @@ -1,4 +1,4 @@ -namespace Expecto +namespace Expecto #nowarn "46" @@ -373,7 +373,6 @@ module Impl = open Expecto.Logging.Message open Helpers open Mono.Cecil - open Mono.Cecil.Rocks let logger = Log.create "Expecto" @@ -614,15 +613,19 @@ module Impl = summary = fun _ summary -> let spirit = +#if !NETSTANDARD1_6 if summary.successful then if Console.OutputEncoding.BodyName = "utf-8" then "ᕙ໒( ˵ ಠ ╭͜ʖ╮ ಠೃ ˵ )७ᕗ" else +#endif "Success!" else +#if !NETSTANDARD1_6 if Console.OutputEncoding.BodyName = "utf-8" then "( ರ Ĺ̯ ರೃ )" else +#endif "" logger.logWithAck Info ( eventX "EXPECTO! {total} tests run in {duration} – {passes} passed, {ignores} ignored, {failures} failed, {errors} errored. {spirit}" @@ -1129,9 +1132,15 @@ module Impl = let asMembers x = Seq.map (fun m -> m :> MemberInfo) x let bindingFlags = BindingFlags.Public ||| BindingFlags.Static fun (t: Type) -> +#if NETSTANDARD1_6 + [ t.GetTypeInfo().GetMethods bindingFlags |> asMembers + t.GetTypeInfo().GetProperties bindingFlags |> asMembers + t.GetTypeInfo().GetFields bindingFlags |> asMembers ] +#else [ t.GetMethods bindingFlags |> asMembers t.GetProperties bindingFlags |> asMembers t.GetFields bindingFlags |> asMembers ] +#endif |> Seq.collect id |> Seq.choose testFromMember |> Seq.toList @@ -1154,7 +1163,11 @@ module Impl = let getFuncTypeToUse (testFunc:unit->unit) (asm:Assembly) = let t = testFunc.GetType() - if t.Assembly.FullName = asm.FullName then +#if NETSTANDARD1_6 + if t.GetTypeInfo().Assembly.FullName = asm.FullName then +#else + if t.GetType().Assembly.FullName = asm.FullName then +#endif t else let nestedFunc = @@ -1188,7 +1201,7 @@ module Impl = let getMethods typeName = match types.TryFind (getEcma335TypeName typeName) with - | Some t -> Some (t.GetMethods()) + | Some t -> Some (t.Methods) | _ -> None let getFirstOrDefaultSequencePoint (m:MethodDefinition) = From 72d6411311aca4943112fd386ad545cc5109beb4 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 20 Feb 2017 07:30:11 +1000 Subject: [PATCH 10/43] Fixup travis file encoding --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6fe2f110..29285caa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ ---- +--- language: csharp matrix: From 5d523163ec5438bf0236983df4ce8cdd8a139191 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Tue, 21 Feb 2017 06:20:18 +1000 Subject: [PATCH 11/43] Introduce `RESHAPED_REFLECTION`, because it's easier to read and more specific than relying on the TFM (NETSTANDARD1_6). --- Expecto.netcore/Expecto.netcore.fsproj | 6 ++++-- Expecto/Expecto.fs | 28 ++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj index 03907c74..8b0b7d08 100644 --- a/Expecto.netcore/Expecto.netcore.fsproj +++ b/Expecto.netcore/Expecto.netcore.fsproj @@ -6,13 +6,15 @@ Library netstandard1.6 portable - NETSTANDARD1_6;@(DefineConstants) + + NETSTANDARD1_6;RESHAPED_REFLECTION;@(DefineConstants) + - + diff --git a/Expecto/Expecto.fs b/Expecto/Expecto.fs index 4861460b..8358e303 100644 --- a/Expecto/Expecto.fs +++ b/Expecto/Expecto.fs @@ -613,8 +613,8 @@ module Impl = summary = fun _ summary -> let spirit = -#if !NETSTANDARD1_6 if summary.successful then +#if !NETSTANDARD1_6 if Console.OutputEncoding.BodyName = "utf-8" then "ᕙ໒( ˵ ಠ ╭͜ʖ╮ ಠೃ ˵ )७ᕗ" else @@ -1132,7 +1132,7 @@ module Impl = let asMembers x = Seq.map (fun m -> m :> MemberInfo) x let bindingFlags = BindingFlags.Public ||| BindingFlags.Static fun (t: Type) -> -#if NETSTANDARD1_6 +#if RESHAPED_REFLECTION [ t.GetTypeInfo().GetMethods bindingFlags |> asMembers t.GetTypeInfo().GetProperties bindingFlags |> asMembers t.GetTypeInfo().GetFields bindingFlags |> asMembers ] @@ -1152,6 +1152,16 @@ module Impl = // might be able to find corresponding source code) is referred to in a field // of the function object. let isFsharpFuncType t = +#if RESHAPED_REFLECTION + let baseType = + let rec findBase (t:Type) = + if t.GetTypeInfo().BaseType = null || t.GetTypeInfo().BaseType = typeof then + t + else + findBase (t.GetTypeInfo().BaseType) + findBase t + baseType.GetTypeInfo().IsGenericType && baseType.GetTypeInfo().GetGenericTypeDefinition() = typedefof> +#else let baseType = let rec findBase (t:Type) = if t.BaseType = null || t.BaseType = typeof then @@ -1160,10 +1170,11 @@ module Impl = findBase t.BaseType findBase t baseType.IsGenericType && baseType.GetGenericTypeDefinition() = typedefof> +#endif let getFuncTypeToUse (testFunc:unit->unit) (asm:Assembly) = let t = testFunc.GetType() -#if NETSTANDARD1_6 +#if RESHAPED_REFLECTION if t.GetTypeInfo().Assembly.FullName = asm.FullName then #else if t.GetType().Assembly.FullName = asm.FullName then @@ -1171,7 +1182,11 @@ module Impl = t else let nestedFunc = +#if RESHAPED_REFLECTION + t.GetTypeInfo().GetFields() +#else t.GetFields() +#endif |> Seq.tryFind (fun f -> isFsharpFuncType f.FieldType) match nestedFunc with | Some f -> f.GetValue(testFunc).GetType() @@ -1181,7 +1196,12 @@ module Impl = match testCode with | Sync test -> let t = getFuncTypeToUse test asm - let m = t.GetMethods () |> Seq.find (fun m -> (m.Name = "Invoke") && (m.DeclaringType = t)) +#if RESHAPED_REFLECTION + let m = t.GetTypeInfo().GetMethods() +#else + let m = t.GetMethods () +#endif + |> Seq.find (fun m -> (m.Name = "Invoke") && (m.DeclaringType = t)) (t.FullName, m.Name) | Async _ | AsyncFsCheck _ -> ("Unknown Async", "Unknown Async") From 6e176aad9e399bc046e5f982f629bca812d750c5 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Tue, 21 Feb 2017 07:10:24 +1000 Subject: [PATCH 12/43] More fixes --- Expecto.netcore/Expecto.netcore.fsproj | 6 +++++- Expecto/Expecto.fs | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj index 8b0b7d08..c06dd83d 100644 --- a/Expecto.netcore/Expecto.netcore.fsproj +++ b/Expecto.netcore/Expecto.netcore.fsproj @@ -19,11 +19,15 @@ - + + + + + \ No newline at end of file diff --git a/Expecto/Expecto.fs b/Expecto/Expecto.fs index 8358e303..93b969e6 100644 --- a/Expecto/Expecto.fs +++ b/Expecto/Expecto.fs @@ -164,8 +164,8 @@ module internal Helpers = member m.MatchTestsAttributes () = m.GetCustomAttributes true - |> Array.map (fun t -> t.GetType().FullName) - |> Set.ofArray + |> Seq.map (fun t -> t.GetType().FullName) + |> Set.ofSeq |> Set.intersect allTestAttributes |> Set.toList |> List.choose matchFocusAttributes @@ -1440,7 +1440,11 @@ module Tests = module ExpectoConfig = let expectoVersion() = +#if RESHAPED_REFLECTION + let assembly = typeof.GetTypeInfo().Assembly +#else let assembly = Assembly.GetExecutingAssembly() +#endif let fileInfoVersion = FileVersionInfo.GetVersionInfo assembly.Location fileInfoVersion.ProductVersion From f3930ef7fdf52240dc848965af65bdcc2dc35a89 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Tue, 21 Feb 2017 21:54:55 +1000 Subject: [PATCH 13/43] Upgrade Mono.Cecil, fix build errors --- Expecto.Tests/Expecto.Tests.fsproj | 2 +- Expecto/Expecto.fs | 11 ++-- Expecto/Expecto.fsproj | 81 ------------------------------ paket.dependencies | 4 +- paket.lock | 2 +- 5 files changed, 11 insertions(+), 89 deletions(-) diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj index a0c35784..87af4f27 100644 --- a/Expecto.Tests/Expecto.Tests.fsproj +++ b/Expecto.Tests/Expecto.Tests.fsproj @@ -23,7 +23,7 @@ 3 AnyCPU bin\Debug\Expecto.Tests.xml - --stress 1 + --filter performance pdbonly diff --git a/Expecto/Expecto.fs b/Expecto/Expecto.fs index 93b969e6..41a458ed 100644 --- a/Expecto/Expecto.fs +++ b/Expecto/Expecto.fs @@ -373,7 +373,7 @@ module Impl = open Expecto.Logging.Message open Helpers open Mono.Cecil - + let logger = Log.create "Expecto" type TestResult = @@ -1177,7 +1177,7 @@ module Impl = #if RESHAPED_REFLECTION if t.GetTypeInfo().Assembly.FullName = asm.FullName then #else - if t.GetType().Assembly.FullName = asm.FullName then + if t.Assembly.FullName = asm.FullName then #endif t else @@ -1226,8 +1226,11 @@ module Impl = let getFirstOrDefaultSequencePoint (m:MethodDefinition) = m.Body.Instructions - |> Seq.tryFind (fun i -> (i.SequencePoint <> null && i.SequencePoint.StartLine <> lineNumberIndicatingHiddenLine)) - |> Option.map (fun i -> i.SequencePoint) + |> Seq.tryPick (fun i -> + let sp = m.DebugInformation.GetSequencePoint i + if sp <> null && sp.StartLine <> lineNumberIndicatingHiddenLine then + Some sp else None) + |> Option.map (fun maybeSequencePoint -> maybeSequencePoint) match getMethods className with | None -> SourceLocation.empty diff --git a/Expecto/Expecto.fsproj b/Expecto/Expecto.fsproj index acdc42b9..64f6df24 100644 --- a/Expecto/Expecto.fsproj +++ b/Expecto/Expecto.fsproj @@ -151,49 +151,6 @@ - - - - ..\packages\Mono.Cecil\lib\net20\Mono.Cecil.Mdb.dll - True - True - - - ..\packages\Mono.Cecil\lib\net20\Mono.Cecil.Pdb.dll - True - True - - - ..\packages\Mono.Cecil\lib\net20\Mono.Cecil.dll - True - True - - - - - - - ..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Mdb.dll - True - True - - - ..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Pdb.dll - True - True - - - ..\packages\Mono.Cecil\lib\net35\Mono.Cecil.Rocks.dll - True - True - - - ..\packages\Mono.Cecil\lib\net35\Mono.Cecil.dll - True - True - - - @@ -218,43 +175,5 @@ - - - - ..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Mdb.dll - True - True - - - ..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Pdb.dll - True - True - - - ..\packages\Mono.Cecil\lib\net45\Mono.Cecil.Rocks.dll - True - True - - - ..\packages\Mono.Cecil\lib\net45\Mono.Cecil.dll - True - True - - - - - - - ..\packages\Mono.Cecil\lib\sl5\Mono.Cecil.Rocks.dll - True - True - - - ..\packages\Mono.Cecil\lib\sl5\Mono.Cecil.dll - True - True - - - \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 954503f0..5e811f44 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,4 +1,4 @@ -source https://nuget.org/api/v2 +source https://nuget.org/api/v2 source https://dotnet.myget.org/F/dotnet-core source https://www.myget.org/F/fsharp-daily source https://www.myget.org/F/netcorecli-fsc-preview3 @@ -13,7 +13,7 @@ nuget BenchmarkDotNet = 0.9.9 nuget BenchmarkDotNet.Toolchains.Roslyn = 0.9.9 nuget BenchmarkDotNet.Core = 0.9.9 nuget NuGet.CommandLine -nuget Mono.Cecil +nuget Mono.Cecil = 0.10.0-beta2 framework: net40 group build source https://www.nuget.org/api/v2 diff --git a/paket.lock b/paket.lock index 6bb48f84..e58214b8 100644 --- a/paket.lock +++ b/paket.lock @@ -121,7 +121,7 @@ NUGET System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 System.Runtime.Handles (>= 4.3) - framework: >= netstandard13 System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard13 - Mono.Cecil (0.9.6.4) + Mono.Cecil (0.10.0-beta2) - framework: net40 NuGet.CommandLine (3.5) runtime.native.System (4.3) - framework: >= netstandard15 Microsoft.NETCore.Platforms (>= 1.1) From 7014fe7eaadf7932cef2902d94a6480e8affb2ce Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Fri, 24 Feb 2017 06:44:22 +1000 Subject: [PATCH 14/43] create_nugets_dotnetcli, verbose build --- Expecto.netcore/Expecto.netcore.fsproj | 7 +++---- Rakefile | 11 +++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj index c06dd83d..145738f7 100644 --- a/Expecto.netcore/Expecto.netcore.fsproj +++ b/Expecto.netcore/Expecto.netcore.fsproj @@ -2,12 +2,11 @@ Expecto - 1.1.2 - Library netstandard1.6 - portable - NETSTANDARD1_6;RESHAPED_REFLECTION;@(DefineConstants) + NETSTANDARD1_6; + RESHAPED_REFLECTION; + @(DefineConstants); diff --git a/Rakefile b/Rakefile index 946a22e7..83dc9420 100644 --- a/Rakefile +++ b/Rakefile @@ -57,13 +57,20 @@ build :compile => [:versioning, :restore, :assembly_info, :build_dotnetcli] do | end task :build_dotnetcli => [:versioning, :restore_dotnetcli, :assembly_info] do - system "dotnet", %W|build -c #{Configuration} -f netstandard1.6 Expecto.netcore/Expecto.netcore.fsproj| + system "dotnet", %W|build -v n -c #{Configuration} -f netstandard1.6 Expecto.netcore/Expecto.netcore.fsproj| end +directory 'build/clipkg' directory 'build/pkg' + +task :create_nugets_dotnetcli => ['build/clipkg', :build_dotnetcli] do + system "dotnet", %W|pack -v n --no-build -c #{Configuration} -o build/clipkg /p:Version=#{ENV['NUGET_VERSION']} Expecto.netcore/Expecto.netcore.fsproj| +end + + desc 'package nugets - finds all projects and package them' -nugets_pack :create_nugets => ['build/pkg', :versioning, :compile] do |p| +nugets_pack :create_nugets => ['build/pkg', :versioning, :compile, :create_nugets_dotnetcli] do |p| p.configuration = Configuration p.files = FileList['*/*.{csproj,fsproj,nuspec}']. exclude(/Tests|Sample|netcore/) From 35233e7e61e5688df7899396575dd178aa76c0d3 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 25 Feb 2017 08:07:55 +1000 Subject: [PATCH 15/43] Undo UTF8 BOM file encoding --- Expecto/Expecto.fs | 2 +- paket.dependencies | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Expecto/Expecto.fs b/Expecto/Expecto.fs index 41a458ed..acb53031 100644 --- a/Expecto/Expecto.fs +++ b/Expecto/Expecto.fs @@ -1,4 +1,4 @@ -namespace Expecto +namespace Expecto #nowarn "46" diff --git a/paket.dependencies b/paket.dependencies index 5e811f44..928a72ea 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,4 +1,4 @@ -source https://nuget.org/api/v2 +source https://nuget.org/api/v2 source https://dotnet.myget.org/F/dotnet-core source https://www.myget.org/F/fsharp-daily source https://www.myget.org/F/netcorecli-fsc-preview3 From 9b1b7a3a9419f49e701e8b382f266f2a610efff8 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 25 Feb 2017 08:08:07 +1000 Subject: [PATCH 16/43] Undo test start argument changes --- Expecto.Tests/Expecto.Tests.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj index 87af4f27..a0c35784 100644 --- a/Expecto.Tests/Expecto.Tests.fsproj +++ b/Expecto.Tests/Expecto.Tests.fsproj @@ -23,7 +23,7 @@ 3 AnyCPU bin\Debug\Expecto.Tests.xml - --filter performance + --stress 1 pdbonly From 102d34f92f600a35bc09735ec3eba13ea22da16c Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 25 Feb 2017 08:40:02 +1000 Subject: [PATCH 17/43] Enable detecting console UTF-8 again --- Expecto/Expecto.fs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Expecto/Expecto.fs b/Expecto/Expecto.fs index acb53031..929f25ae 100644 --- a/Expecto/Expecto.fs +++ b/Expecto/Expecto.fs @@ -614,18 +614,14 @@ module Impl = summary = fun _ summary -> let spirit = if summary.successful then -#if !NETSTANDARD1_6 - if Console.OutputEncoding.BodyName = "utf-8" then + if Console.OutputEncoding.WebName = "utf-8" then "ᕙ໒( ˵ ಠ ╭͜ʖ╮ ಠೃ ˵ )७ᕗ" else -#endif "Success!" else -#if !NETSTANDARD1_6 - if Console.OutputEncoding.BodyName = "utf-8" then + if Console.OutputEncoding.WebName = "utf-8" then "( ರ Ĺ̯ ರೃ )" else -#endif "" logger.logWithAck Info ( eventX "EXPECTO! {total} tests run in {duration} – {passes} passed, {ignores} ignored, {failures} failed, {errors} errored. {spirit}" From d763e20638b0b5ee7256f113a9b69c1cc0397223 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 25 Feb 2017 08:55:24 +1000 Subject: [PATCH 18/43] Remove intellisense hack, because it is no longer required to get code completion working in VS Code. Visual Studio never worked, so that doesn't matter. The `NETSTANDARD1_6` define is no longer used anywhere either, and it's also implicity defined by the newer F# SDKs (https://github.com/dotnet/netcorecli-fsc/pull/77). --- Expecto.netcore/Expecto.netcore.fsproj | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj index 145738f7..d9443620 100644 --- a/Expecto.netcore/Expecto.netcore.fsproj +++ b/Expecto.netcore/Expecto.netcore.fsproj @@ -4,7 +4,6 @@ Expecto netstandard1.6 - NETSTANDARD1_6; RESHAPED_REFLECTION; @(DefineConstants); @@ -18,11 +17,9 @@ - - - - + + From ce2bee9823e2b2d2705e9c586a9cd8385bfd89b1 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 25 Feb 2017 19:01:22 +1000 Subject: [PATCH 19/43] 5.0.0-beta / Target >= net45 --- .semver | 6 +- .../Expecto.BenchmarkDotNet.fsproj | 913 +---------- Expecto.FsCheck/Expecto.FsCheck.fsproj | 85 +- Expecto.Sample/Expecto.Sample.fsproj | 56 +- Expecto.Tests/Expecto.Tests.fsproj | 1353 +++-------------- Expecto/Expecto.fsproj | 293 ++-- paket.dependencies | 19 +- paket.lock | 428 +----- 8 files changed, 384 insertions(+), 2769 deletions(-) diff --git a/.semver b/.semver index f51478e3..809da96d 100644 --- a/.semver +++ b/.semver @@ -1,6 +1,6 @@ --- -:major: 4 +:major: 5 :minor: 0 -:patch: 3 -:special: '' +:patch: 0 +:special: 'beta' :metadata: '' diff --git a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj index a884be79..ebee1512 100644 --- a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj +++ b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj @@ -63,7 +63,7 @@ - + ..\packages\BenchmarkDotNet\lib\net45\BenchmarkDotNet.dll @@ -72,18 +72,9 @@ - - - - ..\packages\BenchmarkDotNet\lib\netstandard1.5\BenchmarkDotNet.dll - True - True - - - - + ..\packages\BenchmarkDotNet.Core\lib\net45\BenchmarkDotNet.Core.dll @@ -98,18 +89,9 @@ - - - - ..\packages\BenchmarkDotNet.Core\lib\netstandard1.5\BenchmarkDotNet.Core.dll - True - True - - - - + ..\packages\BenchmarkDotNet.Toolchains.Roslyn\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll @@ -120,16 +102,7 @@ - - - - ..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - + ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -138,54 +111,9 @@ - - - - ..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - + ..\packages\Microsoft.CodeAnalysis.Common\lib\net45\Microsoft.CodeAnalysis.dll @@ -196,7 +124,7 @@ - + ..\packages\Microsoft.CodeAnalysis.CSharp\lib\net45\Microsoft.CodeAnalysis.CSharp.dll @@ -207,91 +135,7 @@ - - - - ..\packages\Microsoft.CSharp\ref\netstandard1.0\Microsoft.CSharp.dll - False - True - - - - - - - - - ..\packages\Microsoft.DotNet.InternalAbstractions\lib\netstandard1.3\Microsoft.DotNet.InternalAbstractions.dll - True - True - - - - - - - - - ..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll - False - True - - - - - - - - - ..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll - False - True - - - - - - - - - ..\packages\System.AppContext\ref\net46\System.AppContext.dll - False - True - - - - - - - ..\packages\System.AppContext\ref\net463\System.AppContext.dll - False - True - - - - - - - ..\packages\System.AppContext\ref\netstandard1.3\System.AppContext.dll - False - True - - - - - - - - - ..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - + ..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll @@ -302,626 +146,18 @@ - - - - ..\packages\System.Console\ref\net46\System.Console.dll - False - True - - - - - - - ..\packages\System.Console\ref\netstandard1.3\System.Console.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - + - - ..\packages\System.Diagnostics.FileVersionInfo\ref\net46\System.Diagnostics.FileVersionInfo.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.StackTrace\ref\net46\System.Diagnostics.StackTrace.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll - False - True - - - - - - - - - ..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll - False - True - - - - - - - - - ..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\packages\System.IO\ref\net462\System.IO.dll - False - True - - - - - - - ..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\packages\System.IO.FileSystem\ref\net46\System.IO.FileSystem.dll - False - True - - - - - - - ..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll - False - True - - - - - - - - - ..\packages\System.IO.FileSystem.Primitives\ref\net46\System.IO.FileSystem.Primitives.dll - False - True - - - - - - - ..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll - False - True - - - - - - - - - ..\packages\System.Linq\ref\net463\System.Linq.dll - False - True - - - - - - - ..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\packages\System.Linq.Expressions\ref\net463\System.Linq.Expressions.dll - False - True - - - - - - - ..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll - False - True - - - - - - - ..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll - False - True - - - - - - - - - ..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll - False - True - - - - - - - - - ..\packages\System.Reflection\ref\net462\System.Reflection.dll - False - True - - - - - - - ..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False + + ..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll + True True - - - - ..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\packages\System.Reflection.TypeExtensions\ref\net46\System.Reflection.TypeExtensions.dll - False - True - - - - - - - ..\packages\System.Reflection.TypeExtensions\ref\net462\System.Reflection.TypeExtensions.dll - False - True - - - - - - - ..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll - False - True - - - - - - - - - ..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - True - - - - - - - ..\packages\System.Runtime\ref\net462\System.Runtime.dll - False - True - - - True - - - - - - - ..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\packages\System.Runtime.Extensions\ref\net462\System.Runtime.Extensions.dll - False - True - - - - - - - ..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\packages\System.Runtime.InteropServices\ref\net462\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\packages\System.Runtime.InteropServices\ref\net463\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll - False - True - - - - - - - - - ..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.3\System.Runtime.Serialization.Primitives.dll - False - True - - - - - - - - - ..\packages\System.Security.Cryptography.Algorithms\ref\net46\System.Security.Cryptography.Algorithms.dll - False - True - - - - - - - ..\packages\System.Security.Cryptography.Algorithms\ref\net461\System.Security.Cryptography.Algorithms.dll - False - True - - - - - - - ..\packages\System.Security.Cryptography.Algorithms\ref\net463\System.Security.Cryptography.Algorithms.dll - False - True - - - - - - - - - ..\packages\System.Security.Cryptography.Encoding\ref\net46\System.Security.Cryptography.Encoding.dll - False - True - - - - - - - - - ..\packages\System.Security.Cryptography.Primitives\ref\net46\System.Security.Cryptography.Primitives.dll - False - True - - - - - - - - - ..\packages\System.Security.Cryptography.X509Certificates\ref\net46\System.Security.Cryptography.X509Certificates.dll - False - True - - - - - - - ..\packages\System.Security.Cryptography.X509Certificates\ref\net461\System.Security.Cryptography.X509Certificates.dll - False - True - - - - - - - - - ..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\packages\System.Text.Encoding.CodePages\ref\netstandard1.3\System.Text.Encoding.CodePages.dll - False - True - - - - - - - - - ..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\packages\System.Text.RegularExpressions\ref\net463\System.Text.RegularExpressions.dll - False - True - - - - - - - ..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.dll - False - True - - - - - - - ..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll - False - True - - - - - - - - - ..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - - - - + ..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -931,129 +167,4 @@ - - - - - ..\packages\System.Threading.Thread\ref\net46\System.Threading.Thread.dll - False - True - - - - - - - ..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll - False - True - - - - - - - - - ..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll - False - True - - - - - - - - - ..\packages\System.Xml.ReaderWriter\ref\net46\System.Xml.ReaderWriter.dll - False - True - - - - - - - ..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll - False - True - - - - - - - - - True - - - - - - - - - ..\packages\System.Xml.XmlDocument\ref\net46\System.Xml.XmlDocument.dll - False - True - - - - - - - ..\packages\System.Xml.XmlDocument\ref\netstandard1.3\System.Xml.XmlDocument.dll - False - True - - - - - - - - - ..\packages\System.Xml.XPath\ref\net46\System.Xml.XPath.dll - False - True - - - - - - - ..\packages\System.Xml.XPath\ref\netstandard1.3\System.Xml.XPath.dll - False - True - - - - - - - - - ..\packages\System.Xml.XPath.XDocument\ref\net46\System.Xml.XPath.XDocument.dll - False - True - - - - - - - - - ..\packages\System.Xml.XPath.XmlDocument\ref\netstandard1.3\System.Xml.XPath.XmlDocument.dll - False - True - - - True - - - - \ No newline at end of file diff --git a/Expecto.FsCheck/Expecto.FsCheck.fsproj b/Expecto.FsCheck/Expecto.FsCheck.fsproj index bca535bb..14f5ff2c 100644 --- a/Expecto.FsCheck/Expecto.FsCheck.fsproj +++ b/Expecto.FsCheck/Expecto.FsCheck.fsproj @@ -67,7 +67,7 @@ - + ..\packages\FsCheck\lib\net45\FsCheck.dll @@ -76,45 +76,9 @@ - - - - ..\packages\FsCheck\lib\portable-net45+netcore45\FsCheck.dll - True - True - - - - - - - ..\packages\FsCheck\lib\portable-net45+netcore45+wp8\FsCheck.dll - True - True - - - - - - - ..\packages\FsCheck\lib\portable-net45+netcore45+wpa81+wp8\FsCheck.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - + ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -123,50 +87,5 @@ - - - - ..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - \ No newline at end of file diff --git a/Expecto.Sample/Expecto.Sample.fsproj b/Expecto.Sample/Expecto.Sample.fsproj index 533ab2bd..cbc99e3f 100644 --- a/Expecto.Sample/Expecto.Sample.fsproj +++ b/Expecto.Sample/Expecto.Sample.fsproj @@ -73,16 +73,7 @@ - - - - ..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - + ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -91,50 +82,5 @@ - - - - ..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - \ No newline at end of file diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj index a0c35784..89ee48cf 100644 --- a/Expecto.Tests/Expecto.Tests.fsproj +++ b/Expecto.Tests/Expecto.Tests.fsproj @@ -1,1140 +1,215 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {4182e778-f6c2-4ba4-bfc7-19db54890e18} - Exe - Expecto.Tests - Expecto.Tests - v4.5 - Expecto.Tests - true - - - true - full - false - false - bin\Debug\ - DEBUG;TRACE - 3 - AnyCPU - bin\Debug\Expecto.Tests.xml - --stress 1 - - - pdbonly - true - true - bin\Release\ - TRACE - 3 - AnyCPU - bin\Release\Expecto.Tests.xml - - - 11 - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - - - - - - - - - - - - - - - - Expecto.FsCheck - {58507646-335a-460e-b283-77a2baf0d3a8} - True - - - Expecto.BenchmarkDotNet - {0acabeaa-29bd-4f9f-89db-0d03b5afc952} - True - - - Expecto - {c0d55728-10a9-4a7a-9df9-d2f21f663ac2} - True - - - - - - - - - ..\packages\BenchmarkDotNet\lib\net45\BenchmarkDotNet.dll - True - True - - - - - - - ..\packages\BenchmarkDotNet\lib\netstandard1.5\BenchmarkDotNet.dll - True - True - - - - - - - - - ..\packages\BenchmarkDotNet.Core\lib\net45\BenchmarkDotNet.Core.dll - True - True - - - True - - - True - - - - - - - ..\packages\BenchmarkDotNet.Core\lib\netstandard1.5\BenchmarkDotNet.Core.dll - True - True - - - - - - - - - ..\packages\BenchmarkDotNet.Toolchains.Roslyn\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll - True - True - - - - - - - - - ..\packages\FsCheck\lib\net45\FsCheck.dll - True - True - - - - - - - ..\packages\FsCheck\lib\portable-net45+netcore45\FsCheck.dll - True - True - - - - - - - ..\packages\FsCheck\lib\portable-net45+netcore45+wp8\FsCheck.dll - True - True - - - - - - - ..\packages\FsCheck\lib\portable-net45+netcore45+wpa81+wp8\FsCheck.dll - True - True - - - - - - - - - ..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - - - ..\packages\FSharpx.Core\lib\35\FSharpx.Core.dll - True - True - - - - - - - ..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll - True - True - - - - - - - - - ..\packages\Microsoft.CodeAnalysis.Common\lib\net45\Microsoft.CodeAnalysis.dll - True - True - - - - - - - - - ..\packages\Microsoft.CodeAnalysis.CSharp\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - True - - - - - - - - - ..\packages\Microsoft.CSharp\ref\netstandard1.0\Microsoft.CSharp.dll - False - True - - - - - - - - - ..\packages\Microsoft.DotNet.InternalAbstractions\lib\netstandard1.3\Microsoft.DotNet.InternalAbstractions.dll - True - True - - - - - - - - - ..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll - False - True - - - - - - - - - ..\packages\Microsoft.Win32.Registry\ref\netstandard1.3\Microsoft.Win32.Registry.dll - False - True - - - - - - - - - ..\packages\System.AppContext\ref\net46\System.AppContext.dll - False - True - - - - - - - ..\packages\System.AppContext\ref\net463\System.AppContext.dll - False - True - - - - - - - ..\packages\System.AppContext\ref\netstandard1.3\System.AppContext.dll - False - True - - - - - - - - - ..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - False - True - - - - - - - - - ..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll - True - True - - - - - - - - - ..\packages\System.Console\ref\net46\System.Console.dll - False - True - - - - - - - ..\packages\System.Console\ref\netstandard1.3\System.Console.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.FileVersionInfo\ref\net46\System.Diagnostics.FileVersionInfo.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.Process\ref\netstandard1.4\System.Diagnostics.Process.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.StackTrace\ref\net46\System.Diagnostics.StackTrace.dll - False - True - - - - - - - - - ..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll - False - True - - - - - - - - - ..\packages\System.Dynamic.Runtime\ref\netstandard1.3\System.Dynamic.Runtime.dll - False - True - - - - - - - - - ..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - False - True - - - - - - - - - ..\packages\System.IO\ref\net462\System.IO.dll - False - True - - - - - - - ..\packages\System.IO\ref\netstandard1.5\System.IO.dll - False - True - - - - - - - - - ..\packages\System.IO.FileSystem\ref\net46\System.IO.FileSystem.dll - False - True - - - - - - - ..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll - False - True - - - - - - - - - ..\packages\System.IO.FileSystem.Primitives\ref\net46\System.IO.FileSystem.Primitives.dll - False - True - - - - - - - ..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll - False - True - - - - - - - - - ..\packages\System.Linq\ref\net463\System.Linq.dll - False - True - - - - - - - ..\packages\System.Linq\ref\netstandard1.0\System.Linq.dll - False - True - - - - - - - ..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - False - True - - - - - - - - - ..\packages\System.Linq.Expressions\ref\net463\System.Linq.Expressions.dll - False - True - - - - - - - ..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.dll - False - True - - - - - - - ..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll - False - True - - - - - - - - - ..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll - False - True - - - - - - - - - ..\packages\System.Reflection\ref\net462\System.Reflection.dll - False - True - - - - - - - ..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - False - True - - - - - - - - - ..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll - True - True - - - - - - - - - ..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - False - True - - - - - - - - - ..\packages\System.Reflection.TypeExtensions\ref\net46\System.Reflection.TypeExtensions.dll - False - True - - - - - - - ..\packages\System.Reflection.TypeExtensions\ref\net462\System.Reflection.TypeExtensions.dll - False - True - - - - - - - ..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll - False - True - - - - - - - - - ..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - False - True - - - - - - - - - True - - - - - - - ..\packages\System.Runtime\ref\net462\System.Runtime.dll - False - True - - - True - - - - - - - ..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - False - True - - - - - - - - - ..\packages\System.Runtime.Extensions\ref\net462\System.Runtime.Extensions.dll - False - True - - - - - - - ..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - False - True - - - - - - - - - ..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - False - True - - - - - - - - - ..\packages\System.Runtime.InteropServices\ref\net462\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\packages\System.Runtime.InteropServices\ref\net463\System.Runtime.InteropServices.dll - False - True - - - - - - - ..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - False - True - - - - - - - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll - False - True - - - - - - - - - ..\packages\System.Runtime.Serialization.Primitives\ref\netstandard1.3\System.Runtime.Serialization.Primitives.dll - False - True - - - - - - - - - ..\packages\System.Security.Cryptography.Algorithms\ref\net46\System.Security.Cryptography.Algorithms.dll - False - True - - - - - - - ..\packages\System.Security.Cryptography.Algorithms\ref\net461\System.Security.Cryptography.Algorithms.dll - False - True - - - - - - - ..\packages\System.Security.Cryptography.Algorithms\ref\net463\System.Security.Cryptography.Algorithms.dll - False - True - - - - - - - - - ..\packages\System.Security.Cryptography.Encoding\ref\net46\System.Security.Cryptography.Encoding.dll - False - True - - - - - - - - - ..\packages\System.Security.Cryptography.Primitives\ref\net46\System.Security.Cryptography.Primitives.dll - False - True - - - - - - - - - ..\packages\System.Security.Cryptography.X509Certificates\ref\net46\System.Security.Cryptography.X509Certificates.dll - False - True - - - - - - - ..\packages\System.Security.Cryptography.X509Certificates\ref\net461\System.Security.Cryptography.X509Certificates.dll - False - True - - - - - - - - - ..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - False - True - - - - - - - - - ..\packages\System.Text.Encoding.CodePages\ref\netstandard1.3\System.Text.Encoding.CodePages.dll - False - True - - - - - - - - - ..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - False - True - - - - - - - - - ..\packages\System.Text.RegularExpressions\ref\net463\System.Text.RegularExpressions.dll - False - True - - - - - - - ..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.dll - False - True - - - - - - - ..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll - False - True - - - - - - - - - ..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - False - True - - - - - - - - - ..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - False - True - - - - - - - - - ..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll - True - True - - - - - - - - - ..\packages\System.Threading.Thread\ref\net46\System.Threading.Thread.dll - False - True - - - - - - - ..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll - False - True - - - - - - - - - ..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll - False - True - - - - - - - - - ..\packages\System.Xml.ReaderWriter\ref\net46\System.Xml.ReaderWriter.dll - False - True - - - - - - - ..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll - False - True - - - - - - - - - True - - - - - - - - - ..\packages\System.Xml.XmlDocument\ref\net46\System.Xml.XmlDocument.dll - False - True - - - - - - - ..\packages\System.Xml.XmlDocument\ref\netstandard1.3\System.Xml.XmlDocument.dll - False - True - - - - - - - - - ..\packages\System.Xml.XPath\ref\net46\System.Xml.XPath.dll - False - True - - - - - - - ..\packages\System.Xml.XPath\ref\netstandard1.3\System.Xml.XPath.dll - False - True - - - - - - - - - ..\packages\System.Xml.XPath.XDocument\ref\net46\System.Xml.XPath.XDocument.dll - False - True - - - - - - - - - ..\packages\System.Xml.XPath.XmlDocument\ref\netstandard1.3\System.Xml.XPath.XmlDocument.dll - False - True - - - True - - - - + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {4182e778-f6c2-4ba4-bfc7-19db54890e18} + Exe + Expecto.Tests + Expecto.Tests + v4.5 + Expecto.Tests + true + + + true + full + false + false + bin\Debug\ + DEBUG;TRACE + 3 + AnyCPU + bin\Debug\Expecto.Tests.xml + --stress 1 + + + pdbonly + true + true + bin\Release\ + TRACE + 3 + AnyCPU + bin\Release\Expecto.Tests.xml + + + 11 + + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + + + + + + + + + + + + + + + + + + + Expecto.FsCheck + {58507646-335a-460e-b283-77a2baf0d3a8} + True + + + Expecto.BenchmarkDotNet + {0acabeaa-29bd-4f9f-89db-0d03b5afc952} + True + + + Expecto + {c0d55728-10a9-4a7a-9df9-d2f21f663ac2} + True + + + + + + + + + ..\packages\BenchmarkDotNet\lib\net45\BenchmarkDotNet.dll + True + True + + + + + + + + + ..\packages\BenchmarkDotNet.Core\lib\net45\BenchmarkDotNet.Core.dll + True + True + + + True + + + True + + + + + + + + + ..\packages\BenchmarkDotNet.Toolchains.Roslyn\lib\net45\BenchmarkDotNet.Toolchains.Roslyn.dll + True + True + + + + + + + + + ..\packages\FsCheck\lib\net45\FsCheck.dll + True + True + + + + + + + + + ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll + True + True + + + + + + + + + ..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll + True + True + + + + + + + + + ..\packages\Microsoft.CodeAnalysis.Common\lib\net45\Microsoft.CodeAnalysis.dll + True + True + + + + + + + + + ..\packages\Microsoft.CodeAnalysis.CSharp\lib\net45\Microsoft.CodeAnalysis.CSharp.dll + True + True + + + + + + + + + ..\packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll + True + True + + + + + + + + + ..\packages\System.Reflection.Metadata\lib\netstandard1.1\System.Reflection.Metadata.dll + True + True + + + + + + + + + ..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll + True + True + + + + \ No newline at end of file diff --git a/Expecto/Expecto.fsproj b/Expecto/Expecto.fsproj index 64f6df24..8c751af8 100644 --- a/Expecto/Expecto.fsproj +++ b/Expecto/Expecto.fsproj @@ -1,179 +1,116 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {c0d55728-10a9-4a7a-9df9-d2f21f663ac2} - Library - Expecto - Expecto - v4.0 - Expecto - - - true - full - false - false - bin\Debug\ - DEBUG;TRACE - 3 - bin\Debug\Expecto.xml - - - pdbonly - true - true - bin\Release\ - TRACE - 3 - bin\Release\Expecto.xml - - - 11 - - - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - - - - - True - paket-files/Facade.fs - - - - - - - - - - - - - - - - - - - ..\packages\Argu\lib\net35\Argu.dll - True - True - - - - - - - ..\packages\Argu\lib\net40\Argu.dll - True - True - - - - - - - - - ..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - - - - - - - ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Mdb.dll - True - True - - - ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Pdb.dll - True - True - - - ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Rocks.dll - True - True - - - ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll - True - True - - - - + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {c0d55728-10a9-4a7a-9df9-d2f21f663ac2} + Library + Expecto + Expecto + v4.5 + Expecto + + + true + full + false + false + bin\Debug\ + DEBUG;TRACE + 3 + bin\Debug\Expecto.xml + + + pdbonly + true + true + bin\Release\ + TRACE + 3 + bin\Release\Expecto.xml + + + 11 + + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + + + + True + paket-files/Facade.fs + + + + + + + + + + + + + + + + + + + ..\packages\Argu\lib\net40\Argu.dll + True + True + + + + + + + + + ..\packages\FSharp.Core\lib\net40\FSharp.Core.dll + True + True + + + + + + + + + ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Mdb.dll + True + True + + + ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Pdb.dll + True + True + + + ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Rocks.dll + True + True + + + ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll + True + True + + + + \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 928a72ea..5661b06c 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,12 +1,10 @@ source https://nuget.org/api/v2 -source https://dotnet.myget.org/F/dotnet-core -source https://www.myget.org/F/fsharp-daily -source https://www.myget.org/F/netcorecli-fsc-preview3 +framework: net45 github logary/logary src/Logary.Facade/Facade.fs 4b21d888e83d72d1238ab0f36110e2a3946240e7 -nuget Argu -nuget FsCheck +nuget Argu = 3.2 +nuget FsCheck = 2.7.1 nuget FSharp.Core ~> 3 nuget FSharpx.Core nuget BenchmarkDotNet = 0.9.9 @@ -18,14 +16,3 @@ nuget Mono.Cecil = 0.10.0-beta2 framework: net40 group build source https://www.nuget.org/api/v2 nuget FAKE - -group netcore - source https://www.nuget.org/api/v2 - # nuget Microsoft.NET.Sdk 1.0.0-alpha-20161104-2 alpha - # nuget FSharp.NET.Sdk 1.0.0-alpha-000009 alpha - # nuget NETStandard.Library 1.6.1 - # nuget System.Diagnostics.TraceSource 4.3.0 - # nuget System.Linq.Parallel 4.3.0 - # - # nuget Argu 3.3.0 - # nuget FSharp.Core 4.0.1.7-alpha alpha diff --git a/paket.lock b/paket.lock index e58214b8..224daf4b 100644 --- a/paket.lock +++ b/paket.lock @@ -1,406 +1,49 @@ +FRAMEWORK: NET45 NUGET remote: https://www.nuget.org/api/v2 Argu (3.2) BenchmarkDotNet (0.9.9) - BenchmarkDotNet.Core (>= 0.9.9) - framework: >= netstandard15 - BenchmarkDotNet.Toolchains.Roslyn (>= 0.9.9) - framework: >= net45 + BenchmarkDotNet.Toolchains.Roslyn (>= 0.9.9) BenchmarkDotNet.Core (0.9.9) - Microsoft.CSharp (>= 4.0.1) - framework: >= netstandard15 - Microsoft.DotNet.InternalAbstractions (>= 1.0) - framework: >= netstandard15 - Microsoft.Win32.Primitives (>= 4.0.1) - framework: >= netstandard15 - System.Console (>= 4.0) - framework: >= netstandard15 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard15 - System.Diagnostics.Process (>= 4.1) - framework: >= netstandard15 - System.Diagnostics.Tools (>= 4.0.1) - framework: >= netstandard15 - System.IO.FileSystem (>= 4.0.1) - framework: >= netstandard15 - System.Linq (>= 4.1) - framework: >= netstandard15 - System.Reflection (>= 4.1) - framework: >= netstandard15 - System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard15 - System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard15 - System.Reflection.TypeExtensions (>= 4.1) - framework: >= netstandard15 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard15 - System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard15 - System.Runtime.InteropServices.RuntimeInformation (>= 4.0) - framework: >= netstandard15 - System.Runtime.Serialization.Primitives (>= 4.1.1) - framework: >= netstandard15 - System.Text.RegularExpressions (>= 4.1) - framework: >= netstandard15 - System.Threading (>= 4.0.11) - framework: >= netstandard15 - System.Threading.Tasks.Extensions (>= 4.0) - framework: >= net45, >= netstandard15 - System.Threading.Thread (>= 4.0) - framework: >= netstandard15 - System.Xml.XPath.XmlDocument (>= 4.0.1) - framework: >= netstandard15 + System.Threading.Tasks.Extensions (>= 4.0) BenchmarkDotNet.Toolchains.Roslyn (0.9.9) - BenchmarkDotNet.Core (>= 0.9.9) - framework: >= net45 - Microsoft.CodeAnalysis.CSharp (>= 1.3.2) - framework: >= net45 - System.Threading.Tasks (>= 4.0) - framework: >= net45 + BenchmarkDotNet.Core (>= 0.9.9) + Microsoft.CodeAnalysis.CSharp (>= 1.3.2) + System.Threading.Tasks (>= 4.0) FsCheck (2.7.1) FSharp.Core (>= 3.1.2.5) FSharp.Core (3.1.2.5) FSharpx.Core (1.8.32) - Microsoft.CodeAnalysis.Analyzers (1.1) - framework: >= net45 - Microsoft.CodeAnalysis.Common (1.3.2) - framework: >= net45 - Microsoft.CodeAnalysis.Analyzers (>= 1.1) - framework: >= net45, >= netstandard11, portable-net45+win8 - System.AppContext (>= 4.1) - framework: >= net46, >= netstandard13 - System.Collections (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Collections.Concurrent (>= 4.0.12) - framework: >= net46, >= netstandard13 - System.Collections.Immutable (>= 1.1.37) - framework: >= net45, >= netstandard11, portable-net45+win8 - System.Collections.Immutable (>= 1.2) - framework: >= net46, >= netstandard13 - System.Console (>= 4.0) - framework: >= net46, >= netstandard13 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Diagnostics.FileVersionInfo (>= 4.0) - framework: >= net46, >= netstandard13 - System.Diagnostics.StackTrace (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Diagnostics.Tools (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Dynamic.Runtime (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Globalization (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.IO.FileSystem (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.IO.FileSystem.Primitives (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Linq (>= 4.1) - framework: >= net46, >= netstandard13 - System.Linq.Expressions (>= 4.1) - framework: >= net46, >= netstandard13 - System.Reflection (>= 4.1) - framework: >= net46, >= netstandard13 - System.Reflection.Metadata (>= 1.2) - framework: >= net45, >= netstandard11, portable-net45+win8 - System.Reflection.Metadata (>= 1.3) - framework: >= net46, >= netstandard13 - System.Reflection.Primitives (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Runtime (>= 4.1) - framework: >= net46, >= netstandard13 - System.Runtime.Extensions (>= 4.1) - framework: >= net46, >= netstandard13 - System.Runtime.Handles (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Runtime.InteropServices (>= 4.1) - framework: >= net46, >= netstandard13 - System.Runtime.Numerics (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Security.Cryptography.Algorithms (>= 4.2) - framework: >= net46, >= netstandard13 - System.Security.Cryptography.Encoding (>= 4.0) - framework: >= net46, >= netstandard13 - System.Security.Cryptography.X509Certificates (>= 4.1) - framework: >= net46, >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Text.Encoding.CodePages (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Threading (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Threading.Tasks (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Threading.Tasks.Parallel (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Threading.Thread (>= 4.0) - framework: >= net46, >= netstandard13 - System.Xml.ReaderWriter (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Xml.XDocument (>= 4.0.11) - framework: >= net46, >= netstandard13 - System.Xml.XmlDocument (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Xml.XPath.XDocument (>= 4.0.1) - framework: >= net46, >= netstandard13 - Microsoft.CodeAnalysis.CSharp (1.3.2) - framework: >= net45 + Microsoft.CodeAnalysis.Analyzers (1.1) + Microsoft.CodeAnalysis.Common (1.3.2) + Microsoft.CodeAnalysis.Analyzers (>= 1.1) + System.Collections.Immutable (>= 1.1.37) + System.Reflection.Metadata (>= 1.2) + Microsoft.CodeAnalysis.CSharp (1.3.2) Microsoft.CodeAnalysis.Common (1.3.2) - Microsoft.CSharp (4.3) - framework: >= netstandard15 - System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Dynamic.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Linq (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Linq.Expressions (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.ObjectModel (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Reflection.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Reflection.TypeExtensions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Runtime.InteropServices (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 - Microsoft.DotNet.InternalAbstractions (1.0) - framework: >= netstandard15 - System.AppContext (>= 4.1) - framework: >= netstandard13 - System.Collections (>= 4.0.11) - framework: >= netstandard13 - System.IO (>= 4.1) - framework: >= netstandard13 - System.IO.FileSystem (>= 4.0.1) - framework: >= netstandard13 - System.Reflection.TypeExtensions (>= 4.1) - framework: >= netstandard13 - System.Runtime.Extensions (>= 4.1) - framework: >= netstandard13 - System.Runtime.InteropServices (>= 4.1) - framework: >= netstandard13 - System.Runtime.InteropServices.RuntimeInformation (>= 4.0) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (1.1) - framework: >= net45, >= netstandard15 - Microsoft.NETCore.Targets (1.1) - framework: >= net45, >= netstandard15 - Microsoft.Win32.Primitives (4.3) - framework: >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 - System.Runtime (>= 4.3) - framework: >= netstandard13 - Microsoft.Win32.Registry (4.3) - framework: >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 - System.Collections (>= 4.3) - framework: >= netstandard13 - System.Globalization (>= 4.3) - framework: >= netstandard13 - System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 - System.Runtime.Handles (>= 4.3) - framework: >= netstandard13 - System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard13 - Mono.Cecil (0.10.0-beta2) - framework: net40 + Mono.Cecil (0.10.0-beta2) + System.Collections (>= 4.0.11) + System.IO.FileSystem (>= 4.0.1) + System.IO.FileSystem.Primitives (>= 4.0.1) + System.Reflection (>= 4.1) + System.Runtime.Extensions (>= 4.1) + System.Security.Cryptography.Algorithms (>= 4.2) + System.Security.Cryptography.Csp (>= 4.0) + System.Threading (>= 4.0.11) NuGet.CommandLine (3.5) - runtime.native.System (4.3) - framework: >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.AppContext (4.3) - framework: >= net46, >= netstandard15 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard16 - System.Collections (4.3) - framework: >= net45, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Collections.Concurrent (4.3) - framework: >= net46 - System.Collections.Immutable (1.3.1) - framework: >= net45 - System.Console (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 - System.IO (>= 4.3) - framework: >= netstandard13 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Text.Encoding (>= 4.3) - framework: >= netstandard13 - System.Diagnostics.Debug (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Diagnostics.FileVersionInfo (4.3) - framework: >= net46 - System.Diagnostics.Process (4.3) - framework: >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard14 - Microsoft.Win32.Primitives (>= 4.3) - framework: >= netstandard14 - Microsoft.Win32.Registry (>= 4.3) - framework: >= netstandard14 - runtime.native.System (>= 4.3) - framework: >= netstandard14 - System.Collections (>= 4.3) - framework: >= netstandard14 - System.Diagnostics.Debug (>= 4.3) - framework: >= netstandard14 - System.Globalization (>= 4.3) - framework: >= netstandard14 - System.IO (>= 4.3) - framework: >= netstandard13 - System.IO.FileSystem (>= 4.3) - framework: >= netstandard14 - System.IO.FileSystem.Primitives (>= 4.3) - framework: >= netstandard14 - System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard14 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Runtime.Extensions (>= 4.3) - framework: >= netstandard14 - System.Runtime.Handles (>= 4.3) - framework: >= netstandard13 - System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard14 - System.Text.Encoding (>= 4.3) - framework: >= netstandard13 - System.Text.Encoding.Extensions (>= 4.3) - framework: >= netstandard14 - System.Threading (>= 4.3) - framework: >= netstandard14 - System.Threading.Tasks (>= 4.3) - framework: >= netstandard14 - System.Threading.Thread (>= 4.3) - framework: >= netstandard14 - System.Threading.ThreadPool (>= 4.3) - framework: >= netstandard14 - System.Diagnostics.StackTrace (4.3) - framework: >= net46 - System.Diagnostics.Tools (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard10 - System.Dynamic.Runtime (4.3) - framework: >= net46, >= netstandard15 - System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Linq (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Linq.Expressions (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.ObjectModel (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Reflection (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Reflection.Emit (>= 4.3) - framework: >= netstandard13 - System.Reflection.Emit.ILGeneration (>= 4.3) - framework: >= netstandard13 - System.Reflection.Primitives (>= 4.3) - framework: >= netstandard13 - System.Reflection.TypeExtensions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Globalization (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.IO (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.IO.FileSystem (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 - System.IO (>= 4.3) - framework: >= netstandard13 - System.IO.FileSystem.Primitives (>= 4.3) - framework: >= net46, >= netstandard13 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Runtime.Handles (>= 4.3) - framework: >= netstandard13 - System.Text.Encoding (>= 4.3) - framework: >= netstandard13 - System.Threading.Tasks (>= 4.3) - framework: >= netstandard13 - System.IO.FileSystem.Primitives (4.3) - framework: >= net46, >= netstandard15 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Linq (4.3) - framework: >= net46, >= netstandard15 - System.Collections (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard16 - System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard16 - System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Linq.Expressions (4.3) - framework: >= net46, >= netstandard15 - System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.IO (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Linq (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.ObjectModel (>= 4.3) - framework: >= netstandard16 - System.Reflection (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 - System.Reflection.Emit (>= 4.3) - framework: >= netstandard16 - System.Reflection.Emit.ILGeneration (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Reflection.Emit.Lightweight (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Reflection.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Reflection.TypeExtensions (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 - System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.ObjectModel (4.3) - framework: >= net46, >= netstandard15 - System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Reflection (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.IO (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Reflection.Emit (4.3) - framework: >= net46, >= netstandard15 - System.IO (>= 4.3) - framework: >= netstandard11 - System.Reflection (>= 4.3) - framework: >= netstandard11 - System.Reflection.Emit.ILGeneration (>= 4.3) - framework: >= netstandard11 - System.Reflection.Primitives (>= 4.3) - framework: >= netstandard11 - System.Runtime (>= 4.3) - framework: >= netstandard11 - System.Reflection.Emit.ILGeneration (4.3) - framework: >= net46, >= netstandard15 - System.Reflection (>= 4.3) - framework: >= netstandard10 - System.Reflection.Primitives (>= 4.3) - framework: >= netstandard10 - System.Runtime (>= 4.3) - framework: >= netstandard10 - System.Reflection.Emit.Lightweight (4.3) - framework: >= net46, >= netstandard16 - System.Reflection (>= 4.3) - framework: >= netstandard10 - System.Reflection.Emit.ILGeneration (>= 4.3) - framework: >= netstandard10 - System.Reflection.Primitives (>= 4.3) - framework: >= netstandard10 - System.Runtime (>= 4.3) - framework: >= netstandard10 - System.Reflection.Extensions (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard10 - System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard10 - System.Reflection.Metadata (1.4.2) - framework: >= net45 - System.Collections.Immutable (>= 1.3.1) - framework: >= net45, >= netstandard11, monoandroid, monotouch, xamarinios, xamarinmac, winv4.5, wpav8.1 - System.Reflection.Primitives (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard10 - System.Reflection.TypeExtensions (4.3) - framework: >= net46, >= netstandard15 - System.Reflection (>= 4.3) - framework: >= net462, dnxcore50, netstandard13, >= netstandard15 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15 - System.Resources.ResourceManager (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, >= netstandard10 - System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard10 - System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard10 - System.Runtime (4.3) - framework: >= net45, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 - System.Runtime.Extensions (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime.Handles (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Runtime.InteropServices (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Reflection (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Runtime (>= 4.3) - framework: net462, >= net463, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Runtime.Handles (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15 - System.Runtime.InteropServices.RuntimeInformation (4.3) - framework: >= netstandard15 - runtime.native.System (>= 4.3) - framework: >= netstandard11 - System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard11 - System.Reflection.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard11 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard11 - System.Runtime (>= 4.3) - framework: dnxcore50, >= netstandard11 - System.Runtime.InteropServices (>= 4.3) - framework: >= netstandard11 - System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard11 - System.Runtime.Numerics (4.3) - framework: >= net46 - System.Runtime.Serialization.Primitives (4.3) - framework: >= netstandard15 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Security.Cryptography.Algorithms (4.3) - framework: >= net46 - System.IO (>= 4.3) - framework: >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16 - System.Runtime (>= 4.3) - framework: >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16 - System.Security.Cryptography.Encoding (>= 4.3) - framework: >= net463, dnxcore50, >= netstandard16 - System.Security.Cryptography.Primitives (>= 4.3) - framework: net46, net461, >= net463, dnxcore50, netstandard13, netstandard14, >= netstandard16 - System.Security.Cryptography.Encoding (4.3) - framework: >= net46 - System.Security.Cryptography.Primitives (4.3) - framework: net46, net461, >= net463 - System.Security.Cryptography.X509Certificates (4.3) - framework: >= net46 - System.Security.Cryptography.Algorithms (>= 4.3) - framework: net46, >= net461, dnxcore50, netstandard13, netstandard14, >= netstandard16 - System.Security.Cryptography.Encoding (>= 4.3) - framework: net46, >= net461, dnxcore50, netstandard13, netstandard14, >= netstandard16 - System.Text.Encoding (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding.CodePages (4.3) - framework: >= net46 - System.Text.Encoding.Extensions (4.3) - framework: >= net46, >= netstandard15 - Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.RegularExpressions (4.3) - framework: >= net46, >= netstandard15 - System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 - System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard16 - System.Threading (4.3) - framework: >= net46, >= netstandard15 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks (4.3) - framework: >= net45, >= netstandard15 - System.Threading.Tasks.Extensions (4.3) - framework: >= net45, >= netstandard15 - System.Collections (>= 4.3) - framework: >= netstandard10 - System.Runtime (>= 4.3) - framework: >= netstandard10 - System.Threading.Tasks (>= 4.3) - framework: >= netstandard10 - System.Threading.Tasks.Parallel (4.3) - framework: >= net46 - System.Threading.Thread (4.3) - framework: >= net46, >= netstandard15 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Threading.ThreadPool (4.3) - framework: >= netstandard15 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Runtime.Handles (>= 4.3) - framework: >= netstandard13 - System.Xml.ReaderWriter (4.3) - framework: >= net46, >= netstandard15 - System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.IO (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.IO.FileSystem (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.IO.FileSystem.Primitives (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Runtime.InteropServices (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Text.RegularExpressions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13 - System.Xml.XDocument (4.3) - framework: >= net46 - System.Xml.XmlDocument (4.3) - framework: >= net46, >= netstandard15 - System.Collections (>= 4.3) - framework: >= netstandard13 - System.Diagnostics.Debug (>= 4.3) - framework: >= netstandard13 - System.Globalization (>= 4.3) - framework: >= netstandard13 - System.IO (>= 4.3) - framework: >= netstandard13 - System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 - System.Text.Encoding (>= 4.3) - framework: >= netstandard13 - System.Threading (>= 4.3) - framework: >= netstandard13 - System.Xml.ReaderWriter (>= 4.3) - framework: >= netstandard13 - System.Xml.XPath (4.3) - framework: >= net46, >= netstandard15 - System.Collections (>= 4.3) - framework: >= netstandard13 - System.Diagnostics.Debug (>= 4.3) - framework: >= netstandard13 - System.Globalization (>= 4.3) - framework: >= netstandard13 - System.IO (>= 4.3) - framework: >= netstandard13 - System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 - System.Threading (>= 4.3) - framework: >= netstandard13 - System.Xml.ReaderWriter (>= 4.3) - framework: >= netstandard13 - System.Xml.XPath.XDocument (4.3) - framework: >= net46 - System.Xml.XPath (>= 4.3) - framework: >= net46, >= netstandard13 - System.Xml.XPath.XmlDocument (4.3) - framework: >= netstandard15 - System.Collections (>= 4.3) - framework: >= netstandard13 - System.Globalization (>= 4.3) - framework: >= netstandard13 - System.IO (>= 4.3) - framework: >= netstandard13 - System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard13 - System.Runtime (>= 4.3) - framework: >= netstandard13 - System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13 - System.Threading (>= 4.3) - framework: >= netstandard13 - System.Xml.ReaderWriter (>= 4.3) - framework: >= netstandard13 - System.Xml.XmlDocument (>= 4.3) - framework: >= net46, >= netstandard13 - System.Xml.XPath (>= 4.3) - framework: >= net46, >= netstandard13 + System.Collections (4.3) + System.Collections.Immutable (1.3.1) + System.IO.FileSystem (4.3) + System.IO.FileSystem.Primitives (4.3) + System.Reflection (4.3) + System.Reflection.Metadata (1.4.2) + System.Collections.Immutable (>= 1.3.1) + System.Runtime.Extensions (4.3) + System.Security.Cryptography.Algorithms (4.3) + System.Security.Cryptography.Csp (4.3) + System.Threading (4.3) + System.Threading.Tasks (4.3) + System.Threading.Tasks.Extensions (4.3) GITHUB remote: logary/logary src/Logary.Facade/Facade.fs (0fbb7829b9d4b62f9ffd10d7a4b20d075c6cccc6) 4b21d888e83d72d1238ab0f36110e2a3946240e7 @@ -408,6 +51,3 @@ GROUP build NUGET remote: https://www.nuget.org/api/v2 FAKE (4.48) - -GROUP netcore - From 95258b32badb02cb897cbde5c69af40e10618450 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 25 Feb 2017 19:05:19 +1000 Subject: [PATCH 20/43] Thanks to >=net45, less reflection madness --- Expecto.netcore/Expecto.netcore.fsproj | 4 ---- Expecto/Expecto.fs | 33 -------------------------- 2 files changed, 37 deletions(-) diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj index d9443620..d2d4a156 100644 --- a/Expecto.netcore/Expecto.netcore.fsproj +++ b/Expecto.netcore/Expecto.netcore.fsproj @@ -3,10 +3,6 @@ Expecto netstandard1.6 - - RESHAPED_REFLECTION; - @(DefineConstants); - diff --git a/Expecto/Expecto.fs b/Expecto/Expecto.fs index 929f25ae..8a26d1b0 100644 --- a/Expecto/Expecto.fs +++ b/Expecto/Expecto.fs @@ -1128,15 +1128,9 @@ module Impl = let asMembers x = Seq.map (fun m -> m :> MemberInfo) x let bindingFlags = BindingFlags.Public ||| BindingFlags.Static fun (t: Type) -> -#if RESHAPED_REFLECTION [ t.GetTypeInfo().GetMethods bindingFlags |> asMembers t.GetTypeInfo().GetProperties bindingFlags |> asMembers t.GetTypeInfo().GetFields bindingFlags |> asMembers ] -#else - [ t.GetMethods bindingFlags |> asMembers - t.GetProperties bindingFlags |> asMembers - t.GetFields bindingFlags |> asMembers ] -#endif |> Seq.collect id |> Seq.choose testFromMember |> Seq.toList @@ -1148,7 +1142,6 @@ module Impl = // might be able to find corresponding source code) is referred to in a field // of the function object. let isFsharpFuncType t = -#if RESHAPED_REFLECTION let baseType = let rec findBase (t:Type) = if t.GetTypeInfo().BaseType = null || t.GetTypeInfo().BaseType = typeof then @@ -1157,32 +1150,14 @@ module Impl = findBase (t.GetTypeInfo().BaseType) findBase t baseType.GetTypeInfo().IsGenericType && baseType.GetTypeInfo().GetGenericTypeDefinition() = typedefof> -#else - let baseType = - let rec findBase (t:Type) = - if t.BaseType = null || t.BaseType = typeof then - t - else - findBase t.BaseType - findBase t - baseType.IsGenericType && baseType.GetGenericTypeDefinition() = typedefof> -#endif let getFuncTypeToUse (testFunc:unit->unit) (asm:Assembly) = let t = testFunc.GetType() -#if RESHAPED_REFLECTION if t.GetTypeInfo().Assembly.FullName = asm.FullName then -#else - if t.Assembly.FullName = asm.FullName then -#endif t else let nestedFunc = -#if RESHAPED_REFLECTION t.GetTypeInfo().GetFields() -#else - t.GetFields() -#endif |> Seq.tryFind (fun f -> isFsharpFuncType f.FieldType) match nestedFunc with | Some f -> f.GetValue(testFunc).GetType() @@ -1192,11 +1167,7 @@ module Impl = match testCode with | Sync test -> let t = getFuncTypeToUse test asm -#if RESHAPED_REFLECTION let m = t.GetTypeInfo().GetMethods() -#else - let m = t.GetMethods () -#endif |> Seq.find (fun m -> (m.Name = "Invoke") && (m.DeclaringType = t)) (t.FullName, m.Name) | Async _ | AsyncFsCheck _ -> @@ -1439,11 +1410,7 @@ module Tests = module ExpectoConfig = let expectoVersion() = -#if RESHAPED_REFLECTION let assembly = typeof.GetTypeInfo().Assembly -#else - let assembly = Assembly.GetExecutingAssembly() -#endif let fileInfoVersion = FileVersionInfo.GetVersionInfo assembly.Location fileInfoVersion.ProductVersion From 2169ced9ead34d965177d5418e01277a5cbd5628 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 25 Feb 2017 19:33:59 +1000 Subject: [PATCH 21/43] Travis matrix: mono 4.6.1|latest --- .travis.yml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29285caa..5a28aff0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,30 @@ language: csharp matrix: - include: + fast_finish: true # just fail immediately if at least one job fails + include: - os: linux # Ubuntu 14.04 dist: trusty sudo: required + mono: 4.6.1 + env: CLI_VERSION=1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 + - os: linux # Ubuntu 14.04 + dist: trusty + sudo: required + mono: latest + env: CLI_VERSION=1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 + - os: osx # OSX 10.11 + osx_image: xcode7.3 + mono: 4.6.1 + env: CLI_VERSION=1.0.0-rc4-004771 dotnet: 1.0.0-preview2-003121 - # Note that travis doesn't support dotnet cli rc4 via 'dotnet' yet, - # so we just use the old preview2 support to get things setup - # first, then manually add dotnet CLI RC4 during install. - env: - - CLI_VERSION=1.0.0-rc4-004771 - os: osx # OSX 10.11 osx_image: xcode7.3 + mono: latest + env: CLI_VERSION=1.0.0-rc4-004771 dotnet: 1.0.0-preview2-003121 - env: - - CLI_VERSION=1.0.0-rc4-004771 install: - rvm install 2.2.3 From 8f55a7e1b9c7766b0a88bf39f6d440f4520ab341 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sat, 25 Feb 2017 19:45:16 +1000 Subject: [PATCH 22/43] Travis: mono 4.8.0 and weekly --- .travis.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a28aff0..1168eb77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,23 +4,45 @@ language: csharp matrix: fast_finish: true # just fail immediately if at least one job fails include: + - os: linux # Ubuntu 14.04 + dist: trusty + sudo: required + mono: 4.8.0 + env: CLI_VERSION=1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 - os: linux # Ubuntu 14.04 dist: trusty sudo: required mono: 4.6.1 env: CLI_VERSION=1.0.0-rc4-004771 dotnet: 1.0.0-preview2-003121 + - os: linux # Ubuntu 14.04 + dist: trusty + sudo: required + mono: weekly + env: CLI_VERSION=1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 - os: linux # Ubuntu 14.04 dist: trusty sudo: required mono: latest env: CLI_VERSION=1.0.0-rc4-004771 dotnet: 1.0.0-preview2-003121 + - os: osx # OSX 10.11 + osx_image: xcode7.3 + mono: 4.8.0 + env: CLI_VERSION=1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 - os: osx # OSX 10.11 osx_image: xcode7.3 mono: 4.6.1 env: CLI_VERSION=1.0.0-rc4-004771 dotnet: 1.0.0-preview2-003121 + - os: osx # OSX 10.11 + osx_image: xcode7.3 + mono: weekly + env: CLI_VERSION=1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 - os: osx # OSX 10.11 osx_image: xcode7.3 mono: latest @@ -36,4 +58,3 @@ install: script: - bundle && bundle exec rake -# - ./build.sh From 50e7e031e89fda4cd35f9c56e7ba99227036fe8a Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 08:41:07 +1000 Subject: [PATCH 23/43] Travis: fixed mono allow_failures --- .travis.yml | 68 +++++++++++++++++------------------------------------ 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1168eb77..36eedeb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,54 +1,30 @@ --- language: csharp +os: + - osx + - linux + +dist: trusty +sudo: required + +dotnet: 1.0.0-preview2-003121 + +mono: + - 4.6.1 + - 4.8.0 + - weekly + - latest + +env: + - CLI_VERSION=1.0.0-rc4-004771 + matrix: fast_finish: true # just fail immediately if at least one job fails - include: - - os: linux # Ubuntu 14.04 - dist: trusty - sudo: required - mono: 4.8.0 - env: CLI_VERSION=1.0.0-rc4-004771 - dotnet: 1.0.0-preview2-003121 - - os: linux # Ubuntu 14.04 - dist: trusty - sudo: required - mono: 4.6.1 - env: CLI_VERSION=1.0.0-rc4-004771 - dotnet: 1.0.0-preview2-003121 - - os: linux # Ubuntu 14.04 - dist: trusty - sudo: required - mono: weekly - env: CLI_VERSION=1.0.0-rc4-004771 - dotnet: 1.0.0-preview2-003121 - - os: linux # Ubuntu 14.04 - dist: trusty - sudo: required - mono: latest - env: CLI_VERSION=1.0.0-rc4-004771 - dotnet: 1.0.0-preview2-003121 - - os: osx # OSX 10.11 - osx_image: xcode7.3 - mono: 4.8.0 - env: CLI_VERSION=1.0.0-rc4-004771 - dotnet: 1.0.0-preview2-003121 - - os: osx # OSX 10.11 - osx_image: xcode7.3 - mono: 4.6.1 - env: CLI_VERSION=1.0.0-rc4-004771 - dotnet: 1.0.0-preview2-003121 - - os: osx # OSX 10.11 - osx_image: xcode7.3 - mono: weekly - env: CLI_VERSION=1.0.0-rc4-004771 - dotnet: 1.0.0-preview2-003121 - - os: osx # OSX 10.11 - osx_image: xcode7.3 - mono: latest - env: CLI_VERSION=1.0.0-rc4-004771 - dotnet: 1.0.0-preview2-003121 - + allow_failures: + - mono: weekly + - mono: latest + install: - rvm install 2.2.3 - gem install bundler From faeef2afb357ec0f898d197fa0e129518e14eab1 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 08:47:10 +1000 Subject: [PATCH 24/43] Improve diff & fsproj encoding --- .travis.yml | 23 ++++++++++++----------- Expecto/Expecto.fsproj | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36eedeb8..a6ff1371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,12 @@ --- language: csharp +mono: + - 4.6.1 + - 4.8.0 + - weekly # => "stable release" + - latest # => "latest commits" + os: - osx - linux @@ -10,20 +16,9 @@ sudo: required dotnet: 1.0.0-preview2-003121 -mono: - - 4.6.1 - - 4.8.0 - - weekly - - latest - env: - CLI_VERSION=1.0.0-rc4-004771 -matrix: - fast_finish: true # just fail immediately if at least one job fails - allow_failures: - - mono: weekly - - mono: latest install: - rvm install 2.2.3 @@ -34,3 +29,9 @@ install: script: - bundle && bundle exec rake + +matrix: + fast_finish: true # just fail immediately if at least one job fails + allow_failures: + - mono: latest + - mono: weekly diff --git a/Expecto/Expecto.fsproj b/Expecto/Expecto.fsproj index 8c751af8..122c4aa4 100644 --- a/Expecto/Expecto.fsproj +++ b/Expecto/Expecto.fsproj @@ -1,4 +1,4 @@ - + Debug From e4bbf2c0bac4a42c9e9fb4178195b40e7daa434b Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 10:15:10 +1000 Subject: [PATCH 25/43] Run tests on netcore during build --- Expecto.Tests/Expecto.Tests.fsproj | 4 +- Expecto.Tests/Tests.fs | 38 +++++++++++++----- .../Expecto.netcore.Tests.fsproj | 39 +++++++++++++++++++ Rakefile | 1 + 4 files changed, 70 insertions(+), 12 deletions(-) create mode 100755 Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj index 89ee48cf..b2cc1590 100644 --- a/Expecto.Tests/Expecto.Tests.fsproj +++ b/Expecto.Tests/Expecto.Tests.fsproj @@ -19,7 +19,7 @@ false false bin\Debug\ - DEBUG;TRACE + DEBUG;TRACE;FSCHECK_TESTS 3 AnyCPU bin\Debug\Expecto.Tests.xml @@ -30,7 +30,7 @@ true true bin\Release\ - TRACE + TRACE;FSCHECK_TESTS 3 AnyCPU bin\Release\Expecto.Tests.xml diff --git a/Expecto.Tests/Tests.fs b/Expecto.Tests/Tests.fs index 52a676e9..17c1e40b 100644 --- a/Expecto.Tests/Tests.fs +++ b/Expecto.Tests/Tests.fs @@ -4,9 +4,9 @@ module Expecto.Tests open System open System.Threading open System.IO +open System.Reflection open Expecto open Expecto.Impl -open FSharpx open System.Globalization module Dummy = @@ -79,6 +79,7 @@ let tests = r.Value.duration ==? TimeSpan.FromMilliseconds 27. ] +#if FSCHECK_TESTS testList "TestResultCounts" [ let inline testProp fn = let config = @@ -111,6 +112,7 @@ let tests = true ) ] +#endif testList "Exception handling" [ testCaseAsync "Expecto ignore" <| async { @@ -192,10 +194,10 @@ let expecto = let t = Test.filter ((=) "a") tests |> Test.toTestCodeList |> Seq.toList t.Length ==? 1 yield testCase "with nested testcase" <| fun _ -> - let t = Test.filter (Strings.contains "d") tests |> Test.toTestCodeList |> Seq.toList + let t = Test.filter (fun (s: string) -> s.Contains "d") tests |> Test.toTestCodeList |> Seq.toList t.Length ==? 1 yield testCase "with one testlist" <| fun _ -> - let t = Test.filter (Strings.contains "c") tests |> Test.toTestCodeList |> Seq.toList + let t = Test.filter (fun (s: string) -> s.Contains "c") tests |> Test.toTestCodeList |> Seq.toList t.Length ==? 2 yield testCase "with no results" <| fun _ -> let t = Test.filter ((=) "z") tests |> Test.toTestCodeList |> Seq.toList @@ -227,7 +229,7 @@ let expecto = testList "Reflection" [ let getMember name = - Dummy.thisModuleType.Value.GetMember name + Dummy.thisModuleType.Value.GetTypeInfo().GetMember name |> Array.tryFind (fun _ -> true) let getTest = getMember @@ -357,21 +359,35 @@ let expecto = testList "transformations" [ testCaseAsync "multiple cultures" <| async { + let getCurrentCulture () : CultureInfo = +#if RESHAPED_THREAD_CULTURE + System.Globalization.CultureInfo.CurrentCulture +#else + System.Threading.Thread.CurrentThread.CurrentCulture +#endif + + let setCurrentCulture (culture : CultureInfo) = +#if RESHAPED_THREAD_CULTURE + System.Globalization.CultureInfo.CurrentCulture <- culture +#else + System.Threading.Thread.CurrentThread.CurrentCulture <- culture +#endif + let withCulture culture test = async { - let c = Thread.CurrentThread.CurrentCulture + let c = getCurrentCulture() try - Thread.CurrentThread.CurrentCulture <- culture + setCurrentCulture culture match test with | Sync test -> test() | Async test -> do! test | AsyncFsCheck (config, _, test) -> - do! Option.getOrElse FsCheckConfig.defaultConfig config - |> test + let configOrDefault = match config with | Some c -> c | _ -> FsCheckConfig.defaultConfig + do! configOrDefault |> test finally - Thread.CurrentThread.CurrentCulture <- c + setCurrentCulture c } let testWithCultures (cultures: #seq) = @@ -387,7 +403,7 @@ let expecto = let cultures = ["en-US"; "es-AR"; "fr-FR"] - |> List.map CultureInfo.GetCultureInfo + |> List.map CultureInfo let culturizedTests = testWithCultures cultures atest @@ -655,12 +671,14 @@ let inline popCount16 i = v <- (v &&& 0x3333us) + ((v >>> 2) &&& 0x3333us) ((v + (v >>> 4) &&& 0xF0Fus) * 0x101us) >>> 8 +#if FSCHECK_TESTS [] let popcountTest = testList "performance" [ testProperty "popcount same" (fun i -> (popCount i |> int) = (popCount16 i |> int)) ] +#endif [] let asyncTests = diff --git a/Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj b/Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj new file mode 100755 index 00000000..8426d3d4 --- /dev/null +++ b/Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj @@ -0,0 +1,39 @@ + + + + + Expecto.netcore.Tests + Expecto.netcore.Tests + + Exe + netcoreapp1.1 + false + + RESHAPED_THREAD_CULTURE; + $(DefineConstants) + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Rakefile b/Rakefile index 83dc9420..1d7595c4 100644 --- a/Rakefile +++ b/Rakefile @@ -90,6 +90,7 @@ end namespace :tests do task :unit do + system "dotnet", %W|run -c #{Configuration} --project Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj --debug --summary| system "Expecto.Tests/bin/#{Configuration}/Expecto.Tests.exe", '--summary', clr_command: true end end From 4c5da2cc502a1c5dae24661d254b23704d58e389 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 10:32:31 +1000 Subject: [PATCH 26/43] restore before test --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 1d7595c4..e9d0c05f 100644 --- a/Rakefile +++ b/Rakefile @@ -96,7 +96,7 @@ namespace :tests do end task :tests => :'tests:unit' - +task :'tests:unit' => [ :restore_dotnetcli ] task :default => [ :compile, :tests, :create_nugets ] task :ensure_nuget_key do From 8d4aefbe5f259d7bc28ce3ffcb8e74ed772bea47 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 10:48:10 +1000 Subject: [PATCH 27/43] restore before tests --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index e9d0c05f..de49040c 100644 --- a/Rakefile +++ b/Rakefile @@ -44,7 +44,7 @@ task :restore_quick do end task :restore_dotnetcli do - system "dotnet", %W|restore Expecto.netcore/Expecto.netcore.fsproj| + system "dotnet", %W|restore Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj| end desc 'restore all nugets as per the packages.config files' From 4c1c28006da443a896d03bffa55a5adc8746df6f Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 10:57:25 +1000 Subject: [PATCH 28/43] proj --- .../Expecto.Focused.Tests.fsproj | 56 +------------------ 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/testdata/Expecto.Focused.Tests/Expecto.Focused.Tests.fsproj b/testdata/Expecto.Focused.Tests/Expecto.Focused.Tests.fsproj index 860dfef2..ec5bf12d 100644 --- a/testdata/Expecto.Focused.Tests/Expecto.Focused.Tests.fsproj +++ b/testdata/Expecto.Focused.Tests/Expecto.Focused.Tests.fsproj @@ -67,16 +67,7 @@ - - - - ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll - True - True - - - - + ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll @@ -85,50 +76,5 @@ - - - - ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll - True - True - - - - - - - ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll - True - True - - - \ No newline at end of file From 5165571d53d3c9d9fcb1b7009aa72bb67a3f0785 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 11:08:37 +1000 Subject: [PATCH 29/43] locate fscheck with nuget.config --- Expecto.netcore.Tests/nuget.config | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Expecto.netcore.Tests/nuget.config diff --git a/Expecto.netcore.Tests/nuget.config b/Expecto.netcore.Tests/nuget.config new file mode 100644 index 00000000..3814f423 --- /dev/null +++ b/Expecto.netcore.Tests/nuget.config @@ -0,0 +1,6 @@ + + + + + + From 34883c6b7ce0c626b9f275fb41f9aec4186e34ae Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 12:26:29 +1000 Subject: [PATCH 30/43] Fix fsproj encoding --- Expecto.Tests/Expecto.Tests.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj index b2cc1590..b61fe975 100644 --- a/Expecto.Tests/Expecto.Tests.fsproj +++ b/Expecto.Tests/Expecto.Tests.fsproj @@ -1,4 +1,4 @@ - + Debug From cc5159fe7992193ce1b9a71eb6ed35566dff08fd Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 16:13:38 +1000 Subject: [PATCH 31/43] Fix reflection tests --- Expecto.Tests/Tests.fs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Expecto.Tests/Tests.fs b/Expecto.Tests/Tests.fs index 17c1e40b..38249d63 100644 --- a/Expecto.Tests/Tests.fs +++ b/Expecto.Tests/Tests.fs @@ -18,10 +18,19 @@ module Dummy = [] let testB() = TestLabel ("test B", TestList ([], Normal), Normal) - let thisModuleType = lazy Type.GetType "Expecto.Tests+Dummy, Expecto.Tests" + let thisAssemblyName = +#if NETCOREAPP1_1 + "Expecto.netcore.Tests" +#else + "Expecto.Tests" +#endif + + let thisModuleNameQualified = sprintf "Expecto.Tests+Dummy, %s" thisAssemblyName + let thisModuleType = lazy Type.GetType(thisModuleNameQualified, throwOnError=true) module EmptyModule = - let thisModuleType = lazy Type.GetType "Expecto.Tests+EmptyModule, Expecto.Tests" + let thisModuleNameQualified = sprintf "Expecto.Tests+EmptyModule, %s" Dummy.thisAssemblyName + let thisModuleType = lazy Type.GetType(thisModuleNameQualified, throwOnError=true) let (==?) actual expected = Expect.equal expected actual "" From b3c184fd3ab3676c662dd2c1b7b524d780a961a2 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 17:01:51 +1000 Subject: [PATCH 32/43] VSCode build/test integration --- .vscode/launch.json | 20 ++++++++++++++------ .vscode/tasks.json | 45 +++++++++++++++++++++++++++++++++++++-------- Rakefile | 7 ++++++- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 5e71e0ee..a815cd22 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,15 +2,23 @@ "version": "0.2.0", "configurations": [ { - "name": "Debug Sample", - "type": "mono", + "name": ".NET Core Debug Tests", + "type": "coreclr", "request": "launch", - "program": "${workspaceRoot}/Expecto.Sample/bin/Debug/Expecto.Sample.exe", - "args": ["--debug"], + "preLaunchTask": "build_netcore_tests", + "program": "${workspaceRoot}/Expecto.netcore.Tests/bin/Debug/netcoreapp1.1/Expecto.netcore.Tests.dll", + "args": [ + "--debug", "--sequenced" + ], "cwd": "${workspaceRoot}", - "runtimeExecutable": null, - "env": {}, + "stopAtEntry": false, "externalConsole": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command.pickProcess}" } ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 87503483..d3eff7b6 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,18 +2,47 @@ // See https://go.microsoft.com/fwlink/?LinkId=733558 // for the documentation about the tasks.json format "version": "0.1.0", - "command": "bundle", "isShellCommand": true, - "args": [], - "showOutput": "always", - "tasks": [ + "tasks": [ { - "taskName": "compile", + "taskName": "build", + "echoCommand": true, + "command": "bundle", + "isBuildCommand": true, + "problemMatcher": "$msCompile", "args": [ - "exec", - "rake" + "exec", "rake", + "Configuration=Debug", + "quick_compile", + "quick_compile_netcore" + ] + }, + { + "taskName": "build_netcore_tests", + "command": "dotnet", + "echoCommand": true, + "args": [ + "build", + "-c", "Debug", + "Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj" + ], + "showOutput": "silent", + "problemMatcher": "$msCompile" + }, + { + "taskName": "run_netcore_tests", + "echoCommand": true, + "command": "dotnet", + "args": [ + "run", + "-c", "Debug", + "--project", "Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj", + "--sequenced", + "--debug" ], - "isBuildCommand": true + "showOutput": "silent", + "isTestCommand": true, + "problemMatcher": "$msCompile" } ] } \ No newline at end of file diff --git a/Rakefile b/Rakefile index de49040c..2c400b51 100644 --- a/Rakefile +++ b/Rakefile @@ -25,10 +25,15 @@ end desc 'Perform fast build (warn: doesn\'t d/l deps)' build :quick_compile do |b| b.prop 'Configuration', Configuration - b.logging = 'detailed' + b.logging = 'minimal' b.sln = 'Expecto.Tests/Expecto.Tests.fsproj' end +desc 'Perform fast netcore build (warn: doesn\'t d/l deps)' +task :quick_compile_netcore do + system "dotnet", %W|build -c #{Configuration} Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj| +end + task :paket_bootstrap do system 'tools/paket.bootstrapper.exe', %|4.0.0-alpha030|, From fe77792ff738974a7eb35ecbca1cb30f2b92eb81 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 26 Feb 2017 17:02:58 +1000 Subject: [PATCH 33/43] file encoding (again) --- Expecto.Tests/Expecto.Tests.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj index b61fe975..b2cc1590 100644 --- a/Expecto.Tests/Expecto.Tests.fsproj +++ b/Expecto.Tests/Expecto.Tests.fsproj @@ -1,4 +1,4 @@ - + Debug From 8bd3c2bb9800ab0c1553f3c1167380dba8cb56f0 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 27 Feb 2017 20:56:23 +1000 Subject: [PATCH 34/43] Remove FSharpx --- Expecto.Tests/Expecto.Tests.fsproj | 11 ----------- Expecto.Tests/paket.references | 1 - Expecto.netcore.Tests/paket.references | 2 ++ paket.dependencies | 3 +-- paket.lock | 3 +-- 5 files changed, 4 insertions(+), 16 deletions(-) create mode 100644 Expecto.netcore.Tests/paket.references diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj index b2cc1590..deea7a9d 100644 --- a/Expecto.Tests/Expecto.Tests.fsproj +++ b/Expecto.Tests/Expecto.Tests.fsproj @@ -146,17 +146,6 @@ - - - - - ..\packages\FSharpx.Core\lib\40\FSharpx.Core.dll - True - True - - - - diff --git a/Expecto.Tests/paket.references b/Expecto.Tests/paket.references index 1d61ed48..497d62a2 100644 --- a/Expecto.Tests/paket.references +++ b/Expecto.Tests/paket.references @@ -1,4 +1,3 @@ FsCheck FSharp.Core -FSharpx.Core BenchmarkDotNet \ No newline at end of file diff --git a/Expecto.netcore.Tests/paket.references b/Expecto.netcore.Tests/paket.references new file mode 100644 index 00000000..139597f9 --- /dev/null +++ b/Expecto.netcore.Tests/paket.references @@ -0,0 +1,2 @@ + + diff --git a/paket.dependencies b/paket.dependencies index 5661b06c..1fa0f440 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -6,13 +6,12 @@ github logary/logary src/Logary.Facade/Facade.fs 4b21d888e83d72d1238ab0f36110e2a nuget Argu = 3.2 nuget FsCheck = 2.7.1 nuget FSharp.Core ~> 3 -nuget FSharpx.Core nuget BenchmarkDotNet = 0.9.9 nuget BenchmarkDotNet.Toolchains.Roslyn = 0.9.9 nuget BenchmarkDotNet.Core = 0.9.9 -nuget NuGet.CommandLine nuget Mono.Cecil = 0.10.0-beta2 framework: net40 group build source https://www.nuget.org/api/v2 nuget FAKE + nuget NuGet.CommandLine diff --git a/paket.lock b/paket.lock index 224daf4b..f0f28289 100644 --- a/paket.lock +++ b/paket.lock @@ -13,7 +13,6 @@ NUGET FsCheck (2.7.1) FSharp.Core (>= 3.1.2.5) FSharp.Core (3.1.2.5) - FSharpx.Core (1.8.32) Microsoft.CodeAnalysis.Analyzers (1.1) Microsoft.CodeAnalysis.Common (1.3.2) Microsoft.CodeAnalysis.Analyzers (>= 1.1) @@ -30,7 +29,6 @@ NUGET System.Security.Cryptography.Algorithms (>= 4.2) System.Security.Cryptography.Csp (>= 4.0) System.Threading (>= 4.0.11) - NuGet.CommandLine (3.5) System.Collections (4.3) System.Collections.Immutable (1.3.1) System.IO.FileSystem (4.3) @@ -51,3 +49,4 @@ GROUP build NUGET remote: https://www.nuget.org/api/v2 FAKE (4.48) + NuGet.CommandLine (3.5) From 48c1f4e46c2dfd8bce9024b65df80d31599dd64a Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 27 Feb 2017 21:03:02 +1000 Subject: [PATCH 35/43] Put back nuget.commandline --- paket.dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paket.dependencies b/paket.dependencies index 1fa0f440..2e5de765 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -10,8 +10,8 @@ nuget BenchmarkDotNet = 0.9.9 nuget BenchmarkDotNet.Toolchains.Roslyn = 0.9.9 nuget BenchmarkDotNet.Core = 0.9.9 nuget Mono.Cecil = 0.10.0-beta2 framework: net40 +nuget NuGet.CommandLine group build source https://www.nuget.org/api/v2 nuget FAKE - nuget NuGet.CommandLine From 639de3828730e1237b4ee37703ec54125edf47b1 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 27 Feb 2017 21:32:06 +1000 Subject: [PATCH 36/43] nuget command line --- paket.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paket.lock b/paket.lock index f0f28289..f7255629 100644 --- a/paket.lock +++ b/paket.lock @@ -29,6 +29,7 @@ NUGET System.Security.Cryptography.Algorithms (>= 4.2) System.Security.Cryptography.Csp (>= 4.0) System.Threading (>= 4.0.11) + NuGet.CommandLine (3.5) System.Collections (4.3) System.Collections.Immutable (1.3.1) System.IO.FileSystem (4.3) @@ -49,4 +50,3 @@ GROUP build NUGET remote: https://www.nuget.org/api/v2 FAKE (4.48) - NuGet.CommandLine (3.5) From e084eb2f08c881b5bf0f95471198e90e652912da Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 27 Feb 2017 23:10:36 +1000 Subject: [PATCH 37/43] Add ulimit hack for osx restore --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index a6ff1371..ea670fc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,11 @@ env: install: + # See details at https://github.com/NuGet/Home/issues/2163 + # this may be required because of an underlying bug, and the fact that weekly + # use an extra nuget.config source. + - ulimit -n 512 + - rvm install 2.2.3 - gem install bundler - export DOTNET_INSTALL_DIR="$PWD/.dotnetcli" From ec02d07496555b4a579effea85c9c24393612bee Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Mon, 27 Feb 2017 23:21:05 +1000 Subject: [PATCH 38/43] increase ulimit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea670fc5..51a134b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ install: # See details at https://github.com/NuGet/Home/issues/2163 # this may be required because of an underlying bug, and the fact that weekly # use an extra nuget.config source. - - ulimit -n 512 + - ulimit -n 2048 - rvm install 2.2.3 - gem install bundler From e5094f1632c69484ce6c78c4f2c05aadc4ec2eee Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Tue, 28 Feb 2017 06:47:35 +1000 Subject: [PATCH 39/43] Improved ulimit comment --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51a134b6..0fca8e0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ env: install: # See details at https://github.com/NuGet/Home/issues/2163 - # this may be required because of an underlying bug, and the fact that weekly - # use an extra nuget.config source. + # this may be required because of an underlying bug in mono. It may + # also be induced by us because we have an extra nuget.config source. - ulimit -n 2048 - rvm install 2.2.3 From aa9b3b870a5d1074a46a136a27cfca441ee05406 Mon Sep 17 00:00:00 2001 From: Jared Hester Date: Mon, 27 Feb 2017 16:10:59 -0500 Subject: [PATCH 40/43] fix logary hash --- paket.dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paket.dependencies b/paket.dependencies index 2e5de765..04b2e8e6 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,7 +1,7 @@ source https://nuget.org/api/v2 framework: net45 -github logary/logary src/Logary.Facade/Facade.fs 4b21d888e83d72d1238ab0f36110e2a3946240e7 +github logary/logary src/Logary.Facade/Facade.fs 0fbb7829b9d4b62f9ffd10d7a4b20d075c6cccc6 nuget Argu = 3.2 nuget FsCheck = 2.7.1 From 238cf967f0fc87c03bc8bf73b3025e16eb64f860 Mon Sep 17 00:00:00 2001 From: Jared Hester Date: Mon, 27 Feb 2017 16:17:24 -0500 Subject: [PATCH 41/43] dependency update --- .paket/Paket.Restore.targets | 40 ++++++++++++++++--- .../Expecto.BenchmarkDotNet.fsproj | 10 ++--- Expecto.Tests/Expecto.Tests.fsproj | 10 ++--- .../Expecto.netcore.Tests.fsproj | 12 ++---- Expecto.netcore/Expecto.netcore.fsproj | 5 +-- Expecto.sln | 6 +-- Expecto/Expecto.fsproj | 12 +++--- paket.lock | 2 +- 8 files changed, 59 insertions(+), 38 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 691e3854..0b428e79 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -1,13 +1,21 @@ - true - - + true + $(MSBuildThisFileDirectory) + /Library/Frameworks/Mono.framework/Commands/mono + mono + + $(PaketRootPath)paket.exe + $(PaketToolsPath)paket.exe + "$(PaketExePath)" + $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" + + - + - \ No newline at end of file + + + + + + + + + <_PackageReferences Include="%(_PaketPackageReference.Identity)"> + $(TargetFramework) + + + + %(_PaketPackageReference.Version) + + + + + + diff --git a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj index ebee1512..5358ff56 100644 --- a/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj +++ b/Expecto.BenchmarkDotNet/Expecto.BenchmarkDotNet.fsproj @@ -76,17 +76,17 @@ - - ..\packages\BenchmarkDotNet.Core\lib\net45\BenchmarkDotNet.Core.dll - True - True - True True + + ..\packages\BenchmarkDotNet.Core\lib\net45\BenchmarkDotNet.Core.dll + True + True + diff --git a/Expecto.Tests/Expecto.Tests.fsproj b/Expecto.Tests/Expecto.Tests.fsproj index deea7a9d..8d1267d2 100644 --- a/Expecto.Tests/Expecto.Tests.fsproj +++ b/Expecto.Tests/Expecto.Tests.fsproj @@ -99,17 +99,17 @@ - - ..\packages\BenchmarkDotNet.Core\lib\net45\BenchmarkDotNet.Core.dll - True - True - True True + + ..\packages\BenchmarkDotNet.Core\lib\net45\BenchmarkDotNet.Core.dll + True + True + diff --git a/Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj b/Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj index 8426d3d4..899caad7 100755 --- a/Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj +++ b/Expecto.netcore.Tests/Expecto.netcore.Tests.fsproj @@ -1,10 +1,8 @@ - - + Expecto.netcore.Tests Expecto.netcore.Tests - Exe netcoreapp1.1 false @@ -13,7 +11,6 @@ $(DefineConstants) - @@ -26,14 +23,13 @@ - + - - - + + \ No newline at end of file diff --git a/Expecto.netcore/Expecto.netcore.fsproj b/Expecto.netcore/Expecto.netcore.fsproj index d2d4a156..1dc5b082 100644 --- a/Expecto.netcore/Expecto.netcore.fsproj +++ b/Expecto.netcore/Expecto.netcore.fsproj @@ -1,25 +1,22 @@ - Expecto netstandard1.6 - - - + \ No newline at end of file diff --git a/Expecto.sln b/Expecto.sln index 462e19f8..e294b40c 100644 --- a/Expecto.sln +++ b/Expecto.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26206.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{3786E131-11FB-4606-AFE0-5E6CDA744DD0}" ProjectSection(SolutionItems) = preProject @@ -28,7 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{1870 docker-build.sh = docker-build.sh Gemfile = Gemfile global.json = global.json - paket.dependencies = paket.dependencies Rakefile = Rakefile README.md = README.md Settings.FSharpLint = Settings.FSharpLint diff --git a/Expecto/Expecto.fsproj b/Expecto/Expecto.fsproj index 122c4aa4..8dad1624 100644 --- a/Expecto/Expecto.fsproj +++ b/Expecto/Expecto.fsproj @@ -1,4 +1,4 @@ - + Debug @@ -90,6 +90,11 @@ + + ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll + True + True + ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.Mdb.dll True @@ -105,11 +110,6 @@ True True - - ..\packages\Mono.Cecil\lib\net40\Mono.Cecil.dll - True - True - diff --git a/paket.lock b/paket.lock index f7255629..c4094403 100644 --- a/paket.lock +++ b/paket.lock @@ -45,7 +45,7 @@ NUGET System.Threading.Tasks.Extensions (4.3) GITHUB remote: logary/logary - src/Logary.Facade/Facade.fs (0fbb7829b9d4b62f9ffd10d7a4b20d075c6cccc6) 4b21d888e83d72d1238ab0f36110e2a3946240e7 + src/Logary.Facade/Facade.fs (0fbb7829b9d4b62f9ffd10d7a4b20d075c6cccc6) 0fbb7829b9d4b62f9ffd10d7a4b20d075c6cccc6 GROUP build NUGET remote: https://www.nuget.org/api/v2 From 3432af9246f3da83d2fc7f2d24aa165a988dae33 Mon Sep 17 00:00:00 2001 From: Jared Hester Date: Mon, 27 Feb 2017 16:28:26 -0500 Subject: [PATCH 42/43] only build automatically, don't run tests --- build.fsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.fsx b/build.fsx index 6c7950d2..34d3909b 100644 --- a/build.fsx +++ b/build.fsx @@ -97,4 +97,4 @@ Target "All" DoNothing "Build" ==> "All" "DotnetBuild" ==> "All" -RunTargetOrDefault "All" +RunTargetOrDefault "DotnetBuild" From 18a35a34a47d9f8f6489cec96e4138ce5d8361f2 Mon Sep 17 00:00:00 2001 From: Jared Hester Date: Mon, 27 Feb 2017 16:56:40 -0500 Subject: [PATCH 43/43] generate AssemblyVersionInfo --- appveyor.yml | 3 +-- build.fsx | 44 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1e66c2d6..d03a5e12 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,8 +18,7 @@ install: - dotnet --info build_script: - - bundle exec rake -# - cmd: build.cmd + - cmd: build.cmd "All" # artifacts: # - path: 'bin' diff --git a/build.fsx b/build.fsx index 34d3909b..73ae18c9 100644 --- a/build.fsx +++ b/build.fsx @@ -1,4 +1,4 @@ -#I @"packages/build/FAKE/tools/" +#I @"packages/build/FAKE/tools/" #r @"FakeLib.dll" System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__ open System @@ -18,6 +18,45 @@ let run cmd args dir = ) System.TimeSpan.MaxValue = false then failwithf "Error while running '%s' with args: %s" cmd args + +let project = "Expecto" +let summary = "A smooth unit test framework for F#" +let description = summary + +// List of author names (for NuGet package) +let authors = [ "Logibit AB" ] +let copyright = "(c) 2016 by Henrik Feldt, formerly Fuchu by @mausch" +// Tags for your project (for NuGet package) + +let version = { Major = 5; Minor = 0; Patch = 0 } + +open Fake.AssemblyInfoFile + +let genFSAssemblyInfo (projectPath) = + let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath) + let folderName = System.IO.Path.GetFileName(System.IO.Path.GetDirectoryName(projectPath)) + let basePath = folderName + let fileName = basePath @@ "AssemblyVersionInfo.fs" + CreateFSharpAssemblyInfo fileName [ + Attribute.Title (projectName) + Attribute.Product project + Attribute.Copyright copyright + Attribute.Company (authors |> String.concat ", ") + Attribute.Description summary + Attribute.Version <| string version + // Attribute.Version release.AssemblyVersion + // Attribute.FileVersion release.AssemblyVersion + // Attribute.InformationalVersion release.NugetVersion + ] + + +// Generate assembly info files with the right version & up-to-date information +Target "AssemblyInfo" (fun _ -> + let fsProjs = !! "./**/*.fsproj" |> Seq.filter (fun s -> not <| s.Contains "preview") + fsProjs |> Seq.iter genFSAssemblyInfo +) + + // -------------------------------------------------------------------------------------- // Rename Logary Facades for Expecto // (why this is necessary - https://github.com/logary/logary/#using-logary-in-a-library) @@ -88,7 +127,8 @@ Target "CreateNuGets" (fun _ -> Target "All" DoNothing -"ExpectoChangeo" +"AssemblyInfo" + ==> "ExpectoChangeo" ==> "Clean" ==> "Build" ==> "RunTests"