From be6c8f6f59ebd29aebcce5483d39a5f39ead181e Mon Sep 17 00:00:00 2001 From: Colin Gravill Date: Wed, 7 Sep 2016 10:25:01 +0100 Subject: [PATCH 1/2] Finish up FSCharting hard dependency removal Notes for Windows and reduce include.fsx --- Feature Notebook format 4_0.ipynb | 10 +- src/IfSharp.Kernel/IfSharp.Kernel.fsproj | 114 +++++++++++------------ src/IfSharp.Kernel/Include.fsx | 3 +- src/IfSharpConsole/IfSharpConsole.csproj | 6 +- 4 files changed, 69 insertions(+), 64 deletions(-) diff --git a/Feature Notebook format 4_0.ipynb b/Feature Notebook format 4_0.ipynb index 7f61e37..3b3176e 100644 --- a/Feature Notebook format 4_0.ipynb +++ b/Feature Notebook format 4_0.ipynb @@ -193,7 +193,8 @@ } ], "source": [ - "#load \"FSCharting.Gtk.fsx\"" + "#load \"FSCharting.Gtk.fsx\" // Mac/Linux\n", + "//#load \"FSCharting.fsx\" // Windows" ] }, { @@ -406,8 +407,13 @@ }, "language": "fsharp", "language_info": { + "codemirror_mode": "", + "file_extension": ".fs", + "mimetype": "text/x-fsharp", "name": "fsharp", - "version": "1.0.0" + "nbconvert_exporter": "", + "pygments_lexer": "", + "version": "4.3.1.0" } }, "nbformat": 4, diff --git a/src/IfSharp.Kernel/IfSharp.Kernel.fsproj b/src/IfSharp.Kernel/IfSharp.Kernel.fsproj index f920ab1..afafc1d 100644 --- a/src/IfSharp.Kernel/IfSharp.Kernel.fsproj +++ b/src/IfSharp.Kernel/IfSharp.Kernel.fsproj @@ -179,7 +179,7 @@ ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.dll - True + False True @@ -404,7 +404,7 @@ ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.dll - True + False True @@ -415,7 +415,7 @@ ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.dll - True + False True @@ -426,7 +426,7 @@ ..\..\packages\System.Console\ref\netstandard1.3\System.Console.dll - True + False True @@ -437,7 +437,7 @@ ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.dll - True + False True @@ -459,7 +459,7 @@ ..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.dll - True + False True @@ -470,7 +470,7 @@ ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.dll - True + False True @@ -481,7 +481,7 @@ ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.dll - True + False True @@ -492,7 +492,7 @@ ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.dll - True + False True @@ -503,7 +503,7 @@ ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.dll - True + False True @@ -514,7 +514,7 @@ ..\..\packages\System.IO\ref\netstandard1.5\System.IO.dll - True + False True @@ -525,7 +525,7 @@ ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.dll - True + False True @@ -536,7 +536,7 @@ ..\..\packages\System.IO.Compression.ZipFile\ref\netstandard1.3\System.IO.Compression.ZipFile.dll - True + False True @@ -547,7 +547,7 @@ ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.dll - True + False True @@ -558,7 +558,7 @@ ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.dll - True + False True @@ -569,7 +569,7 @@ ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.dll - True + False True @@ -580,7 +580,7 @@ ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.dll - True + False True @@ -591,7 +591,7 @@ ..\..\packages\System.Linq.Queryable\ref\netstandard1.0\System.Linq.Queryable.dll - True + False True @@ -602,7 +602,7 @@ ..\..\packages\System.Net.Http\ref\netstandard1.3\System.Net.Http.dll - True + False True @@ -613,7 +613,7 @@ ..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.dll - True + False True @@ -624,7 +624,7 @@ ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.dll - True + False True @@ -635,7 +635,7 @@ ..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.dll - True + False True @@ -646,7 +646,7 @@ ..\..\packages\System.Net.WebHeaderCollection\ref\netstandard1.3\System.Net.WebHeaderCollection.dll - True + False True @@ -657,7 +657,7 @@ ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.dll - True + False True @@ -668,7 +668,7 @@ ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.dll - True + False True @@ -679,7 +679,7 @@ ..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.dll - True + False True @@ -690,7 +690,7 @@ ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.dll - True + False True @@ -701,7 +701,7 @@ ..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.dll - True + False True @@ -712,7 +712,7 @@ ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.dll - True + False True @@ -723,7 +723,7 @@ ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.dll - True + False True @@ -734,7 +734,7 @@ ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.dll - True + False True @@ -745,7 +745,7 @@ ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.dll - True + False True @@ -756,7 +756,7 @@ ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.dll - True + False True @@ -767,7 +767,7 @@ ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.dll - True + False True @@ -778,7 +778,7 @@ ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.dll - True + False True @@ -789,7 +789,7 @@ ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.dll - True + False True @@ -800,7 +800,7 @@ ..\..\packages\System.Runtime.InteropServices.RuntimeInformation\ref\netstandard1.1\System.Runtime.InteropServices.RuntimeInformation.dll - True + False True @@ -811,7 +811,7 @@ ..\..\packages\System.Runtime.Loader\ref\netstandard1.5\System.Runtime.Loader.dll - True + False True @@ -822,7 +822,7 @@ ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.dll - True + False True @@ -833,7 +833,7 @@ ..\..\packages\System.Security.Cryptography.Algorithms\ref\netstandard1.6\System.Security.Cryptography.Algorithms.dll - True + False True @@ -844,7 +844,7 @@ ..\..\packages\System.Security.Cryptography.Cng\ref\netstandard1.6\System.Security.Cryptography.Cng.dll - True + False True @@ -855,7 +855,7 @@ ..\..\packages\System.Security.Cryptography.Csp\ref\netstandard1.3\System.Security.Cryptography.Csp.dll - True + False True @@ -866,7 +866,7 @@ ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.dll - True + False True @@ -877,7 +877,7 @@ ..\..\packages\System.Security.Cryptography.OpenSsl\ref\netstandard1.6\System.Security.Cryptography.OpenSsl.dll - True + False True @@ -888,7 +888,7 @@ ..\..\packages\System.Security.Cryptography.Primitives\ref\netstandard1.3\System.Security.Cryptography.Primitives.dll - True + False True @@ -899,7 +899,7 @@ ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.dll - True + False True @@ -910,7 +910,7 @@ ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.dll - True + False True @@ -921,7 +921,7 @@ ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.dll - True + False True @@ -932,7 +932,7 @@ ..\..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.dll - True + False True @@ -943,7 +943,7 @@ ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.dll - True + False True @@ -954,7 +954,7 @@ ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.dll - True + False True @@ -976,7 +976,7 @@ ..\..\packages\System.Threading.Tasks.Parallel\ref\netstandard1.1\System.Threading.Tasks.Parallel.dll - True + False True @@ -987,7 +987,7 @@ ..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.dll - True + False True @@ -998,7 +998,7 @@ ..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.dll - True + False True @@ -1009,7 +1009,7 @@ ..\..\packages\System.Threading.Timer\ref\netstandard1.2\System.Threading.Timer.dll - True + False True @@ -1020,7 +1020,7 @@ ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.dll - True + False True @@ -1031,7 +1031,7 @@ ..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.dll - True + False True diff --git a/src/IfSharp.Kernel/Include.fsx b/src/IfSharp.Kernel/Include.fsx index 759a091..9e8fb5f 100644 --- a/src/IfSharp.Kernel/Include.fsx +++ b/src/IfSharp.Kernel/Include.fsx @@ -3,8 +3,7 @@ // load base dlls #r "IfSharp.Kernel.dll" -#r "System.Data.dll" -#r "System.Windows.Forms.DataVisualization.dll" +//#r "System.Data.dll" //#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead #r "NetMQ.dll" diff --git a/src/IfSharpConsole/IfSharpConsole.csproj b/src/IfSharpConsole/IfSharpConsole.csproj index aedd695..351efa4 100644 --- a/src/IfSharpConsole/IfSharpConsole.csproj +++ b/src/IfSharpConsole/IfSharpConsole.csproj @@ -123,7 +123,7 @@ - + ..\..\packages\AsyncIO\lib\net40\AsyncIO.dll @@ -134,7 +134,7 @@ - + ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll @@ -154,7 +154,7 @@ - + ..\..\packages\NetMQ\lib\net40\NetMQ.dll From cfda3595f4a042387f39ce33473615a71acdc226 Mon Sep 17 00:00:00 2001 From: Colin Gravill Date: Wed, 7 Sep 2016 10:25:20 +0100 Subject: [PATCH 2/2] Note about include --- src/IfSharp.Kernel/Include.fsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IfSharp.Kernel/Include.fsx b/src/IfSharp.Kernel/Include.fsx index 9e8fb5f..588984e 100644 --- a/src/IfSharp.Kernel/Include.fsx +++ b/src/IfSharp.Kernel/Include.fsx @@ -4,6 +4,7 @@ // load base dlls #r "IfSharp.Kernel.dll" //#r "System.Data.dll" +//#r "System.Windows.Forms.DataVisualization.dll" //FSCharting can be loaded with helper script FSCharting.fsx or FSCharting.Gtk.fsx //#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead #r "NetMQ.dll"