diff --git a/.gitignore b/.gitignore
index e3dde4d0..02f9b147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,3 +160,4 @@ release.cmd
docs/tools/FSharp.Formatting.svclog
docs/tools/XmlWriter
+project.lock.json
diff --git a/appveyor.yml b/appveyor.yml
index faff022a..37e821f3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,27 @@
init:
- git config --global core.autocrlf input
+
+install:
+ # Download install script to install .NET cli in .dotnet dir
+ - ps: $env:CLI_VERSION = "1.0.0-beta-002071"
+ - ps: mkdir -Force ".\scripts\obtain\" | Out-Null
+ - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1" -OutFile ".\scripts\obtain\install.ps1"
+ - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
+ - ps: '& .\scripts\obtain\install.ps1 -Channel "preview" -version "$env:CLI_VERSION" -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath'
+ # add dotnet to PATH
+ - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+ # dotnet info
+ - ps: dotnet --info
+
build_script:
- cmd: ./build.cmd CI
+ # build and create package
+ - ps: dotnet restore
+ - ps: cd src\FsCheck
+ - ps: dotnet pack --configuration Release
+
test: off
version: '{build}'
artifacts:
- - path: bin\*.nupkg
\ No newline at end of file
+ - path: bin\*.nupkg
+ - path: src\FsCheck\bin\Release\*.nupkg
diff --git a/src/FsCheck.Dotnetcli.Tests/NuGet.Config b/src/FsCheck.Dotnetcli.Tests/NuGet.Config
new file mode 100644
index 00000000..3f788a5d
--- /dev/null
+++ b/src/FsCheck.Dotnetcli.Tests/NuGet.Config
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/FsCheck.Dotnetcli.Tests/Program.fs b/src/FsCheck.Dotnetcli.Tests/Program.fs
new file mode 100644
index 00000000..19a72f95
--- /dev/null
+++ b/src/FsCheck.Dotnetcli.Tests/Program.fs
@@ -0,0 +1,16 @@
+// Learn more about F# at http://fsharp.org
+
+open System
+
+open FsCheck
+
+[]
+let main argv =
+ printfn "Hello World!"
+ printfn "%A" argv
+
+ let revRevIsOrig (xs:list) = List.rev(List.rev xs) = xs
+
+ Check.Quick revRevIsOrig
+
+ 0 // return an integer exit code
diff --git a/src/FsCheck.Dotnetcli.Tests/project.json b/src/FsCheck.Dotnetcli.Tests/project.json
new file mode 100644
index 00000000..dc94399a
--- /dev/null
+++ b/src/FsCheck.Dotnetcli.Tests/project.json
@@ -0,0 +1,30 @@
+{
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "compilerName": "fsc",
+ "compileFiles": [
+ "Program.fs"
+ ],
+ "frameworks": {
+ "netstandard1.5" : {
+ "dependencies": {
+ "FsCheck": { "version": "1.0.0", "type": "build" },
+ "Microsoft.NETCore.App": {
+ "type": "platform",
+ "version": "1.0.0-rc2-23925"
+ }
+ },
+ "imports": [
+ "portable-net45+win8",
+ "dnxcore50"
+ ]
+ },
+ "net46" : {
+ "dependencies": {
+ "FsCheck": { "version": "1.0.0", "type": "build" }
+ }
+ }
+ }
+}
diff --git a/src/FsCheck/Arbitrary.fs b/src/FsCheck/Arbitrary.fs
index 9215c078..6e33ee16 100644
--- a/src/FsCheck/Arbitrary.fs
+++ b/src/FsCheck/Arbitrary.fs
@@ -766,7 +766,7 @@ module Arb =
|> convert (fun x -> x :> IDictionary<_,_>) (fun x -> x :?> Dictionary<_,_>)
static member Culture() =
-#if PCL
+#if PCL || NETSTANDARD1_5
let cultureNames = [
"af"; "af-ZA";
"am"; "am-ET";
diff --git a/src/FsCheck/NuGet.Config b/src/FsCheck/NuGet.Config
new file mode 100644
index 00000000..3f788a5d
--- /dev/null
+++ b/src/FsCheck/NuGet.Config
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/FsCheck/project.json b/src/FsCheck/project.json
new file mode 100644
index 00000000..f33366a5
--- /dev/null
+++ b/src/FsCheck/project.json
@@ -0,0 +1,47 @@
+{
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ },
+ "compilerName": "fsc",
+ "compileFiles": [
+ "AssemblyInfo.fs",
+ "Common.fs",
+ "Random.fs",
+ "Reflect.fs",
+ "TypeClass.fs",
+ "Gen.fs",
+ "ReflectArbitrary.fs",
+ "Arbitrary.fs",
+ "ArbitraryExtensions.fs",
+ "GenExtensions.fs",
+ "Testable.fs",
+ "Prop.fs",
+ "PropExtensions.fs",
+ "Commands.fs",
+ "StateMachine.fs",
+ "Runner.fs",
+ "RunnerExtensions.fs"
+ ],
+ "frameworks": {
+ "net46": {
+ "dependencies": {
+ "FSharp.Core": "4.0.0.1"
+ },
+ "frameworkAssemblies": {
+ "System": "",
+ "System.Core": "",
+ "System.Numerics": ""
+ }
+ },
+ "netstandard1.5": {
+ "dependencies": {
+ "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160316",
+ "NETStandard.Library": "1.5.0-rc2-23925"
+ },
+ "imports": [
+ "portable-net45+win8",
+ "dnxcore50"
+ ]
+ }
+ }
+}