Support for netstandard1.6 and .NET Core

.paket/Paket.Restore.targets

@@ -1,13 +1,21 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- Mark that this target file has been loaded.  -->
-    <IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded>    
-  </PropertyGroup>
-
+    <IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded>
+    <PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
+    <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
+    <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath> 
+    <!-- Paket command -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
+    <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+  </PropertyGroup>    
+
   <UsingTask TaskName="Paket.Build.Tasks.PaketRestoreTask" AssemblyFile="PaketRestoreTask.dll" />
 
   <Target Name="PaketRestore" BeforeTargets="_GenerateRestoreGraphWalkPerFramework" >
-    <Exec Command="$(MSBuildThisFileDirectory)\paket.exe restore --project $(MSBuildProjectFullPath)" />
+    <Exec Command="$(PaketCommand) restore --project $(MSBuildProjectFullPath)" />
 
      <!-- Write out package references for NETCore -->
     <PaketRestoreTask
@@ -18,4 +26,26 @@
       <Output TaskParameter="AlternativeConfigFile" ItemName="RestoreConfigFile" />        
     </PaketRestoreTask>
    </Target>
-</Project>
+
+   <Target Name="FixPackRef" AfterTargets="_WalkEachTargetPerFramework" Returns="@(_PackageReferences)">
+      <!-- Write out package references for NETCore -->
+      <PaketRestoreTask
+        ProjectUniqueName="$(MSBuildProjectFullPath)"
+        PackageReferences="@(PackageReference)"
+        TargetFrameworks="$(TargetFramework)">
+        <Output TaskParameter="NewPackageReferences" ItemName="_PaketPackageReference" />
+        <Output TaskParameter="AlternativeConfigFile" ItemName="RestoreConfigFile2" />
+      </PaketRestoreTask>
+      <ItemGroup>
+        <_PackageReferences Include="%(_PaketPackageReference.Identity)">
+          <TargetFramework>$(TargetFramework)</TargetFramework>
+          <IncludeAssets></IncludeAssets>
+          <ExcludeAssets></ExcludeAssets>
+          <PrivateAssets></PrivateAssets>
+          <Version>%(_PaketPackageReference.Version)</Version>
+        </_PackageReferences>
+      </ItemGroup>
+
+    </Target>
+
+</Project>

.semver

@@ -1,6 +1,6 @@
 ---
-:major: 4
+:major: 5
 :minor: 0
-:patch: 3
-:special: ''
+:patch: 0
+:special: 'beta'
 :metadata: ''

.travis.yml

@@ -2,20 +2,41 @@
 language: csharp
 
 mono:
- - 4.6.1
- - 4.8.0
- - latest # => "stable release"
- - weekly # => "latest commits"
+  - 4.6.1
+  - 4.8.0
+  - weekly # => "stable release"
+  - latest # => "latest commits"
 
+os:
+  - osx
+  - linux
+
+dist: trusty
+sudo: required
+
+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
+  # See details at https://github.com/NuGet/Home/issues/2163
+  # 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
+  - 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:
+  fast_finish: true # just fail immediately if at least one job fails
   allow_failures:
     - mono: latest
     - mono: weekly

.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}"
         }
     ]
 }

.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"
         }
     ]
 }