diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 8cb5986..3632ffe 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -20,7 +20,7 @@ proj assembly native - /Library/Frameworks/Mono.framework/Commands/mono + /Library/Frameworks/Mono.framework/Commands/mono mono @@ -28,74 +28,67 @@ $(PaketToolsPath)paket.bootstrapper.exe $([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\ - "$(PaketBootStrapperExePath)" + "$(PaketBootStrapperExePath)" $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" + + + + true + true + True - - False - $(BaseIntermediateOutputPath.TrimEnd('\').TrimEnd('\/')) - - + - - - - $(PaketRootPath)paket - $(PaketToolsPath)paket - + + + + + - - - - $(PaketRootPath)paket.exe - $(PaketToolsPath)paket.exe + + + dotnet paket - - - - <_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 - + + + + $(PaketRootPath)paket.exe + $(PaketToolsPath)paket.exe + $(PaketToolsPath)paket.exe + $(_PaketBootStrapperExeDir)paket.exe + paket.exe - - - - - + + $(PaketRootPath)paket + $(PaketToolsPath)paket + $(PaketToolsPath)paket - - - <_PaketCommand>dotnet paket - + + $(PaketRootPath)paket.exe + $(PaketToolsPath)paket.exe - - - - $(PaketToolsPath)paket - $(PaketBootStrapperExeDir)paket + + $(PaketBootStrapperExeDir)paket.exe - - 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)" + dotnet "$(PaketExePath)" + $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" + "$(PaketExePath)" + - + diff --git a/CHANGELOG.md b/CHANGELOG.md index 911d99d..db0227d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 0.11.1 - 07.04.2020 +* Fix for once generator running even if not found (by [@sasmithjr](https://github.com/sasmithjr) +* Use exceptions .ToString() when printing error (by [@robertpi](https://github.com/robertpi) + ### 0.11.0 - 02.03.2020 * Add a port argument to the watch command (by [@toburger](https://github.com/toburger) * Collect and propogate loader errors (by [@jbeeko](https://github.com/jbeeko) diff --git a/src/Fornax.Core/AssemblyInfo.fs b/src/Fornax.Core/AssemblyInfo.fs index cb95ad6..4d2de5f 100644 --- a/src/Fornax.Core/AssemblyInfo.fs +++ b/src/Fornax.Core/AssemblyInfo.fs @@ -5,13 +5,13 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "Fornax.Core" let [] AssemblyProduct = "Fornax" let [] AssemblyDescription = "Fornax is a static site generator using type safe F# DSL to define page layouts" - let [] AssemblyVersion = "0.11.0" - let [] AssemblyFileVersion = "0.11.0" + let [] AssemblyVersion = "0.11.1" + let [] AssemblyFileVersion = "0.11.1" diff --git a/src/Fornax/AssemblyInfo.fs b/src/Fornax/AssemblyInfo.fs index c08b60d..5d9119b 100644 --- a/src/Fornax/AssemblyInfo.fs +++ b/src/Fornax/AssemblyInfo.fs @@ -5,13 +5,13 @@ open System.Reflection [] [] [] -[] -[] +[] +[] do () module internal AssemblyVersionInformation = let [] AssemblyTitle = "Fornax" let [] AssemblyProduct = "Fornax" let [] AssemblyDescription = "Fornax is a static site generator using type safe F# DSL to define page layouts" - let [] AssemblyVersion = "0.11.0" - let [] AssemblyFileVersion = "0.11.0" + let [] AssemblyVersion = "0.11.1" + let [] AssemblyFileVersion = "0.11.1"