From c9a0e8a0b04e59fc45e399f718c540618a3de18c Mon Sep 17 00:00:00 2001 From: Sylvan Clebsch Date: Mon, 17 Oct 2016 17:37:19 +0100 Subject: [PATCH 1/4] Update dependencies and pin to AsyncIO 0.1.20.0 for NetMQ --- .gitignore | 1 - build.cmd | 2 +- build.sh | 2 +- paket.dependencies | 1 + paket.lock | 47 +++++++++++++++++++ src/IfSharp.Kernel/AssemblyInfo.fs | 7 ++- src/IfSharp.Kernel/FsCompiler.fs | 4 +- src/IfSharp.Kernel/IfSharp.Kernel.fsproj | 5 ++ src/IfSharpConsole/IfSharpConsole.csproj | 5 ++ .../IfSharp.Kernel.Tests.fsproj | 5 ++ 10 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 paket.lock diff --git a/.gitignore b/.gitignore index 86f7cb9..0cacf5e 100644 --- a/.gitignore +++ b/.gitignore @@ -175,5 +175,4 @@ temp/ # Test results produced by build TestResults.xml .paket/paket.exe -paket.lock diff --git a/build.cmd b/build.cmd index af13fe2..79c3cd5 100644 --- a/build.cmd +++ b/build.cmd @@ -6,7 +6,7 @@ if errorlevel 1 ( exit /b %errorlevel% ) -.paket\paket.exe install +.paket\paket.exe restore if errorlevel 1 ( exit /b %errorlevel% ) diff --git a/build.sh b/build.sh index 64985d8..5b11f81 100755 --- a/build.sh +++ b/build.sh @@ -20,7 +20,7 @@ if [ ! -f packages/FAKE/tools/FAKE.exe ]; then exit $exit_code fi fi -${EXE} ${PREFIX}/.paket/paket.exe install +${EXE} ${PREFIX}/.paket/paket.exe restore exit_code=$? if [ $exit_code -ne 0 ]; then exit $exit_code diff --git a/paket.dependencies b/paket.dependencies index 80e64c1..d7d37e4 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -2,6 +2,7 @@ framework: >= net451 source https://www.nuget.org/api/v2 nuget FSharp.Compiler.Service +nuget AsyncIO = 0.1.20.0 nuget NetMQ nuget Newtonsoft.Json nuget FAKE diff --git a/paket.lock b/paket.lock new file mode 100644 index 0000000..3194520 --- /dev/null +++ b/paket.lock @@ -0,0 +1,47 @@ +FRAMEWORK: >= NET451 +NUGET + remote: https://www.nuget.org/api/v2 + AsyncIO (0.1.20) + Chessie (0.6) + FSharp.Core + FAKE (4.41.6) + FSharp.Compiler.Service (8.0) + System.Collections.Immutable (>= 1.2) + System.Reflection.Metadata (>= 1.4.1-beta-24227-04) + FSharp.Core (4.0.0.1) + Mono.Cecil (0.9.6.4) + NetMQ (3.3.3.4) + AsyncIO (>= 0.1.20) + Newtonsoft.Json (9.0.1) + Paket.Core (3.23.2) + Chessie (>= 0.6) + FSharp.Core + Mono.Cecil + Newtonsoft.Json + System.Collections.Immutable (1.2) + System.Reflection.Metadata (1.4.1-beta-24430-01) + System.Collections.Immutable (>= 1.2) + xunit (2.1) + xunit.assert (2.1) + xunit.core (2.1) + xunit.abstractions (2.0) + xunit.assert (2.1) + xunit.core (2.1) + xunit.extensibility.core (2.1) + xunit.extensibility.execution (2.1) + xunit.extensibility.core (2.1) + xunit.abstractions (2.0) + xunit.extensibility.execution (2.1) + xunit.extensibility.core (2.1) + xunit.runner.console (2.1) + +GROUP Docs +FRAMEWORK: >= NET451 +NUGET + remote: https://www.nuget.org/api/v2 + FSharp.Compiler.Service (2.0.0.6) + FSharp.Formatting (2.14.4) + FSharp.Compiler.Service (2.0.0.6) + FSharpVSPowerTools.Core (>= 2.3 < 2.4) + FSharpVSPowerTools.Core (2.3) + FSharp.Compiler.Service (>= 2.0.0.3) diff --git a/src/IfSharp.Kernel/AssemblyInfo.fs b/src/IfSharp.Kernel/AssemblyInfo.fs index 7a95860..f514221 100644 --- a/src/IfSharp.Kernel/AssemblyInfo.fs +++ b/src/IfSharp.Kernel/AssemblyInfo.fs @@ -10,5 +10,8 @@ open System.Reflection do () module internal AssemblyVersionInformation = - let [] Version = "2.0.2" - let [] InformationalVersion = "2.0.2" + let [] AssemblyTitle = "IfSharp.Kernel" + let [] AssemblyProduct = "IfSharp.Kernel" + let [] AssemblyDescription = "A short summary of your project." + let [] AssemblyVersion = "2.0.2" + let [] AssemblyFileVersion = "2.0.2" diff --git a/src/IfSharp.Kernel/FsCompiler.fs b/src/IfSharp.Kernel/FsCompiler.fs index 74fd288..e7c35bf 100644 --- a/src/IfSharp.Kernel/FsCompiler.fs +++ b/src/IfSharp.Kernel/FsCompiler.fs @@ -130,7 +130,7 @@ module FsCompilerInternals = /// Tries to figure out the names to pass to GetDeclarations or GetMethods. let extractNames (line, charIndex) = - let sourceTok = SourceTokenizer([], "/home/test.fsx") + let sourceTok = SourceTokenizer([], Some "/home/test.fsx") let tokenizer = sourceTok.CreateLineTokenizer(line) let rec gatherTokens (tokenizer:FSharpLineTokenizer) state = seq { @@ -325,7 +325,7 @@ type FsCompiler (executingDirectory : string) = /// Tries to figure out the names to pass to GetDeclarations or GetMethods. member this.ExtractNames (line, charIndex) = - let sourceTok = SourceTokenizer([], "/home/test.fsx") + let sourceTok = SourceTokenizer([], Some "/home/test.fsx") let tokenizer = sourceTok.CreateLineTokenizer(line) let rec gatherTokens (tokenizer:FSharpLineTokenizer) state = seq { diff --git a/src/IfSharp.Kernel/IfSharp.Kernel.fsproj b/src/IfSharp.Kernel/IfSharp.Kernel.fsproj index 9eee035..9200aee 100644 --- a/src/IfSharp.Kernel/IfSharp.Kernel.fsproj +++ b/src/IfSharp.Kernel/IfSharp.Kernel.fsproj @@ -148,6 +148,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True diff --git a/src/IfSharpConsole/IfSharpConsole.csproj b/src/IfSharpConsole/IfSharpConsole.csproj index 3c5d3a4..1a015f3 100644 --- a/src/IfSharpConsole/IfSharpConsole.csproj +++ b/src/IfSharpConsole/IfSharpConsole.csproj @@ -130,6 +130,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True diff --git a/tests/IfSharp.Kernel.Tests/IfSharp.Kernel.Tests.fsproj b/tests/IfSharp.Kernel.Tests/IfSharp.Kernel.Tests.fsproj index 5f5b17c..f6946cf 100644 --- a/tests/IfSharp.Kernel.Tests/IfSharp.Kernel.Tests.fsproj +++ b/tests/IfSharp.Kernel.Tests/IfSharp.Kernel.Tests.fsproj @@ -126,6 +126,11 @@ + + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.MSBuild.v12.dll + True + True + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll True From fb227772ca82ffb6b4e53455f15423ba209512fc Mon Sep 17 00:00:00 2001 From: Sylvan Clebsch Date: Tue, 18 Oct 2016 09:13:48 +0100 Subject: [PATCH 2/4] Update Dockerfile --- Dockerfile | 80 ++++++++++++++++++++---------------------------------- 1 file changed, 30 insertions(+), 50 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1041ac1..95c4007 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,58 +1,38 @@ -FROM mono:4.2.3.4 +FROM ubuntu:16.04 + +RUN apt-key adv \ + --keyserver hkp://keyserver.ubuntu.com:80 \ + --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \ + && echo "deb http://download.mono-project.com/repo/debian wheezy main" | \ + tee /etc/apt/sources.list.d/mono-xamarin.list \ + && apt-get update \ + && apt-get install -y \ + mono-complete \ + fsharp \ + python3-pip \ + git \ + && rm -rf /var/lib/apt/lists/* + +RUN pip3 install --upgrade pip && pip3 install jupyter -RUN apt-get update && apt-get install -y wget git - -# We now remove all python traces; this uninstalls the mono packages... -RUN apt-get purge -y python \ - python2.7 \ - python2.7-minimal -# purge does not remove everything -RUN find / -name python* | xargs rm -rf - -# Python 3.4 dependencies -RUN apt-get install -y build-essential \ - libncurses5-dev libncursesw5-dev libreadline6-dev \ - libdb5.1-dev libgdbm-dev libsqlite3-dev libssl-dev \ - libbz2-dev libexpat1-dev liblzma-dev zlib1g-dev - -# Install Python and pip from binaries, then Jupyter via pip -WORKDIR /tmp -RUN wget https://www.python.org/ftp/python/3.4.4/Python-3.4.4.tgz -RUN tar -zxf Python-3.4.4.tgz -WORKDIR Python-3.4.4 -RUN ./configure --prefix=/usr/local/opt/python-3.4.4 -RUN make -RUN make install -WORKDIR /tmp -RUN rm -rf Python-3.4.4 -RUN rm Python-3.4.4.tgz - -# We make this Python installation visible in the system -env PATH /usr/local/opt/python-3.4.4/bin:$PATH - -RUN pip3 install jupyter - - -# reinstall mono (this will pull down again some Python 2.7 dependencies, but won't break the install) -RUN apt-get install -y mono-devel ca-certificates-mono fsharp mono-vbnc nuget - -RUN apt-get install unzip - -# Get and install the IfSharp kernel -RUN mkdir -p /usr/local/opt/ifsharp -WORKDIR /usr/local/opt/ifsharp -RUN wget https://github.com/fsprojects/IfSharp/releases/download/v3.0.0-alpha2/IfSharp.v3.0.0-alpha2.zip -RUN unzip IfSharp.v3.0.0-alpha2.zip -RUN rm IfSharp.v3.0.0-alpha2.zip -RUN mono ifsharp.exe +WORKDIR / +RUN git clone https://github.com/fsprojects/IfSharp.git -# How we communicate with the IfSharp kernel -EXPOSE 8888 +WORKDIR /IfSharp +RUN git checkout jupyter +RUN ./build.sh +RUN mono bin/ifsharp.exe --install WORKDIR / RUN mkdir notebooks VOLUME notebooks +EXPOSE 8888 -ENTRYPOINT ["jupyter-notebook", "--no-browser", "--ip='*'", "--notebook-dir=/notebooks", "--config=/root/.local/share/jupyter/kernels/ifsharp/ipython_config.py"] - +ENTRYPOINT ["jupyter", \ + "notebook", \ + "--no-browser", \ + "--ip='*'", \ + "--port=8888", \ + "--notebook-dir=/notebooks" \ + ] From addbf7d120d2ef7a158da42db4fcaed6fdff7e63 Mon Sep 17 00:00:00 2001 From: Sylvan Clebsch Date: Tue, 18 Oct 2016 11:37:37 +0100 Subject: [PATCH 3/4] Fix warnings and pin XPlot.Plotly to prevent Newtonsoft.JSON conflicts --- src/IfSharp.Kernel/FsCompiler.fs | 6 +- src/IfSharp.Kernel/Kernel.fs | 15 +- src/IfSharp.Kernel/helpers/Paket.fsx | 40 ++- .../helpers/XPlot.Plotly.Paket.fsx | 2 +- src/IfSharp.Kernel/helpers/paket.lock | 252 ------------------ 5 files changed, 40 insertions(+), 275 deletions(-) diff --git a/src/IfSharp.Kernel/FsCompiler.fs b/src/IfSharp.Kernel/FsCompiler.fs index e7c35bf..3cf163a 100644 --- a/src/IfSharp.Kernel/FsCompiler.fs +++ b/src/IfSharp.Kernel/FsCompiler.fs @@ -105,6 +105,8 @@ module FsCompilerInternals = | FSharpToolTipElement.None -> () | FSharpToolTipElement.Single(it, comment) -> sb.AppendLine(it) |> buildFormatComment xmlCommentRetriever comment + | FSharpToolTipElement.SingleParameter(it, comment, _) -> + sb.AppendLine(it) |> buildFormatComment xmlCommentRetriever comment | FSharpToolTipElement.Group(items) -> let items, msg = if items.Length > 10 then @@ -298,6 +300,8 @@ type FsCompiler (executingDirectory : string) = | FSharpToolTipElement.None -> () | FSharpToolTipElement.Single(it, comment) -> sb.AppendLine(it) |> this.BuildFormatComment xmlCommentRetriever comment + | FSharpToolTipElement.SingleParameter(it, comment, _) -> + sb.AppendLine(it) |> this.BuildFormatComment xmlCommentRetriever comment | FSharpToolTipElement.Group(items) -> let items, msg = if items.Length > 10 then @@ -409,7 +413,7 @@ type FsCompiler (executingDirectory : string) = // get the options and parse let options = checker.GetProjectOptionsFromScript(fileName, source, getOptionsTimeFromFile(fileName), arguments, true) |> Async.RunSynchronously - let recent = checker.TryGetRecentTypeCheckResultsForFile(fileName, options, source) + let recent = checker.TryGetRecentCheckResultsForFile(fileName, options, source) let (parse, check) = if recent.IsSome then Debug.WriteLine("Using cached results for file: {0}", fileName) diff --git a/src/IfSharp.Kernel/Kernel.fs b/src/IfSharp.Kernel/Kernel.fs index 4537ca8..a9995d5 100644 --- a/src/IfSharp.Kernel/Kernel.fs +++ b/src/IfSharp.Kernel/Kernel.fs @@ -11,33 +11,32 @@ open System.Security.Cryptography open Newtonsoft.Json open NetMQ +open NetMQ.Sockets type IfSharpKernel(connectionInformation : ConnectionInformation) = - // startup 0mq stuff - let context = NetMQContext.Create() // heartbeat - let hbSocket = context.CreateRouterSocket() - let hbSocketURL =String.Format("{0}://{1}:{2}", connectionInformation.transport, connectionInformation.ip, connectionInformation.hb_port) + let hbSocket = new RouterSocket() + let hbSocketURL = String.Format("{0}://{1}:{2}", connectionInformation.transport, connectionInformation.ip, connectionInformation.hb_port) do hbSocket.Bind(hbSocketURL) // control - let controlSocket = context.CreateRouterSocket() + let controlSocket = new RouterSocket() let controlSocketURL = String.Format("{0}://{1}:{2}", connectionInformation.transport, connectionInformation.ip, connectionInformation.control_port) do controlSocket.Bind(controlSocketURL) // stdin - let stdinSocket = context.CreateRouterSocket() + let stdinSocket = new RouterSocket() let stdinSocketURL = String.Format("{0}://{1}:{2}", connectionInformation.transport, connectionInformation.ip, connectionInformation.stdin_port) do stdinSocket.Bind(stdinSocketURL) // iopub - let ioSocket = context.CreatePublisherSocket() + let ioSocket = new PublisherSocket() let ioSocketURL = String.Format("{0}://{1}:{2}", connectionInformation.transport, connectionInformation.ip, connectionInformation.iopub_port) do ioSocket.Bind(ioSocketURL) // shell - let shellSocket = context.CreateRouterSocket() + let shellSocket = new RouterSocket() let shellSocketURL =String.Format("{0}://{1}:{2}", connectionInformation.transport, connectionInformation.ip, connectionInformation.shell_port) do shellSocket.Bind(shellSocketURL) diff --git a/src/IfSharp.Kernel/helpers/Paket.fsx b/src/IfSharp.Kernel/helpers/Paket.fsx index 2505116..c4d418a 100644 --- a/src/IfSharp.Kernel/helpers/Paket.fsx +++ b/src/IfSharp.Kernel/helpers/Paket.fsx @@ -3,24 +3,38 @@ #r "Paket.Core.dll" open System +open Paket -let private dir = - Reflection.Assembly.GetEntryAssembly().Location - |> IO.Path.GetDirectoryName +let deps = + let dir = + Reflection.Assembly.GetEntryAssembly().Location + |> IO.Path.GetDirectoryName -let deps = - try - let d = Paket.Dependencies.Locate(dir) - d.Install(false) - d - with _ -> - Paket.Dependencies.Init(dir) - Paket.Dependencies.Locate(dir) + let d = + try + Dependencies.Locate(dir) + with _ -> + Dependencies.Init(dir) + Dependencies.Locate(dir) + + d.Restore(false) + d + +let private add package version = + deps.Add(None, package, version, force = false, + withBindingRedirects = false, cleanBindingRedirects = false, + createNewBindingFiles = false, interactive = false, + installAfter = false, semVerUpdateMode = SemVerUpdateMode.NoRestriction, + touchAffectedRefs = false) let Package list = for package in list do - deps.Add(package) + add package "" + + deps.Install(false) let Version list = for package, version in list do - deps.Add(None, package, version) + add package version + + deps.Install(false) diff --git a/src/IfSharp.Kernel/helpers/XPlot.Plotly.Paket.fsx b/src/IfSharp.Kernel/helpers/XPlot.Plotly.Paket.fsx index 4a5f5c8..ce1d9a5 100644 --- a/src/IfSharp.Kernel/helpers/XPlot.Plotly.Paket.fsx +++ b/src/IfSharp.Kernel/helpers/XPlot.Plotly.Paket.fsx @@ -1,3 +1,3 @@ #load "Paket.fsx" -Paket.Package ["XPlot.Plotly"] +Paket.Version ["XPlot.Plotly", "1.4.1"] diff --git a/src/IfSharp.Kernel/helpers/paket.lock b/src/IfSharp.Kernel/helpers/paket.lock index d615b6f..e69de29 100644 --- a/src/IfSharp.Kernel/helpers/paket.lock +++ b/src/IfSharp.Kernel/helpers/paket.lock @@ -1,252 +0,0 @@ -NUGET - remote: https://www.nuget.org/api/v2 - FSharp.Charting (0.90.14) - FSharp.Charting.Gtk (0.90.14) - FSharp.Core (4.0.0.1) - FSharp.Data.TypeProviders (5.0.0.2) - FSharp.Core (>= 3.1.2.5) - Hopac (0.3.13) - FSharp.Core (>= 3.1.2.5) - Http.fs (4.0.2) - FSharp.Core (>= 3.1.2.5) - Hopac (>= 0.3.13) - Microsoft.CSharp (4.0.1) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Dynamic.Runtime (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Linq (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Linq.Expressions (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.ObjectModel (>= 4.0.12) - framework: dnxcore50, >= netstandard13 - System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Reflection.Extensions (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Reflection.TypeExtensions (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - Microsoft.NETCore.Platforms (1.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Targets (1.0.1) - framework: >= netstandard10 - Newtonsoft.Json (9.0.1) - Microsoft.CSharp (>= 4.0.1) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: >= netstandard10 - System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard10 - System.Dynamic.Runtime (>= 4.0.11) - framework: >= netstandard10 - System.Globalization (>= 4.0.11) - framework: >= netstandard10 - System.IO (>= 4.1) - framework: >= netstandard10 - System.Linq (>= 4.1) - framework: >= netstandard10 - System.Linq.Expressions (>= 4.1) - framework: >= netstandard10 - System.ObjectModel (>= 4.0.12) - framework: >= netstandard10 - System.Reflection (>= 4.1) - framework: >= netstandard10 - System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard10 - System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: >= netstandard10 - System.Runtime.Extensions (>= 4.1) - framework: >= netstandard10 - System.Runtime.Serialization.Primitives (>= 4.1.1) - framework: >= netstandard10 - System.Text.Encoding (>= 4.0.11) - framework: >= netstandard10 - System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= netstandard10 - System.Text.RegularExpressions (>= 4.1) - framework: >= netstandard10 - System.Threading (>= 4.0.11) - framework: >= netstandard10 - System.Threading.Tasks (>= 4.0.11) - framework: >= netstandard10 - System.Xml.ReaderWriter (>= 4.0.11) - framework: >= netstandard10 - System.Xml.XDocument (>= 4.0.11) - framework: >= netstandard10 - System.Collections (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Diagnostics.Debug (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Diagnostics.Tools (4.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Dynamic.Runtime (4.0.11) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Linq (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Linq.Expressions (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.ObjectModel (>= 4.0.12) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Reflection (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Reflection.Emit (>= 4.0.1) - framework: >= netstandard13 - System.Reflection.Emit.ILGeneration (>= 4.0.1) - framework: >= netstandard13 - System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard13 - System.Reflection.TypeExtensions (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Globalization (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.IO (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.IO.FileSystem (4.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: >= netstandard13 - System.IO (>= 4.1) - framework: >= netstandard13 - System.IO.FileSystem.Primitives (>= 4.0.1) - framework: >= net46, >= netstandard13 - System.Runtime (>= 4.1) - framework: >= netstandard13 - System.Runtime.Handles (>= 4.0.1) - framework: >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: >= netstandard13 - System.Threading.Tasks (>= 4.0.11) - framework: >= netstandard13 - System.IO.FileSystem.Primitives (4.0.1) - framework: >= netstandard13 - System.Runtime (>= 4.1) - framework: >= netstandard13 - System.Linq (4.1) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard16 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard16 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16 - System.Linq.Expressions (4.1) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.IO (>= 4.1) - framework: dnxcore50, >= netstandard16 - System.Linq (>= 4.1) - framework: dnxcore50, >= netstandard16 - System.ObjectModel (>= 4.0.12) - framework: >= netstandard16 - System.Reflection (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 - System.Reflection.Emit (>= 4.0.1) - framework: >= netstandard16 - System.Reflection.Emit.ILGeneration (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Reflection.Emit.Lightweight (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Reflection.Extensions (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Reflection.TypeExtensions (>= 4.1) - framework: dnxcore50, >= netstandard16 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16 - System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.ObjectModel (4.0.12) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Reflection (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.IO (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Reflection.Emit (4.0.1) - framework: >= netstandard13 - System.IO (>= 4.1) - framework: >= netstandard11 - System.Reflection (>= 4.1) - framework: >= netstandard11 - System.Reflection.Emit.ILGeneration (>= 4.0.1) - framework: >= netstandard11, monotouch, xamarinios - System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard11 - System.Runtime (>= 4.1) - framework: >= netstandard11 - System.Reflection.Emit.ILGeneration (4.0.1) - framework: >= netstandard13 - System.Reflection (>= 4.1) - framework: >= netstandard10 - System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: >= netstandard10 - System.Reflection.Emit.Lightweight (4.0.1) - framework: >= netstandard16 - System.Reflection (>= 4.1) - framework: >= netstandard10 - System.Reflection.Emit.ILGeneration (>= 4.0.1) - framework: >= netstandard10, monoandroid, monotouch, xamarinios, xamarinmac - System.Reflection.Primitives (>= 4.0.1) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: >= netstandard10 - System.Reflection.Extensions (4.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Reflection.Primitives (4.0.1) - framework: netstandard10, >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Reflection.TypeExtensions (4.1) - framework: >= netstandard13 - System.Reflection (>= 4.1) - framework: >= net462, dnxcore50, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard13, >= netstandard15 - System.Resources.ResourceManager (4.0.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, >= netstandard10 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard10 - System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, >= netstandard10 - System.Runtime (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard12, netstandard13, >= netstandard15 - System.Runtime.Extensions (4.1) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15 - System.Runtime.Handles (4.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: >= netstandard13 - System.Runtime (>= 4.1) - framework: >= netstandard13 - System.Runtime.InteropServices (4.1) - framework: >= netstandard13 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Reflection (>= 4.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Reflection.Primitives (>= 4.0.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Runtime (>= 4.1) - framework: >= net462, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15 - System.Runtime.Handles (>= 4.0.1) - framework: dnxcore50, netstandard13, >= netstandard15 - System.Runtime.Serialization.Primitives (4.1.1) - framework: >= netstandard10 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding.Extensions (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.RegularExpressions (4.1) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard16 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard16 - System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard16 - System.Threading (4.0.11) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks (4.0.11) - framework: >= netstandard10 - Microsoft.NETCore.Platforms (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - Microsoft.NETCore.Targets (>= 1.0.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks.Extensions (4.0) - framework: >= netstandard13 - System.Collections (>= 4.0.11) - framework: >= netstandard10 - System.Runtime (>= 4.1) - framework: >= netstandard10 - System.Threading.Tasks (>= 4.0.11) - framework: >= netstandard10 - System.Xml.ReaderWriter (4.0.11) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.IO (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.IO.FileSystem (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.IO.FileSystem.Primitives (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Runtime.InteropServices (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Text.Encoding.Extensions (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Text.RegularExpressions (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Threading.Tasks (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Threading.Tasks.Extensions (>= 4.0) - framework: dnxcore50, >= netstandard13 - System.Xml.XDocument (4.0.11) - framework: >= netstandard10 - System.Collections (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Debug (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Diagnostics.Tools (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Globalization (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.IO (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Reflection (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Resources.ResourceManager (>= 4.0.1) - framework: dnxcore50, >= netstandard13 - System.Runtime (>= 4.1) - framework: dnxcore50, netstandard10, >= netstandard13 - System.Runtime.Extensions (>= 4.1) - framework: dnxcore50, >= netstandard13 - System.Text.Encoding (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Threading (>= 4.0.11) - framework: dnxcore50, >= netstandard13 - System.Xml.ReaderWriter (>= 4.0.11) - framework: dnxcore50, netstandard10, >= netstandard13 - XPlot.Plotly (1.4.1) - Http.fs - Newtonsoft.Json From f41c27535944461e25b0f3149f3f7585c6a134ff Mon Sep 17 00:00:00 2001 From: Sylvan Clebsch Date: Tue, 18 Oct 2016 11:44:41 +0100 Subject: [PATCH 4/4] Autogenerate binding redirects --- src/IfSharpConsole/IfSharpConsole.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/IfSharpConsole/IfSharpConsole.csproj b/src/IfSharpConsole/IfSharpConsole.csproj index 1a015f3..133e6fd 100644 --- a/src/IfSharpConsole/IfSharpConsole.csproj +++ b/src/IfSharpConsole/IfSharpConsole.csproj @@ -38,6 +38,9 @@ icon.ico + + true + false