Merge branch 'localFixes'

Author: DinisCruz

APIs/Roslyn/_Extra_methods_Roslyn_API.cs

@@ -3,17 +3,15 @@
 using System.Linq; 
 using System.Reflection;
 using System.Collections.Generic;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.External.SharpDevelop.ExtensionMethods;
-using O2.XRules.Database.Utils;
 using Roslyn.Compilers.Common;
 using Roslyn.Compilers.CSharp;
 using Roslyn.Compilers;
 using Roslyn.Services;
-using O2.FluentSharp;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
+using FluentSharp.CoreLib.API;
+using FluentSharp.FluentRoslyn;
+using FluentSharp.REPL;
 //O2Ref:FluentSharp.Roslyn.dll
 
 //O2File:_Extra_methods_Roslyn_API_GuiHelpers.cs

APIs/Roslyn/_Extra_methods_Roslyn_API_GuiHelpers.cs

@@ -4,17 +4,15 @@
 using System.Reflection;
 using System.Windows.Forms;
 using System.Collections.Generic;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.External.SharpDevelop.ExtensionMethods;
-using O2.XRules.Database.Utils;
 using Roslyn.Compilers.Common;
 using Roslyn.Compilers.CSharp;
 using Roslyn.Compilers;
 using Roslyn.Services;
-
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.FluentRoslyn;
+using FluentSharp.WinForms;
+using FluentSharp.REPL;
 //O2File:_Extra_methods_Roslyn_API.cs
 
 //O2Ref:FluentSharp.Roslyn.dll

APIs/Roslyn/_Extra_methods_Roslyn_API_Refactoring.cs

@@ -3,21 +3,20 @@
 using System.Linq; 
 using System.Reflection;
 using System.Collections.Generic;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.External.SharpDevelop.ExtensionMethods;
-using O2.XRules.Database.Utils;
 using Roslyn.Compilers.Common;
 using Roslyn.Compilers.CSharp;
 using Roslyn.Compilers;
 using Roslyn.Services;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.FluentRoslyn;
+using FluentSharp.WinForms;
+using FluentSharp.REPL;
 
 //O2File:_Extra_methods_Roslyn_API.cs
 
 //O2Ref:FluentSharp.Roslyn.dll
-
+//O2Ref:QuickGraph.dll
 //O2Ref:Roslyn.Services.dll
 //O2Ref:Roslyn.Services.CSharp.dll
 //O2Ref:Roslyn.Compilers.dll

Utils/O2/Util - C# REPL Script [4.0].h2

@@ -29,6 +29,7 @@ start();
 
 //using Roslyn.Compilers;
 //using Roslyn.Compilers.CSharp;				
+//using FluentSharp.FluentRoslyn;
 
 //O2Ref:FluentSharp.Roslyn.dll
 //O2Ref:Roslyn.Compilers.CSharp.dll

Utils/O2/Util - O2 Development Environment.h2

@@ -1,8 +1 @@
-<?xml version="1.0"?>
-<H2>
-  <SourceCode>O2Gui.open&lt;ascx_XRules_Editor&gt;("O2 Development Environment       ({0}".format(clr.details()),1024, 600);
-    
-//using O2.Core.XRules.Ascx
-//O2Ref:O2_Platform_External_SharpDevelop.dll</SourceCode>
-  <ReferencedAssemblies />
-</H2>
+O2Gui.open<ascx_XRules_Editor>("O2 Development Environment       ({0}".format(clr.details()),1024, 600);

_Custom_O2s/v4.1/Main O2 Gui.h2

@@ -139,8 +139,6 @@ logViewerPanel.add_LogViewer().white();
 
 return "done";		 
 
-//using O2.Views.ASCX.Forms
-//using O2.Kernel.CodeUtils
 //O2Embed:FluentSharp.Roslyn.dll
 //O2Embed:WatiN.Core.1x.dll
 //O2DontEmbed:Ionic.Zip.dll