diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index 8839ec3..8cb5986 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -5,84 +5,184 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+
+ $(MSBuildVersion)
+ 15.0.0
+ false
+ true
true
$(MSBuildThisFileDirectory)
$(MSBuildThisFileDirectory)..\
$(PaketRootPath)paket-files\paket.restore.cached
$(PaketRootPath)paket.lock
- /Library/Frameworks/Mono.framework/Commands/mono
+ classic
+ proj
+ assembly
+ native
+ /Library/Frameworks/Mono.framework/Commands/mono
mono
-
- $(PaketRootPath)paket.exe
- $(PaketToolsPath)paket.exe
- "$(PaketExePath)"
- $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"
-
-
- <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))
- dotnet "$(PaketExePath)"
-
-
- "$(PaketExePath)"
+
$(PaketRootPath)paket.bootstrapper.exe
$(PaketToolsPath)paket.bootstrapper.exe
- "$(PaketBootStrapperExePath)"
+ $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\
+
+ "$(PaketBootStrapperExePath)"
$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"
-
-
-
- true
- true
+
+ True
+
+
+ False
+
+ $(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/'))
-
+
+
+
+
+
+
+ $(PaketRootPath)paket
+ $(PaketToolsPath)paket
+
-
+
- true
- $(NoWarn);NU1603
+
+ $(PaketRootPath)paket.exe
+ $(PaketToolsPath)paket.exe
-
-
- /usr/bin/shasum "$(PaketRestoreCacheFile)" | /usr/bin/awk '{ print $1 }'
- /usr/bin/shasum "$(PaketLockFilePath)" | /usr/bin/awk '{ print $1 }'
+
+
+
+ <_DotnetToolsJson Condition="Exists('$(PaketRootPath)/.config/dotnet-tools.json')">$([System.IO.File]::ReadAllText("$(PaketRootPath)/.config/dotnet-tools.json"))
+ <_ConfigContainsPaket Condition=" '$(_DotnetToolsJson)' != ''">$(_DotnetToolsJson.Contains('"paket"'))
+ <_ConfigContainsPaket Condition=" '$(_ConfigContainsPaket)' == ''">false
-
-
-
-
-
-
+
+
+
+
-
-
- $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))
- $([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))
+
+
+ <_PaketCommand>dotnet paket
+
+
+
+
+
+ $(PaketToolsPath)paket
+ $(PaketBootStrapperExeDir)paket
+
+
+ paket
+
+
+
+
+ <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))
+ <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"
+ <_PaketCommand Condition=" '$(_PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"
+ <_PaketCommand Condition=" '$(_PaketCommand)' == '' ">"$(PaketExePath)"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
- false
+ $(NoWarn);NU1603;NU1604;NU1605;NU1608
+ false
+ true
+
+
+
+
+
+
+
+
+ $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))
+
+
+
+
+
+
+ $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[0].Replace(`"`, ``).Replace(` `, ``))
+ $([System.Text.RegularExpressions.Regex]::Split(`%(Identity)`, `": "`)[1].Replace(`"`, ``).Replace(` `, ``))
+
+
+
+
+ %(PaketRestoreCachedKeyValue.Value)
+ %(PaketRestoreCachedKeyValue.Value)
+
+
+
+
+ true
+ false
true
-
-
-
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- $(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached
+ $(PaketIntermediateOutputPath)\$(MSBuildProjectFile).paket.references.cached
$(MSBuildProjectFullPath).paket.references
$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references
$(MSBuildProjectDirectory)\paket.references
- $(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).$(TargetFramework).paket.resolved
+
+ false
+ true
true
references-file-or-cache-not-found
@@ -101,38 +201,49 @@
-
+
true
- target-framework '$(TargetFramework)'
+ target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths)
-
+
+
+
-
+
+ false
+ true
+
+
-
+
-
+
+ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])
+ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])
%(PaketReferencesFileLinesInfo.PackageVersion)
- All
- runtime
+ All
+ runtime
+ runtime
+ true
+ true
- $(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).paket.clitools
+ $(PaketIntermediateOutputPath)/$(MSBuildProjectFile).paket.clitools
@@ -151,44 +262,144 @@
-
+
false
-
+
- <_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/>
+ <_NuspecFilesNewLocation Include="$(PaketIntermediateOutputPath)\$(Configuration)\*.nuspec"/>
+
+
$(MSBuildProjectDirectory)/$(MSBuildProjectFile)
true
- false
- true
- $(BaseIntermediateOutputPath)$(Configuration)
- $(BaseIntermediateOutputPath)
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(PaketIntermediateOutputPath)\$(Configuration)
+ $(PaketIntermediateOutputPath)
- <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/>
+ <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/>
-
+
+
+
-
-
+
+
+
+
-
+
+ 1.1.0
+ Apache-2.0
+ $(VersionPrefix)$(VersionSuffix)
+ $(VersionPrefix)
+ 1.0.0.0
+ $(AssemblyVersion)
+ Mauricio Scheffer
+ https://github.com/mausch/fuchu
+ https://github.com/mausch/fuchu.git
+
+
+
+ /usr
+ /Library/Frameworks/Mono.framework/Versions/Current
+ $(MonoRoot)/lib/mono
+ true
+ $(MonoLibFolder)/4.5-api
+ $(MonoLibFolder)/4.5.1-api
+ $(MonoLibFolder)/4.5.2-api
+ $(MonoLibFolder)/4.6-api
+ $(MonoLibFolder)/4.6.1-api
+ $(MonoLibFolder)/4.6.2-api
+ $(MonoLibFolder)/4.7-api
+ $(MonoLibFolder)/4.7.1-api
+ $(MonoLibFolder)/4.7.2-api
+
+
+
\ No newline at end of file
diff --git a/Fuchu.FsCheck/AssemblyInfo.fs b/Fuchu.FsCheck/AssemblyInfo.fs
index b76e360..306fa9c 100644
--- a/Fuchu.FsCheck/AssemblyInfo.fs
+++ b/Fuchu.FsCheck/AssemblyInfo.fs
@@ -3,17 +3,17 @@ namespace System
open System.Reflection
[]
-[]
+[]
[]
[]
[]
-[]
+[]
do ()
module internal AssemblyVersionInformation =
let [] AssemblyVersion = "1.0.0.0"
- let [] AssemblyFileVersion = "1.0.3.0"
+ let [] AssemblyFileVersion = "1.1.0.0"
let [] AssemblyTitle = "Fuchu.FsCheck"
let [] AssemblyProduct = "Fuchu.FsCheck"
let [] AssemblyDescription = "Integrates Fuchu with FsCheck"
- let [] AssemblyCopyright = "Copyright Mauricio Scheffer 2018"
+ let [] AssemblyCopyright = "Copyright Mauricio Scheffer 2019"
diff --git a/Fuchu.MbUnit/AssemblyInfo.fs b/Fuchu.MbUnit/AssemblyInfo.fs
index 236bf94..7fef566 100644
--- a/Fuchu.MbUnit/AssemblyInfo.fs
+++ b/Fuchu.MbUnit/AssemblyInfo.fs
@@ -4,18 +4,18 @@ open System.Reflection
[]
[]
-[]
+[]
[]
[]
[]
-[]
+[]
do ()
module internal AssemblyVersionInformation =
let [] AssemblyKeyFile = "../Fuchu.snk"
let [] AssemblyVersion = "1.0.0.0"
- let [] AssemblyFileVersion = "1.0.3.0"
+ let [] AssemblyFileVersion = "1.1.0.0"
let [] AssemblyTitle = "Fuchu.MbUnit"
let [] AssemblyProduct = "Fuchu.MbUnit"
let [] AssemblyDescription = "Converts Fuchu tests to MbUnit tests"
- let [] AssemblyCopyright = "Copyright Mauricio Scheffer 2018"
+ let [] AssemblyCopyright = "Copyright Mauricio Scheffer 2019"
diff --git a/Fuchu.PerfUtil/AssemblyInfo.fs b/Fuchu.PerfUtil/AssemblyInfo.fs
index e87410e..e9d4ee1 100644
--- a/Fuchu.PerfUtil/AssemblyInfo.fs
+++ b/Fuchu.PerfUtil/AssemblyInfo.fs
@@ -3,17 +3,17 @@ namespace System
open System.Reflection
[]
-[]
+[]
[]
[]
[]
-[]
+[]
do ()
module internal AssemblyVersionInformation =
let [] AssemblyVersion = "1.0.0.0"
- let [] AssemblyFileVersion = "1.0.3.0"
+ let [] AssemblyFileVersion = "1.1.0.0"
let [] AssemblyTitle = "Fuchu.PerfUtil"
let [] AssemblyProduct = "Fuchu.PerfUtil"
let [] AssemblyDescription = "Integrates Fuchu with PerfUtil"
- let [] AssemblyCopyright = "Copyright Henrik Feldt 2018"
+ let [] AssemblyCopyright = "Copyright Henrik Feldt 2019"
diff --git a/Fuchu/AssemblyInfo.fs b/Fuchu/AssemblyInfo.fs
index 5ba4127..bdf596f 100644
--- a/Fuchu/AssemblyInfo.fs
+++ b/Fuchu/AssemblyInfo.fs
@@ -4,18 +4,18 @@ open System.Reflection
[]
[]
-[]
+[]
[]
[]
[]
-[]
+[]
do ()
module internal AssemblyVersionInformation =
let [] AssemblyKeyFile = "../Fuchu.snk"
let [] AssemblyVersion = "1.0.0.0"
- let [] AssemblyFileVersion = "1.0.3.0"
+ let [] AssemblyFileVersion = "1.1.0.0"
let [] AssemblyTitle = "Fuchu"
let [] AssemblyProduct = "Fuchu"
let [] AssemblyDescription = "Functional test library"
- let [] AssemblyCopyright = "Copyright Mauricio Scheffer 2018"
+ let [] AssemblyCopyright = "Copyright Mauricio Scheffer 2019"
diff --git a/Fuchu/Fuchu.fsproj b/Fuchu/Fuchu.fsproj
index 02eb037..9ac9de9 100644
--- a/Fuchu/Fuchu.fsproj
+++ b/Fuchu/Fuchu.fsproj
@@ -15,7 +15,6 @@
-
diff --git a/build.fsx b/build.fsx
index 2ab28d3..328f9b6 100644
--- a/build.fsx
+++ b/build.fsx
@@ -6,7 +6,7 @@ open System
open Fake
open Fake.AssemblyInfoFile
-let version = "1.0.3.0"
+let version = "1.1.0.0"
let assemblyVersion = "1.0.0.0"
type Package = {