From 9b7875d904456c34c3698d7fc569078f99ed5187 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Sun, 19 Apr 2020 23:12:56 +0300
Subject: Scripting refactoring.

---
 .../Scripting/Tango.Scripting.Basic/Project.cs     | 211 +++++++++++++++++++++
 1 file changed, 211 insertions(+)
 create mode 100644 Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs')

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
new file mode 100644
index 000000000..ddf61e124
--- /dev/null
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -0,0 +1,211 @@
+using Microsoft.CodeAnalysis.CSharp.Scripting;
+using Microsoft.CodeAnalysis.Scripting;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Tango.Core;
+using Tango.Core.IO;
+using Tango.Scripting.Core;
+using System.IO;
+
+namespace Tango.Scripting.Basic
+{
+    public class Project : ExtendedObject
+    {
+        public String Name { get; set; }
+
+        public ApartmentState ApartmentState { get; set; }
+
+        public ObservableCollection<ReferenceAssembly> ReferenceAssemblies { get; set; }
+
+        [JsonIgnore]
+        public ObservableCollection<Assembly> ReferenceAssembliesLoaded { get; set; }
+
+        public ObservableCollection<Script> Scripts { get; set; }
+
+        public ObservableCollection<IScriptSource> AdditionalScripts
+        {
+            get
+            {
+                return Scripts.Where(x => !x.IsEntryPoint).Cast<IScriptSource>().ToObservableCollection();
+            }
+        }
+
+        public Project()
+        {
+            ApartmentState = ApartmentState.MTA;
+
+            ReferenceAssemblies = new ObservableCollection<ReferenceAssembly>();
+            ReferenceAssemblies.CollectionChanged += ReferenceAssemblies_CollectionChanged;
+
+            ReferenceAssembliesLoaded = new ObservableCollection<Assembly>();
+            Scripts = new ObservableCollection<Script>();
+            Scripts.CollectionChanged += (x, e) => { RaisePropertyChanged(nameof(AdditionalScripts)); };
+        }
+
+        private void ReferenceAssemblies_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            LoadReferenceAssemblies();
+        }
+
+        private void LoadReferenceAssemblies()
+        {
+            ReferenceAssembliesLoaded.Clear();
+
+            foreach (var type in ReferenceAssemblies)
+            {
+                ReferenceAssembliesLoaded.Add(type.FromType.Assembly);
+            }
+        }
+
+        public static Project New(String name, String code)
+        {
+            Project p = new Project();
+
+            p.Name = name;
+
+            p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(String) });
+            p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Enumerable) });
+            p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Form) });
+            p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Project) });
+
+            p.Scripts.Add(new Script()
+            {
+                Name = "main.csx",
+                IsEntryPoint = true,
+                Code = code,
+            });
+
+            return p;
+        }
+
+        public Task<CompilationResult> Compile()
+        {
+            return Task.Factory.StartNew<CompilationResult>(() =>
+            {
+                var result = new CompilationResult();
+                var tempFolder = TemporaryManager.CreateFolder(Name);
+                result.TemporaryProjectPath = tempFolder;
+
+                String mainScriptCode = String.Empty;
+
+                foreach (var script in Scripts)
+                {
+                    String code = script.Code;
+                    String codeFile = Path.Combine(tempFolder, script.Name);
+
+                    String loadingString = String.Empty;
+
+                    foreach (var file in Scripts.Where(x => !x.IsEntryPoint && script != x).Select(x => Path.Combine(tempFolder, x.Name)))
+                    {
+                        loadingString = $"#load \"{file}\"\n";
+                    }
+
+                    code = loadingString + code;
+
+                    if (!script.IsEntryPoint)
+                    {
+
+
+                        //foreach (var match in Regex.Matches(code, "#load \".+\"").OfType<Match>())
+                        //{
+                        //    String line = match.ToString();
+                        //    var pathMatch = Regex.Match(line, "(?<=\")(.*?)(?=\")");
+                        //    if (pathMatch.Success)
+                        //    {
+                        //        String path = pathMatch.ToString();
+
+                        //        if (!System.IO.Path.IsPathRooted(path))
+                        //        {
+                        //            StringBuilder builder = new StringBuilder(code);
+                        //            builder.Insert(match.Index + pathMatch.Index, System.IO.Path.GetFullPath(tempFolder + "\\"));
+                        //            code = builder.ToString();
+                        //        }
+                        //    }
+                        //}
+
+
+
+                        File.WriteAllText(codeFile, code);
+                    }
+                    else
+                    {
+                        code += Environment.NewLine + Environment.NewLine + "return new Program().OnExecute(GlobalContext);";
+                        mainScriptCode = code;
+                    }
+                }
+
+                var scriptOptions = ScriptOptions.Default.WithReferences(ReferenceAssembliesLoaded);
+
+                var s = CSharpScript.Create<object>(mainScriptCode, scriptOptions, typeof(GlobalObject));
+                result.Script = s;
+
+                var compileResults = s.Compile();
+
+                foreach (var error in compileResults.Where(x => x.Severity == Microsoft.CodeAnalysis.DiagnosticSeverity.Error || x.Severity == Microsoft.CodeAnalysis.DiagnosticSeverity.Warning))
+                {
+                    CompilationError cError = new CompilationError();
+                    cError.File = System.IO.Path.GetFileName(error.Location.SourceTree.FilePath);
+                    cError.Message = error.GetMessage();
+                    cError.Severity = error.Severity;
+                    var line = error.Location.GetMappedLineSpan();
+                    cError.Line = line.StartLinePosition.Line + 1;
+                    cError.Column = line.StartLinePosition.Character + 1;
+                    cError.Length = line.EndLinePosition.Character - line.StartLinePosition.Character;
+                    result.Errors.Add(cError);
+                }
+
+                return result;
+            });
+        }
+
+        public async Task<ProjectSession> Run(IContext context)
+        {
+            var result = await Compile();
+
+            if (result.Errors.Count > 0)
+            {
+                throw new InvalidOperationException("There were compilation errors.");
+            }
+
+            Thread scriptThread = null;
+            ProjectSession session = null;
+
+            session = new ProjectSession(this, () =>
+            {
+                scriptThread.Abort();
+            });
+
+            scriptThread = new Thread(() =>
+            {
+                try
+                {
+                    var runResult = result.Script.RunAsync(globals: new GlobalObject() { GlobalContext = context }).Result;
+                    session.Completed(runResult.ReturnValue);
+                }
+                catch (ThreadAbortException)
+                {
+
+                }
+                catch (Exception ex)
+                {
+                    session.Failed(ex.InnerException);
+                }
+            });
+
+            scriptThread.SetApartmentState(ApartmentState);
+            scriptThread.IsBackground = true;
+            scriptThread.Start();
+
+            return session;
+        }
+    }
+}
-- 
cgit v1.3.1


From 17abbf35ba72283c6dab9135f1e75b7057371431 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 20 Apr 2020 07:22:48 +0300
Subject: Scripting..

---
 .../FSE/Modules/Tango.FSE.Stubs/App.xaml           |   2 +
 .../Tango.FSE.Stubs/Designer/ProjectModel.cs       |  20 +
 .../Tango.FSE.Stubs/Designer/ScriptTabModel.cs     |  22 ++
 .../FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs   |  69 ++++
 .../Modules/Tango.FSE.Stubs/ProjectRunnerState.cs  |  18 +
 .../Properties/Resources.Designer.cs               |  64 ++--
 .../Tango.FSE.Stubs/Properties/Resources.resx      |  20 +-
 .../Tango.FSE.Stubs/Resources/lib_template.csx     |  14 +
 .../Tango.FSE.Stubs/Resources/main_template.csx    |  19 +
 .../Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj |  26 ++
 .../Modules/Tango.FSE.Stubs/Themes/Generic.xaml    | 403 +++++++++++++++++++++
 .../Modules/Tango.FSE.Stubs/ViewModelLocator.cs    |  18 +
 .../Tango.FSE.Stubs/ViewModels/MainViewVM.cs       |   8 +-
 .../ViewModels/TestDesignerViewVM.cs               | 121 +++++++
 .../Tango.FSE.Stubs/ViewModels/TestRunnerViewVM.cs |  13 +
 .../Modules/Tango.FSE.Stubs/Views/MainView.xaml    |   8 +-
 .../Tango.FSE.Stubs/Views/TestDesignerView.xaml    | 324 +++++++++++++++++
 .../Tango.FSE.Stubs/Views/TestDesignerView.xaml.cs |  38 ++
 .../Tango.FSE.Stubs/Views/TestRunnerView.xaml      |  14 +
 .../Tango.FSE.Stubs/Views/TestRunnerView.xaml.cs   |  28 ++
 .../FSE/Tango.FSE.Common/Resources/Colors.xaml     |  25 ++
 Software/Visual_Studio/FSE/Tango.FSE.UI/App.config |  16 +-
 .../FSE/Tango.FSE.UI/Tango.FSE.UI.csproj           |   3 +
 .../Visual_Studio/FSE/Tango.FSE.UI/packages.config |  50 +++
 .../Scripting/Tango.Scripting.Basic/Project.cs     |  16 +-
 .../Tango.Scripting.Basic/ProjectSession.cs        |  12 +-
 .../Tango.Scripting.Basic/ReferenceAssembly.cs     |   5 +
 .../Scripting/Tango.Scripting.Basic/Script.cs      |  21 +-
 .../Tango.Scripting.Editors/Intellisense/Utils.cs  |  14 +-
 29 files changed, 1361 insertions(+), 50 deletions(-)
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ProjectModel.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ScriptTabModel.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunnerState.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Themes/Generic.xaml
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestRunnerViewVM.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml.cs

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs')

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/App.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/App.xaml
index 4261db47e..cf67bdbba 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/App.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/App.xaml
@@ -10,6 +10,8 @@
                 <ResourceDictionary Source="pack://application:,,,/Tango.FSE.Common;component/Resources/Images.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Tango.FSE.Common;component/Resources/Styles.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Tango.FSE.Common;component/Resources/Controls.xaml" />
+
+                <ResourceDictionary Source="Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ProjectModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ProjectModel.cs
new file mode 100644
index 000000000..b5208c008
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ProjectModel.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+
+namespace Tango.FSE.Stubs.Designer
+{
+    public class ProjectModel : ExtendedObject
+    {
+        public ObservableCollection<ScriptTabModel> Scripts { get; set; }
+
+        public ProjectModel()
+        {
+            Scripts = new ObservableCollection<ScriptTabModel>();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ScriptTabModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ScriptTabModel.cs
new file mode 100644
index 000000000..4fba3213d
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Designer/ScriptTabModel.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Scripting.Basic;
+
+namespace Tango.FSE.Stubs.Designer
+{
+    public class ScriptTabModel : ExtendedObject
+    {
+        public Script Script { get; set; }
+
+        private bool _isSelected;
+        public bool IsSelected
+        {
+            get { return _isSelected; }
+            set { _isSelected = value; RaisePropertyChangedAuto(); }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
new file mode 100644
index 000000000..0625fa08f
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Scripting.Basic;
+
+namespace Tango.FSE.Stubs
+{
+    public class ProjectRunner : ExtendedObject
+    {
+        private ProjectSession _currentSession;
+
+        private ProjectRunnerState _state;
+        public ProjectRunnerState State
+        {
+            get { return _state; }
+            private set { _state = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(IsRunning)); }
+        }
+
+        public bool IsRunning
+        {
+            get { return State == ProjectRunnerState.Compiling || State == ProjectRunnerState.Running; }
+        }
+
+        public Project Project { get; private set; }
+
+        public ProjectRunner(Project project)
+        {
+            Project = project;
+        }
+
+        public async Task<Object> Run()
+        {
+            if (State != ProjectRunnerState.Compiling && State != ProjectRunnerState.Running)
+            {
+                State = ProjectRunnerState.Compiling;
+                _currentSession = await Project.Run(null);
+                State = ProjectRunnerState.Running;
+
+                try
+                {
+                    var result = await _currentSession.WaitForCompletion();
+                    State = ProjectRunnerState.Completed;
+                    return result;
+                }
+                catch (OperationCanceledException)
+                {
+                    State = ProjectRunnerState.Aborted;
+                    throw;
+                }
+                catch (Exception)
+                {
+                    State = ProjectRunnerState.Failed;
+                    throw;
+                }
+            }
+
+            throw new InvalidOperationException("Project is already running.");
+        }
+
+        public void Stop()
+        {
+            _currentSession.Abort();
+            State = ProjectRunnerState.Aborted;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunnerState.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunnerState.cs
new file mode 100644
index 000000000..034426742
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunnerState.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FSE.Stubs
+{
+    public enum ProjectRunnerState
+    {
+        None,
+        Compiling,
+        Running,
+        Completed,
+        Failed,
+        Aborted
+}
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.Designer.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.Designer.cs
index 4d805d4c8..30aff0d9b 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.Designer.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.FSE.Stubs.Properties
-{
-
-
+namespace Tango.FSE.Stubs.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,53 +19,65 @@ namespace Tango.FSE.Stubs.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.FSE.Stubs.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] lib_template {
+            get {
+                object obj = ResourceManager.GetObject("lib_template", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] main_template {
+            get {
+                object obj = ResourceManager.GetObject("main_template", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.resx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.resx
index af7dbebba..87094c4e4 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.resx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Properties/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,16 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lib_template" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lib_template.csx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="main_template" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\main_template.csx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
new file mode 100644
index 000000000..f3fd6b36a
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/lib_template.csx
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.FSE.Stubs;
+
+public class NewLibrary
+{
+    public double Calc(double a, double b)
+    {
+        return a + b;
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
new file mode 100644
index 000000000..3d6c4f3b9
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.FSE.Stubs;
+
+public class Program
+{
+    public Object OnExecute(IContext context)
+    {
+
+        return new
+        {
+            Item1 = "Item 1",
+            Item2 = "Item 2"
+        };
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj
index 3222674ef..3e495564d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj
@@ -78,12 +78,24 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Designer\ProjectModel.cs" />
+    <Compile Include="Designer\ScriptTabModel.cs" />
+    <Compile Include="ProjectRunner.cs" />
+    <Compile Include="ProjectRunnerState.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="StubsModule.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="ViewModels\TestDesignerViewVM.cs" />
+    <Compile Include="ViewModels\TestRunnerViewVM.cs" />
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\TestDesignerView.xaml.cs">
+      <DependentUpon>TestDesignerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\TestRunnerView.xaml.cs">
+      <DependentUpon>TestRunnerView.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -109,6 +121,8 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Include="Resources\lib_template.csx" />
+    <None Include="Resources\main_template.csx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Scripting\Tango.Scripting.Basic\Tango.Scripting.Basic.csproj">
@@ -173,10 +187,22 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\TestDesignerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\TestRunnerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\test_designer.png" />
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Themes/Generic.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Themes/Generic.xaml
new file mode 100644
index 000000000..7d8801297
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Themes/Generic.xaml
@@ -0,0 +1,403 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Tango.FSE.Stubs.Themes">
+
+    <Style x:Key="FocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <LinearGradientBrush x:Key="TabItem.Static.Background" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="{StaticResource FSE_PrimaryBackgroundLightColor}" Offset="0.0"/>
+        <GradientStop Color="{StaticResource FSE_PrimaryBackgroundLightColor}" Offset="1.0"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="TabItem.Static.Border" Color="#ACACAC"/>
+    <LinearGradientBrush x:Key="TabItem.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="{StaticResource FSE_PrimaryBackgroundLighterColor}" Offset="0.0"/>
+        <GradientStop Color="{StaticResource FSE_PrimaryBackgroundLighterColor}" Offset="1.0"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="TabItem.MouseOver.Border" Color="{StaticResource FSE_PrimaryBackgroundLightColor}"/>
+    <SolidColorBrush x:Key="TabItem.Disabled.Background" Color="{StaticResource FSE_PrimaryBackgroundLightColor}"/>
+    <SolidColorBrush x:Key="TabItem.Disabled.Border" Color="{StaticResource FSE_PrimaryBackgroundLightColor}"/>
+    <SolidColorBrush x:Key="TabItem.Selected.Border" Color="{StaticResource FSE_PrimaryBackgroundDarkColor}"/>
+    <SolidColorBrush x:Key="TabItem.Selected.Background" Color="{StaticResource FSE_PrimaryBackgroundDarkColor}"/>
+    
+    <Style x:Key="FSE_TabItem_VisualStudio_Output" TargetType="{x:Type TabItem}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"/>
+        <Setter Property="Background" Value="{StaticResource TabItem.Static.Background}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource TabItem.Static.Border}"/>
+        <Setter Property="BorderThickness" Value="0"></Setter>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="15 5"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TabItem}">
+                    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+                        <Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" Margin="0">
+                            <Border x:Name="innerBorder" BorderBrush="{StaticResource TabItem.Selected.Border}" BorderThickness="1,1,1,0" Background="{StaticResource TabItem.Selected.Background}" Margin="-1" Opacity="0"/>
+                        </Border>
+                        <ContentPresenter x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Panel.ZIndex" Value="1"/>
+                            <Setter Property="Margin" Value="-2,-2,0,-2"/>
+                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Panel.ZIndex" Value="1"/>
+                            <Setter Property="Margin" Value="-2,0,-2,-2"/>
+                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0"/>
+                            <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryAccentBrush}"></Setter>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Panel.ZIndex" Value="1"/>
+                            <Setter Property="Margin" Value="0,-2,-2,-2"/>
+                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Panel.ZIndex" Value="1"/>
+                            <Setter Property="Margin" Value="-2,-2,-2,0"/>
+                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="FSE_TabItem_VisualStudio_Scripts" TargetType="{x:Type TabItem}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"/>
+        <Setter Property="Background" Value="{StaticResource TabItem.Static.Background}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource TabItem.Static.Border}"/>
+        <Setter Property="BorderThickness" Value="0"></Setter>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="15 5"/>
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TabItem}">
+                    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+                        <Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" Margin="0">
+                            <Border x:Name="innerBorder" BorderBrush="{StaticResource TabItem.Selected.Border}" BorderThickness="1,1,1,0" Background="{StaticResource TabItem.Selected.Background}" Margin="-1" Opacity="0"/>
+                        </Border>
+                        <ContentPresenter x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.MouseOver.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Opacity" TargetName="contentPresenter" Value="0.56"/>
+                            <Setter Property="Background" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="mainBorder" Value="{StaticResource TabItem.Disabled.Border}"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Left"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Panel.ZIndex" Value="1"/>
+                            <Setter Property="Margin" Value="-2,-2,0,-2"/>
+                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,0,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,0,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Bottom"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Panel.ZIndex" Value="1"/>
+                            <Setter Property="Margin" Value="-2,0,-2,-2"/>
+                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0"/>
+                            <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryAccentBrush}"></Setter>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Right"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Panel.ZIndex" Value="1"/>
+                            <Setter Property="Margin" Value="0,-2,-2,-2"/>
+                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="0,1,1,1"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,1,1,1"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType={x:Type TabControl}}}" Value="Top"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Panel.ZIndex" Value="1"/>
+                            <Setter Property="Margin" Value="-2,-2,-2,0"/>
+                            <Setter Property="Opacity" TargetName="innerBorder" Value="1"/>
+                            <Setter Property="BorderThickness" TargetName="innerBorder" Value="1,1,1,0"/>
+                            <Setter Property="BorderThickness" TargetName="mainBorder" Value="1,1,1,0"/>
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModelLocator.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModelLocator.cs
index fe7ef42fa..6d151e5b8 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModelLocator.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModelLocator.cs
@@ -13,6 +13,8 @@ namespace Tango.FSE.Stubs
         static ViewModelLocator()
         {
             TangoIOC.Default.Register<MainViewVM>();
+            TangoIOC.Default.Register<TestRunnerViewVM>();
+            TangoIOC.Default.Register<TestDesignerViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -22,5 +24,21 @@ namespace Tango.FSE.Stubs
                 return TangoIOC.Default.GetInstance<MainViewVM>();
             }
         }
+
+        public static TestRunnerViewVM TestRunnerViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<TestRunnerViewVM>();
+            }
+        }
+
+        public static TestDesignerViewVM TestDesignerViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<TestDesignerViewVM>();
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/MainViewVM.cs
index 411335c02..02d2f8b53 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/MainViewVM.cs
@@ -6,10 +6,12 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.FSE.Common;
 using Tango.FSE.Common.Navigation;
+using Tango.FSE.Stubs.Views;
 using Tango.SharedUI.Helpers;
 
 namespace Tango.FSE.Stubs.ViewModels
 {
+    [NavigationContainer]
     public class MainViewVM : FSEViewModel
     {
         public override void OnApplicationStarted()
@@ -18,7 +20,7 @@ namespace Tango.FSE.Stubs.ViewModels
             {
                 NavigationManager.MenuItems.Add(new NavigationMenuItem(() =>
                 {
-                    NavigationManager.NavigateTo<StubsModule>();
+                    NavigationManager.NavigateTo<StubsModule>(nameof(TestRunnerView));
                 })
                 {
                     Name = "Test Runner",
@@ -29,11 +31,11 @@ namespace Tango.FSE.Stubs.ViewModels
 
                 NavigationManager.MenuItems.Add(new NavigationMenuItem(() =>
                 {
-                    NavigationManager.NavigateTo<StubsModule>();
+                    NavigationManager.NavigateTo<StubsModule>(nameof(TestDesignerView));
                 })
                 {
                     Name = "Test Designer",
-                    Index = 6,
+                    Index = 7,
                     Description = "Create and test new test runner projects.",
                     Image = ResourceHelper.GetImageFromResources("Images/test_designer.png"),
                 });
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs
new file mode 100644
index 000000000..6544e643c
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs
@@ -0,0 +1,121 @@
+using Google.Protobuf;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.Commands;
+using Tango.FSE.Common;
+using Tango.Integration.Operation;
+using Tango.Scripting.Basic;
+using Tango.Transport;
+
+namespace Tango.FSE.Stubs.ViewModels
+{
+    public class TestDesignerViewVM : FSEViewModel
+    {
+        private Project _project;
+        public Project Project
+        {
+            get { return _project; }
+            set { _project = value; RaisePropertyChangedAuto(); OnProjectChanged(); }
+        }
+
+        private ProjectRunner _projectRunner;
+        public ProjectRunner ProjectRunner
+        {
+            get { return _projectRunner; }
+            set { _projectRunner = value; RaisePropertyChangedAuto(); }
+        }
+
+        public ObservableCollection<Script> OpenScripts { get; set; }
+
+        private Script _selectedScript;
+        public Script SelectedScript
+        {
+            get { return _selectedScript; }
+            set { _selectedScript = value; RaisePropertyChangedAuto(); }
+        }
+
+        public RelayCommand<Script> OpenScriptCommand { get; set; }
+        public RelayCommand<Script> CloseScriptCommand { get; set; }
+        public RelayCommand RunProjectCommand { get; set; }
+        public RelayCommand StopProjectCommand { get; set; }
+
+        public TestDesignerViewVM()
+        {
+            OpenScripts = new ObservableCollection<Script>();
+            OpenScriptCommand = new RelayCommand<Script>(OpenScript);
+            CloseScriptCommand = new RelayCommand<Script>(CloseScript);
+            RunProjectCommand = new RelayCommand(RunProject);
+            StopProjectCommand = new RelayCommand(StopProject);
+
+            CreateNewProject();
+        }
+
+        private void StopProject()
+        {
+            ProjectRunner.Stop();
+        }
+
+        private async void RunProject()
+        {
+            try
+            {
+                var obj = await ProjectRunner.Run();
+                await NotificationProvider.ShowSuccess(obj.ToString());
+            }
+            catch (OperationCanceledException)
+            {
+                //Do nothing.
+            }
+            catch (Exception ex)
+            {
+                await NotificationProvider.ShowError(ex.FlattenMessage());
+            }
+        }
+
+        private void CloseScript(Script script)
+        {
+            script.IsSelected = false;
+            OpenScripts.Remove(script);
+            SelectedScript = OpenScripts.FirstOrDefault();
+        }
+
+        internal void OpenScript(Script script)
+        {
+            if (!OpenScripts.Contains(script))
+            {
+                OpenScripts.Add(script);
+            }
+
+            SelectedScript = script;
+        }
+
+        private void CreateNewProject()
+        {
+            var project = Project.New("test1", Encoding.UTF8.GetString(Properties.Resources.main_template));
+            project.Scripts.Add(Script.New("lib.csx", Encoding.UTF8.GetString(Properties.Resources.lib_template)));
+            project.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = this.GetType() });
+            project.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(PMR.Common.MessageType) });
+            project.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(ITransporter) });
+            project.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(IMachineOperator) });
+            project.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(IMessage) });
+
+            Project = project;
+        }
+
+        private void OnProjectChanged()
+        {
+            if (Project != null)
+            {
+                ProjectRunner = new ProjectRunner(Project);
+            }
+            else
+            {
+                ProjectRunner = null;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestRunnerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestRunnerViewVM.cs
new file mode 100644
index 000000000..d3e968774
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestRunnerViewVM.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.FSE.Common;
+
+namespace Tango.FSE.Stubs.ViewModels
+{
+   public  class TestRunnerViewVM : FSEViewModel
+    {
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml
index 22dd83edc..41ac9b64e 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/MainView.xaml
@@ -5,10 +5,14 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:global="clr-namespace:Tango.FSE.Stubs"
              xmlns:vm="clr-namespace:Tango.FSE.Stubs.ViewModels"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.FSE.Stubs.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <Grid>
-        <TextBlock FontSize="60" HorizontalAlignment="Center" VerticalAlignment="Center">Diagnostics View</TextBlock>
+        <controls:NavigationControl TransitionAlwaysFades="True">
+            <local:TestRunnerView/>
+            <local:TestDesignerView/>
+        </controls:NavigationControl>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml
new file mode 100644
index 000000000..1b5e52db7
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml
@@ -0,0 +1,324 @@
+<UserControl x:Class="Tango.FSE.Stubs.Views.TestDesignerView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:global="clr-namespace:Tango.FSE.Stubs"
+             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:vm="clr-namespace:Tango.FSE.Stubs.ViewModels"
+             xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:editors="clr-namespace:Tango.Scripting.Editors;assembly=Tango.Scripting.Editors"
+             xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common"
+             xmlns:local="clr-namespace:Tango.FSE.Stubs.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:TestDesignerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.TestDesignerViewVM}" Background="{StaticResource FSE_PrimaryBackgroundBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
+    <Grid>
+        <Grid>
+            <DockPanel>
+                <Menu IsMainMenu="True" DockPanel.Dock="Top">
+                    <MenuItem Header="_File">
+                        <MenuItem Header="_New" Command="{Binding NewProjectCommand}">
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="FileDocument" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="_Open" Command="{Binding OpenProjectCommand}">
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="FileEdit" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </MenuItem>
+                    <MenuItem Header="_Edit">
+                        <MenuItem Header="_Undo" Command="Undo">
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="Undo" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="_Redo" Command="Redo">
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="Redo" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <Separator/>
+                        <MenuItem Header="_Cut" Command="Cut">
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="ContentCut" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="_Copy" Command="Copy">
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="ContentCopy" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        <MenuItem Header="_Paste" Command="Paste">
+                            <MenuItem.Icon>
+                                <material:PackIcon Kind="ContentPaste" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                    </MenuItem>
+                    <MenuItem Header="Debug"></MenuItem>
+                    <MenuItem Header="Publish"></MenuItem>
+                </Menu>
+
+                <Grid DockPanel.Dock="Top">
+                    <!--Toolbar-->
+                    <ToolBar ClipToBounds="False" Background="Transparent" HorizontalAlignment="Center" ToolBarTray.IsLocked="True">
+                        <Button ToolTip="Save">
+                            <material:PackIcon Kind="ContentSave" />
+                        </Button>
+                        <Separator />
+                        <Button Command="Undo" ToolTip="Undo" ToolBar.OverflowMode="AsNeeded">
+                            <material:PackIcon Kind="Undo" />
+                        </Button>
+                        <Button Command="Redo" ToolTip="Redo" ToolBar.OverflowMode="AsNeeded">
+                            <material:PackIcon Kind="Redo" />
+                        </Button>
+                        <Separator/>
+                        <Button Command="Cut" ToolTip="Cut" ToolBar.OverflowMode="AsNeeded">
+                            <material:PackIcon Kind="ContentCut" />
+                        </Button>
+                        <Button Command="Copy" ToolTip="Copy" ToolBar.OverflowMode="AsNeeded">
+                            <material:PackIcon Kind="ContentCopy" />
+                        </Button>
+                        <Separator />
+                        <Button Command="Paste" ToolTip="Paste" ToolBar.OverflowMode="AsNeeded">
+                            <material:PackIcon Kind="ContentPaste" />
+                        </Button>
+                        <Separator/>
+                        <Button ToolTip="Run (F5)" ToolBar.OverflowMode="AsNeeded" Command="{Binding RunProjectCommand}" Visibility="{Binding ProjectRunner.IsRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                            <DockPanel>
+                                <material:PackIcon Kind="Play" Foreground="{StaticResource FSE_GreenBrush}" />
+                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Start</TextBlock>
+                            </DockPanel>
+                        </Button>
+                        <Button ToolTip="Stop" ToolBar.OverflowMode="AsNeeded" Command="{Binding StopProjectCommand}" Visibility="{Binding ProjectRunner.IsRunning,Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <DockPanel>
+                                <material:PackIcon Kind="Stop" Foreground="{StaticResource FSE_RedBrush}" />
+                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Stop</TextBlock>
+                            </DockPanel>
+                        </Button>
+                    </ToolBar>
+                </Grid>
+
+                <Grid DockPanel.Dock="Bottom" Height="25" Background="{StaticResource FSE_PrimaryAccentDarkBrush}">
+                    <!--Status Bar-->
+                </Grid>
+
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="499*"/>
+                        <ColumnDefinition Width="5"/>
+                        <ColumnDefinition Width="134*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="491*"/>
+                            <RowDefinition Height="5"/>
+                            <RowDefinition Height="174*"/>
+                        </Grid.RowDefinitions>
+
+                        <Grid>
+                            <!--Code Editor-->
+                            <DockPanel>
+                                <Grid DockPanel.Dock="Top" Height="35">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="10" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="100*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Rectangle Grid.Column="0" VerticalAlignment="Bottom" StrokeThickness="2" Stroke="{StaticResource FSE_PrimaryAccentDarkBrush}" />
+                                    <ListBox x:Name="listTabs" Grid.Column="1"  DisplayMemberPath="Tag" ItemsSource="{Binding OpenScripts}" SelectedItem="{Binding SelectedScript,Mode=TwoWay}" SelectedIndex="0">
+                                        <ListBox.Style>
+                                            <Style TargetType="ListBox" BasedOn="{StaticResource {x:Type ListBox}}">
+                                                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"></Setter>
+                                                <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"></Setter>
+                                                <Setter Property="ItemsPanel">
+                                                    <Setter.Value>
+                                                        <ItemsPanelTemplate>
+                                                            <UniformGrid Margin="15 0 0 0" Columns="{Binding RelativeSource={RelativeSource AncestorType=ListBox},Path=Items.Count}" IsItemsHost="True"></UniformGrid>
+                                                        </ItemsPanelTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                                <Setter Property="ItemContainerStyle">
+                                                    <Setter.Value>
+                                                        <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                            <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+                                                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                                                            <Setter Property="Background" Value="{StaticResource FSE_PrimaryBackgroundBrush}"></Setter>
+                                                            <Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource FSE_GrayBrush}"></Setter>
+                                                            <Setter Property="Width" Value="200"></Setter>
+                                                            <Setter Property="IsSelected" Value="{Binding IsSelected,Mode=OneWayToSource}"></Setter>
+                                                            <Setter Property="Template">
+                                                                <Setter.Value>
+                                                                    <ControlTemplate TargetType="ListBoxItem">
+                                                                        <Grid x:Name="grid" Margin="-15 0 0 0" Background="Transparent">
+                                                                            <Viewbox Stretch="Fill">
+                                                                                <Grid>
+                                                                                    <Polygon Fill="{TemplateBinding Background}" Stretch="Fill" Points="0,30 15,0 85,0 100,30"></Polygon>
+                                                                                    <Polygon Fill="White" Stretch="Fill" Points="0,30 15,0 85,0 100,30" IsHitTestVisible="False" Opacity="0.1">
+                                                                                        <Polygon.Style>
+                                                                                            <Style TargetType="Polygon">
+                                                                                                <Setter Property="Visibility" Value="Hidden"></Setter>
+                                                                                                <Style.Triggers>
+                                                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsMouseOver}" Value="True">
+                                                                                                        <Setter Property="Visibility" Value="Visible"></Setter>
+                                                                                                    </DataTrigger>
+                                                                                                </Style.Triggers>
+                                                                                            </Style>
+                                                                                        </Polygon.Style>
+                                                                                    </Polygon>
+                                                                                    <Polyline Stroke="{StaticResource FSE_PrimaryAccentDarkBrush}" StrokeThickness="1" Stretch="Fill" Points="0,30 15,0 85,0 100,30" />
+                                                                                    <Rectangle VerticalAlignment="Bottom" Stroke="{StaticResource FSE_PrimaryAccentDarkBrush}" StrokeThickness="1" />
+                                                                                </Grid>
+                                                                            </Viewbox>
+
+                                                                            <Grid>
+                                                                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Name}"></TextBlock>
+                                                                                <controls:IconButton Cursor="Hand" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.CloseScriptCommand}" CommandParameter="{Binding}" Width="24" Height="24" Margin="0 0 30 0" HorizontalAlignment="Right" VerticalAlignment="Center" Icon="Close"></controls:IconButton>
+                                                                            </Grid>
+                                                                        </Grid>
+                                                                        <ControlTemplate.Triggers>
+                                                                            <Trigger Property="IsSelected" Value="True">
+
+                                                                            </Trigger>
+                                                                        </ControlTemplate.Triggers>
+                                                                    </ControlTemplate>
+                                                                </Setter.Value>
+                                                            </Setter>
+                                                            <Style.Triggers>
+                                                                <Trigger Property="IsSelected" Value="True">
+                                                                    <Setter Property="Background" Value="{StaticResource FSE_PrimaryAccentDarkBrush}"></Setter>
+                                                                    <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"></Setter>
+                                                                    <Setter Property="FontWeight" Value="SemiBold"></Setter>
+                                                                    <Setter Property="Panel.ZIndex" Value="200"></Setter>
+                                                                </Trigger>
+                                                                <Trigger Property="IsSelected" Value="False">
+                                                                    <Setter Property="Panel.ZIndex" Value="-1"></Setter>
+                                                                </Trigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Style>
+                                        </ListBox.Style>
+                                    </ListBox>
+                                    <Rectangle Grid.Column="2" VerticalAlignment="Bottom" StrokeThickness="2" Stroke="{StaticResource FSE_PrimaryAccentDarkBrush}" />
+                                </Grid>
+
+                                <ItemsControl x:Name="tabControl" Margin="0 0 0 0" ItemsSource="{Binding Project.Scripts}" BorderThickness="0" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <Grid/>
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                    <ItemsControl.ItemContainerStyle>
+                                        <Style TargetType="FrameworkElement">
+                                            <Setter Property="Visibility" Value="Hidden"></Setter>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding IsSelected}" Value="True">
+                                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </ItemsControl.ItemContainerStyle>
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <editors:ScriptEditor 
+                                            ReferenceAssemblies="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Project.ReferenceAssembliesLoaded}" 
+                                            AdditionalScripts="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Project.AdditionalScripts}"
+                                            Code="{Binding Code,Mode=TwoWay}" />
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                            </DockPanel>
+                        </Grid>
+
+                        <GridSplitter Grid.Row="1" Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
+
+                        <Grid Grid.Row="2">
+                            <!--Output & Error Tabs-->
+                            <TabControl ItemContainerStyle="{StaticResource FSE_TabItem_VisualStudio_Output}" TabStripPlacement="Bottom" Margin="0" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}" BorderThickness="0">
+                                <TabItem Header="OUTPUT"></TabItem>
+                                <TabItem Header="ERRORS"></TabItem>
+                            </TabControl>
+                        </Grid>
+                    </Grid>
+
+                    <GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Center" VerticalAlignment="Stretch" Margin="0 30" />
+
+                    <Grid Grid.Column="2">
+                        <Grid Margin="0 32 0 29">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="451*"/>
+                                <RowDefinition Height="5"/>
+                                <RowDefinition Height="300*"/>
+                            </Grid.RowDefinitions>
+                            <!--Project Explorer-->
+                            <GroupBox material:ColorZoneAssist.Mode="PrimaryDark" Header="PROJECT EXPLORER" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}">
+                                <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+                                    <StackPanel>
+                                        <DockPanel>
+                                            <material:PackIcon Kind="ClockFast" />
+                                            <TextBlock Margin="5 0 0 0" Text="{Binding Project.Name}"></TextBlock>
+                                        </DockPanel>
+
+                                        <DockPanel Margin="5 10 0 0">
+                                            <controls:ToggleIconButton Width="20" Height="20" x:Name="chkReference" UncheckedIcon="ChevronRight" CheckedIcon="ChevronDown" Cursor="Hand"/>
+                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Reference Assemblies</TextBlock>
+                                        </DockPanel>
+
+                                        <ListBox Margin="25 5 0 0" ItemsSource="{Binding Project.ReferenceAssemblies}" Visibility="{Binding ElementName=chkReference,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <DockPanel>
+                                                        <material:PackIcon Kind="Library" />
+                                                        <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                    </DockPanel>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+
+                                        <ListBox Margin="5 5 0 0" ItemsSource="{Binding Project.Scripts}" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <EventSetter Event="PreviewMouseDoubleClick" Handler="OnScriptItemDoubleClick"></EventSetter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <DockPanel>
+                                                        <material:PackIcon Kind="Script" />
+                                                        <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                    </DockPanel>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </StackPanel>
+                                </ScrollViewer>
+                            </GroupBox>
+
+                            <GridSplitter Grid.Row="1" Height="5" VerticalAlignment="Center" HorizontalAlignment="Stretch" />
+
+                            <Grid Grid.Row="2">
+                                <GroupBox material:ColorZoneAssist.Mode="PrimaryDark" Header="PROPERTIES" Background="{StaticResource FSE_PrimaryBackgroundDarkBrush}">
+                                    <DockPanel>
+                                        <StackPanel DockPanel.Dock="Top" Margin="10">
+                                            <TextBlock>Project Name</TextBlock>
+                                            <TextBox Margin="0 2 0 0" Text="{Binding Project.Name,UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource FSE_Rounded_Corners_TextBox}"></TextBox>
+                                        </StackPanel>
+                                        <DockPanel Margin="10 0 10 5">
+                                            <TextBlock DockPanel.Dock="Top">Project Description</TextBlock>
+                                            <TextBox Margin="0 2 0 0" Text="{Binding Project.Description,UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource FSE_Rounded_Corners_TextBox_Multiline}" Background="Transparent" ></TextBox>
+                                        </DockPanel>
+                                    </DockPanel>
+                                </GroupBox>
+                            </Grid>
+                        </Grid>
+                    </Grid>
+                </Grid>
+            </DockPanel>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml.cs
new file mode 100644
index 000000000..ab9289ddb
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestDesignerView.xaml.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.FSE.Stubs.ViewModels;
+using Tango.Scripting.Basic;
+
+namespace Tango.FSE.Stubs.Views
+{
+    /// <summary>
+    /// Interaction logic for TestDesignerView.xaml
+    /// </summary>
+    public partial class TestDesignerView : UserControl
+    {
+        private TestDesignerViewVM _vm;
+
+        public TestDesignerView()
+        {
+            InitializeComponent();
+            Loaded += (_, __) => _vm = DataContext as TestDesignerViewVM;
+        }
+
+        private void OnScriptItemDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            _vm.OpenScript((sender as FrameworkElement).DataContext as Script);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml
new file mode 100644
index 000000000..daf1d2ac0
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="Tango.FSE.Stubs.Views.TestRunnerView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:global="clr-namespace:Tango.FSE.Stubs"
+             xmlns:vm="clr-namespace:Tango.FSE.Stubs.ViewModels"
+             xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:local="clr-namespace:Tango.FSE.Stubs.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:TestRunnerViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.TestRunnerViewVM}" Background="{StaticResource FSE_PrimaryBackgroundBrush}" Foreground="{StaticResource FSE_PrimaryForegroundBrush}">
+
+    
+</UserControl>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml.cs
new file mode 100644
index 000000000..f37986847
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Views/TestRunnerView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.FSE.Stubs.Views
+{
+    /// <summary>
+    /// Interaction logic for TestRunnerView.xaml
+    /// </summary>
+    public partial class TestRunnerView : UserControl
+    {
+        public TestRunnerView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Colors.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Colors.xaml
index 0c234fda4..b7e579d72 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Colors.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Colors.xaml
@@ -100,6 +100,31 @@
     <SolidColorBrush x:Key="PrimaryHueLightBrush" Color="{StaticResource FSE_PrimaryBackgroundLightColor}"/>
     <SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="{StaticResource FSE_PrimaryForegroundColor}"/>
     <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="{StaticResource FSE_PrimaryAccentColor}"/>
+    
+    <!--MAHAPPS OVERRIED-->
+    <Color x:Key="HighlightColor">#009FE7</Color>
+    <Color x:Key="AccentColor3">#009FE7</Color>
+    <Color x:Key="AccentColor2">#009FE7</Color>
+    <Color x:Key="AccentColor1">#009FE7</Color>
+    <SolidColorBrush x:Key="HighlightBrush" Color="{DynamicResource Primary700}"/>
+    <SolidColorBrush x:Key="AccentBaseColorBrush" Color="{DynamicResource Primary600}" />
+    <SolidColorBrush x:Key="AccentColorBrush" Color="{DynamicResource Primary500}"/>
+    <SolidColorBrush x:Key="AccentColorBrush2" Color="{DynamicResource Primary400}"/>
+    <SolidColorBrush x:Key="AccentColorBrush3" Color="{DynamicResource Primary300}"/>
+    <SolidColorBrush x:Key="AccentColorBrush4" Color="{DynamicResource Primary200}"/>
+    <SolidColorBrush x:Key="WindowTitleColorBrush" Color="{DynamicResource Primary700}"/>
+    <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="{DynamicResource Primary500Foreground}"/>
+    <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
+        <GradientStop Color="{DynamicResource Primary700}" Offset="0"/>
+        <GradientStop Color="{DynamicResource Primary300}" Offset="1"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="CheckmarkFill" Color="{DynamicResource Primary500}"/>
+    <SolidColorBrush x:Key="RightArrowFill" Color="{DynamicResource Primary500}"/>
+    <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="{DynamicResource Primary500Foreground}"/>
+    <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="{DynamicResource Primary500}" Opacity="0.4"/>
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchBrush.Win10" Color="{DynamicResource Primary500}" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.OnSwitchMouseOverBrush.Win10" Color="{DynamicResource Primary400}" />
+    <SolidColorBrush x:Key="MahApps.Metro.Brushes.ToggleSwitchButton.ThumbIndicatorCheckedBrush.Win10" Color="{DynamicResource Primary500Foreground}" />
 
     <!-- primary -->
     <!--<SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="#4D1DCF"/>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/App.config b/Software/Visual_Studio/FSE/Tango.FSE.UI/App.config
index 09ca618be..7718ac028 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/App.config
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/App.config
@@ -18,23 +18,23 @@
         <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
       </dependentAssembly>
-      <dependentAssembly>
+      <!--<dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
+      </dependentAssembly>-->
+      <!--<dependentAssembly>
         <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
+      </dependentAssembly>-->
+      <!--<dependentAssembly>
         <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
+      </dependentAssembly>-->
+      <!--<dependentAssembly>
         <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
@@ -53,7 +53,7 @@
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
+      </dependentAssembly>-->
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
index af4dd0c77..6f37af1a0 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
@@ -50,6 +50,9 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
+    <Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath>
+    </Reference>
     <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/packages.config b/Software/Visual_Studio/FSE/Tango.FSE.UI/packages.config
index a55bb6f29..586a92138 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/packages.config
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/packages.config
@@ -3,6 +3,7 @@
   <package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
   <package id="Dragablz" version="0.0.3.203" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
+  <package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net461" />
   <package id="Google.Protobuf" version="3.4.1" targetFramework="net461" />
   <package id="Ionic.Zip" version="1.9.1.8" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" />
@@ -17,4 +18,53 @@
   <package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net461" />
   <package id="WindowsAPICodePack-Core" version="1.1.1" targetFramework="net461" />
   <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net461" />
+
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.4.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.4.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.4.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Scripting" version="2.4.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Scripting.Common" version="2.4.0" targetFramework="net461" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net461" />
+  <package id="System.Console" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net461" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net461" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net461" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
+  <package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net461" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index ddf61e124..ff7a3acc2 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -20,7 +20,19 @@ namespace Tango.Scripting.Basic
 {
     public class Project : ExtendedObject
     {
-        public String Name { get; set; }
+        private String _name;
+        public String Name
+        {
+            get { return _name; }
+            set { _name = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _description;
+        public String Description
+        {
+            get { return _description; }
+            set { _description = value; RaisePropertyChangedAuto(); }
+        }
 
         public ApartmentState ApartmentState { get; set; }
 
@@ -79,7 +91,7 @@ namespace Tango.Scripting.Basic
 
             p.Scripts.Add(new Script()
             {
-                Name = "main.csx",
+                Name = name,
                 IsEntryPoint = true,
                 Code = code,
             });
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs
index a613f2bcc..565949402 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs
@@ -9,6 +9,7 @@ namespace Tango.Scripting.Basic
     public class ProjectSession
     {
         private Action _abortAction;
+        private TaskCompletionSource<object> _completion;
 
         public event EventHandler<ProjectSessionStateChangedEventArgs> StateChanged;
 
@@ -18,6 +19,7 @@ namespace Tango.Scripting.Basic
 
         public ProjectSession(Project project, Action abortAction)
         {
+            _completion = new TaskCompletionSource<object>();
             Project = project;
             _abortAction = abortAction;
         }
@@ -26,24 +28,27 @@ namespace Tango.Scripting.Basic
         {
             _abortAction();
             State = ProjectSessionState.Aborted;
+            _completion.SetException(new OperationCanceledException("Project execution aborted."));
             RaiseStateChanged();
         }
 
         internal void Failed(Exception ex)
         {
             State = ProjectSessionState.Failed;
+            _completion.SetException(ex);
             RaiseStateChanged(null, ex);
         }
 
         internal void Completed(object returnValue)
         {
             State = ProjectSessionState.Completed;
+            _completion.SetResult(returnValue);
             RaiseStateChanged(returnValue, null);
         }
 
         private void RaiseStateChanged(object returnValue = null, Exception ex = null)
         {
-            StateChanged?.Invoke(this, 
+            StateChanged?.Invoke(this,
                 new ProjectSessionStateChangedEventArgs()
                 {
                     ReturnValue = returnValue,
@@ -51,5 +56,10 @@ namespace Tango.Scripting.Basic
                     Exception = ex
                 });
         }
+
+        public Task<Object> WaitForCompletion()
+        {
+            return _completion.Task;
+        }
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs
index 15ef49639..be66e026b 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs
@@ -9,5 +9,10 @@ namespace Tango.Scripting.Basic
     public class ReferenceAssembly
     {
         public Type FromType { get; set; }
+
+        public String Name
+        {
+            get { return FromType.Assembly.GetName().Name; }
+        }
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Script.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Script.cs
index aab22912d..fce05636d 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Script.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Script.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -15,6 +16,15 @@ namespace Tango.Scripting.Basic
         public String Code { get; set; }
         public bool IsEntryPoint { get; set; }
 
+        private bool _isSelected;
+        [JsonIgnore]
+        public bool IsSelected
+        {
+            get { return _isSelected; }
+            set { _isSelected = value; RaisePropertyChangedAuto(); }
+        }
+
+
         public static Script New(String file)
         {
             return new Script()
@@ -23,5 +33,14 @@ namespace Tango.Scripting.Basic
                 Code = System.IO.File.ReadAllText(file),
             };
         }
+
+        public static Script New(String name, String code)
+        {
+            return new Script()
+            {
+                Name = name,
+                Code = code,
+            };
+        }
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs
index f8cc7072d..2ead15d0d 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs
@@ -150,7 +150,12 @@ namespace Tango.Scripting.Editors.Intellisense
                     var property = knownType.Properties[i];
                     var pDoc = docNodes.FirstOrDefault(x => x.Attributes["name"].InnerText.Contains(knownType.Type.Name + "." + property.Name));
 
-                    property.Summary = pDoc != null ? pDoc.SelectSingleNode("summary").InnerXml : "No documentation";
+
+                    if (pDoc != null)
+                    {
+                        var summaryNode = pDoc.SelectSingleNode("summary");
+                        property.Summary = summaryNode != null ? summaryNode.InnerXml : "No documentation";
+                    }
                 }
             }
 
@@ -162,7 +167,12 @@ namespace Tango.Scripting.Editors.Intellisense
                     {
                         var field = knownType.Fields[i];
                         var pDoc = xmlDoc.SelectSingleNode("//member[starts-with(@name, '" + $"F:{knownType.Type.FullName}.{field.Name}" + "')]");
-                        field.Summary = pDoc != null ? pDoc.SelectSingleNode("summary").InnerXml : "No documentation";
+
+                        if (pDoc != null)
+                        {
+                            var summaryNode = pDoc.SelectSingleNode("summary");
+                            field.Summary = summaryNode != null ? summaryNode.InnerXml : "No documentation";
+                        }
                     }
                 }
             }
-- 
cgit v1.3.1


From f06785ae3312a82b8f2237b55e8c4eeb174c3519 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 20 Apr 2020 23:28:38 +0300
Subject: Scripting.

---
 .../ConsoleApp8/ConsoleApp8/lib_template.csx       |  14 ++
 .../ConsoleApp8/ConsoleApp8/main_template.csx      |  16 ++
 .../FSE/Modules/Tango.FSE.Stubs/ITestContext.cs    |  26 +++
 .../FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs   |  15 +-
 .../Tango.FSE.Stubs/Resources/main_template.csx    |   2 +-
 .../Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj |  22 ++-
 .../FSE/Modules/Tango.FSE.Stubs/TestContext.cs     | 179 +++++++++++++++++++++
 .../ViewModels/TestDesignerViewVM.cs               |   3 +-
 .../FSE/Modules/Tango.FSE.Stubs/packages.config    |   6 +
 Software/Visual_Studio/FSE/Tango.FSE.UI/App.config |   8 +-
 .../FSE/Tango.FSE.UI/Tango.FSE.UI.csproj           |  94 +++++++++--
 .../Visual_Studio/FSE/Tango.FSE.UI/packages.config |  48 ++++++
 .../Scripting/Tango.Scripting.Basic/IContext.cs    |   2 +-
 .../Scripting/Tango.Scripting.Basic/Project.cs     |  29 ++--
 .../Scripting/Tango.Scripting.Basic/Script.cs      |   5 +-
 15 files changed, 431 insertions(+), 38 deletions(-)
 create mode 100644 Software/Experiments/RoslynTest/ConsoleApp8/ConsoleApp8/lib_template.csx
 create mode 100644 Software/Experiments/RoslynTest/ConsoleApp8/ConsoleApp8/main_template.csx
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs
 create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs

(limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs')

diff --git a/Software/Experiments/RoslynTest/ConsoleApp8/ConsoleApp8/lib_template.csx b/Software/Experiments/RoslynTest/ConsoleApp8/ConsoleApp8/lib_template.csx
new file mode 100644
index 000000000..93c79d32f
--- /dev/null
+++ b/Software/Experiments/RoslynTest/ConsoleApp8/ConsoleApp8/lib_template.csx
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+public class lib
+{
+    public void Show(String msg)
+    {
+        MessageBox.Show(msg);
+    }
+}
diff --git a/Software/Experiments/RoslynTest/ConsoleApp8/ConsoleApp8/main_template.csx b/Software/Experiments/RoslynTest/ConsoleApp8/ConsoleApp8/main_template.csx
new file mode 100644
index 000000000..61d086068
--- /dev/null
+++ b/Software/Experiments/RoslynTest/ConsoleApp8/ConsoleApp8/main_template.csx
@@ -0,0 +1,16 @@
+#load "lib.csx"
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ConsoleApp8;
+
+public TestResult OnExecute(String msg)
+{
+    lib l = new lib();
+    l.Show(msg);
+
+    return new TestResult() { Value = "This is a return value" };
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs
new file mode 100644
index 000000000..671b2174a
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ITestContext.cs
@@ -0,0 +1,26 @@
+using Google.Protobuf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Operation;
+using Tango.Scripting.Basic;
+
+namespace Tango.FSE.Stubs
+{
+    public interface ITestContext : IContext
+    {
+        IMessage Run(String stubName, params Object[] args);
+        IMessage Run(IMessage stub);
+        void RunContinuous<T>(T stub, Action<T> callback) where T : class, IMessage;
+        void RunContinuous<T>(String stubName, Action<T> callback, params Object[] args) where T : class, IMessage;
+        void WriteLine(Object obj);
+        void Write(Object obj);
+        void WriteLineHex(Object number, int digits);
+        void WriteHex(Object number, int digits);
+        void Clear();
+        void WriteToFile(String filePath, String content);
+        void AppendToFile(String filePath, String content);
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
index 0625fa08f..00ab0caca 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ProjectRunner.cs
@@ -35,8 +35,17 @@ namespace Tango.FSE.Stubs
         {
             if (State != ProjectRunnerState.Compiling && State != ProjectRunnerState.Running)
             {
-                State = ProjectRunnerState.Compiling;
-                _currentSession = await Project.Run(null);
+                try
+                {
+                    State = ProjectRunnerState.Compiling;
+                    _currentSession = await Project.Run(null);
+                }
+                catch (Exception ex)
+                {
+                    State = ProjectRunnerState.None;
+                    throw ex;
+                }
+
                 State = ProjectRunnerState.Running;
 
                 try
@@ -62,7 +71,7 @@ namespace Tango.FSE.Stubs
 
         public void Stop()
         {
-            _currentSession.Abort();
+            _currentSession?.Abort();
             State = ProjectRunnerState.Aborted;
         }
     }
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
index 3d6c4f3b9..34604c6d3 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Resources/main_template.csx
@@ -7,7 +7,7 @@ using Tango.FSE.Stubs;
 
 public class Program
 {
-    public Object OnExecute(IContext context)
+    public Object OnExecute(ITestContext context)
     {
 
         return new
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj
index 3e495564d..9058bf074 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/Tango.FSE.Stubs.csproj
@@ -61,6 +61,22 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Linq, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.Linq.3.1.1\lib\net46\System.Reactive.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.PlatformServices.3.1.1\lib\net46\System.Reactive.PlatformServices.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
@@ -80,8 +96,10 @@
   <ItemGroup>
     <Compile Include="Designer\ProjectModel.cs" />
     <Compile Include="Designer\ScriptTabModel.cs" />
+    <Compile Include="ITestContext.cs" />
     <Compile Include="ProjectRunner.cs" />
     <Compile Include="ProjectRunnerState.cs" />
+    <Compile Include="TestContext.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="StubsModule.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
@@ -115,7 +133,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs
new file mode 100644
index 000000000..e40ccebfc
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/TestContext.cs
@@ -0,0 +1,179 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Google.Protobuf;
+using Tango.Core.DI;
+using Tango.FSE.Common.Notifications;
+using Tango.FSE.Common.Threading;
+using Tango.Integration.Operation;
+using Tango.PMR;
+using Tango.Scripting.Basic;
+
+namespace Tango.FSE.Stubs
+{
+    public class TestContext : ITestContext
+    {
+        private IMachineOperator _machineOperator;
+        private INotificationProvider _notificationProvider;
+        private IDispatcherProvider _dispatcherProvider;
+
+        public TestContext(IMachineOperator machineOperator, INotificationProvider notificationProvider, IDispatcherProvider dispatcherProvider)
+        {
+            _machineOperator = machineOperator;
+            _notificationProvider = notificationProvider;
+            _dispatcherProvider = dispatcherProvider;
+        }
+
+        public IMessage Run(string stubName, params object[] args)
+        {
+            var stubType = MessageFactory.GetAvailableRequestStubs().SingleOrDefault(x => x.Name.ToLower() == stubName.ToLower() || x.Name.Replace("Request", "").ToLower() == stubName.ToLower());
+            if (stubType == null)
+            {
+                throw new ArgumentException("Invalid stub '" + stubName + "'.");
+            }
+
+            var stubProps = stubType.GetProperties(BindingFlags.Public | BindingFlags.Instance);
+
+            if (stubProps.Length > args.Length)
+            {
+                throw new ArgumentOutOfRangeException("Not enough arguments for " + stubType.Name + ".");
+            }
+
+            Object request = Activator.CreateInstance(stubType);
+
+            int argIndex = 0;
+            foreach (var prop in stubProps)
+            {
+                Object arg = args[argIndex++];
+
+                if (prop.PropertyType == typeof(UInt32))
+                {
+                    prop.SetValue(request, UInt32.Parse(arg.ToString()));
+                }
+                else if (prop.PropertyType == typeof(bool))
+                {
+                    prop.SetValue(request, bool.Parse(arg.ToString()));
+                }
+                else if (prop.PropertyType.IsPrimitive)
+                {
+                    object converted = Convert.ChangeType(arg, prop.PropertyType);
+                    prop.SetValue(request, converted);
+                }
+                else
+                {
+                    prop.SetValue(request, arg);
+                }
+            }
+
+            return Run(request as IMessage);
+        }
+
+        public IMessage Run(IMessage stub)
+        {
+            return _machineOperator.SendRequest(stub, new Transport.TransportRequestConfig()).Result;
+        }
+
+        public void RunContinuous<T>(T stub, Action<T> callback) where T : class, IMessage
+        {
+            Type stubType = stub.GetType();
+
+            _machineOperator.SendContinuousRequest(stub, new Transport.TransportContinuousRequestConfig()).Subscribe((msg) =>
+            {
+                callback?.Invoke(msg as T);
+
+                //Next
+            }, (ex) =>
+            {
+                //OnFailed(ex);
+                //Error
+            }, () =>
+            {
+                //OnCompleted("Continuous request completed.");
+                //Completed
+            });
+        }
+
+        public void RunContinuous<T>(string stubName, Action<T> callback, params object[] args) where T : class, IMessage
+        {
+            var stubType = MessageFactory.GetAvailableRequestStubs().SingleOrDefault(x => x.Name.ToLower() == stubName.ToLower() || x.Name.Replace("Request", "").ToLower() == stubName.ToLower());
+            if (stubType == null)
+            {
+                throw new ArgumentException("Invalid stub '" + stubName + "'.");
+            }
+
+            var stubProps = stubType.GetProperties(BindingFlags.Public | BindingFlags.Instance);
+
+            if (stubProps.Length > args.Length)
+            {
+                throw new ArgumentOutOfRangeException("Not enough arguments for " + stubType.Name + ".");
+            }
+
+            IMessage request = Activator.CreateInstance(stubType) as IMessage;
+
+            int argIndex = 0;
+            foreach (var prop in stubProps)
+            {
+                Object arg = args[argIndex++];
+
+                if (prop.PropertyType == typeof(UInt32))
+                {
+                    prop.SetValue(request, UInt32.Parse(arg.ToString()));
+                }
+                else if (prop.PropertyType == typeof(bool))
+                {
+                    prop.SetValue(request, bool.Parse(arg.ToString()));
+                }
+                else if (prop.PropertyType.IsPrimitive)
+                {
+                    object converted = Convert.ChangeType(arg, prop.PropertyType);
+                    prop.SetValue(request, converted);
+                }
+                else
+                {
+                    prop.SetValue(request, arg);
+                }
+            }
+
+            RunContinuous<IMessage>(request, callback as Action<IMessage>);
+        }
+
+        public void WriteLine(object obj)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Write(object obj)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void WriteLineHex(object number, int digits)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void WriteHex(object number, int digits)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Clear()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void WriteToFile(string filePath, string content)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AppendToFile(string filePath, string content)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs
index 6544e643c..6e6873c9a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/ViewModels/TestDesignerViewVM.cs
@@ -95,7 +95,8 @@ namespace Tango.FSE.Stubs.ViewModels
 
         private void CreateNewProject()
         {
-            var project = Project.New("test1", Encoding.UTF8.GetString(Properties.Resources.main_template));
+            var project = Project.New("test1");
+            project.Scripts.Add(Script.New("Program.csx", Encoding.UTF8.GetString(Properties.Resources.main_template), true));
             project.Scripts.Add(Script.New("lib.csx", Encoding.UTF8.GetString(Properties.Resources.lib_template)));
             project.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = this.GetType() });
             project.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(PMR.Common.MessageType) });
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/packages.config b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/packages.config
index dd8c723e4..d17a56d7d 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/packages.config
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Stubs/packages.config
@@ -7,4 +7,10 @@
   <package id="MaterialDesignColors" version="1.2.2" targetFramework="net461" />
   <package id="MaterialDesignThemes" version="3.0.1" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="System.Reactive" version="3.1.1" targetFramework="net461" />
+  <package id="System.Reactive.Core" version="3.1.1" targetFramework="net461" />
+  <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net461" />
+  <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net461" />
+  <package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net461" />
+  <package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/App.config b/Software/Visual_Studio/FSE/Tango.FSE.UI/App.config
index 7718ac028..291f23910 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/App.config
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/App.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </configSections>
+  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <appSettings>
     <add key="GatewayUrl" value="http://localhost:2222" />
   </appSettings>
@@ -11,7 +11,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
   <runtime>
-    <legacyCorruptedStateExceptionsPolicy enabled="true|false"/>
+    <legacyCorruptedStateExceptionsPolicy enabled="true|false" />
     
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -81,7 +81,7 @@
       <dependentAssembly>
         <assemblyIdentity name="Z.EntityFramework.Extensions" publicKeyToken="59b66d028979105b" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.50.0" newVersion="4.0.50.0" />
-      </dependentAssembly>
+      </dependentAssembly>    
     </assemblyBinding>
   </runtime>
   <entityFramework>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
index 6f37af1a0..72b4bf121 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
@@ -68,6 +68,18 @@
     <Reference Include="MaterialDesignThemes.Wpf, Version=3.0.1.920, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CodeAnalysis, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Scripting, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.Scripting.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Scripting.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Scripting, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Scripting.Common.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
     </Reference>
@@ -78,13 +90,38 @@
       <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
+    </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.StackTrace, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll</HintPath>
+    </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="System.Management" />
+    <Reference Include="System.Numerics" />
     <Reference Include="System.Reactive.Core, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Reactive.Core.3.1.1\lib\net46\System.Reactive.Core.dll</HintPath>
     </Reference>
@@ -100,6 +137,30 @@
     <Reference Include="System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
+    <Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Encoding.CodePages, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -114,6 +175,18 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.XPath.XDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -535,15 +608,11 @@
   <ItemGroup>
     <Resource Include="Images\logout.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets'))" />
-  </Target>
   <PropertyGroup>
     <PostBuildEvent>RD /S /Q "$(TargetDir)cs\"
 RD /S /Q "$(TargetDir)da\"
@@ -602,4 +671,11 @@ if $(ConfigurationName) == Release del *.xml
 if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)ProtoCompilers\"
 if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\"</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/packages.config b/Software/Visual_Studio/FSE/Tango.FSE.UI/packages.config
index 54a423b24..9bec9f247 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/packages.config
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/packages.config
@@ -9,13 +9,61 @@
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net461" />
   <package id="MaterialDesignColors" version="1.2.2" targetFramework="net461" />
   <package id="MaterialDesignThemes" version="3.0.1" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.4.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.4.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.4.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Scripting" version="2.4.0" targetFramework="net461" />
+  <package id="Microsoft.CodeAnalysis.Scripting.Common" version="2.4.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net461" />
+  <package id="System.Console" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net461" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net461" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net461" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
   <package id="System.Reactive" version="3.1.1" targetFramework="net461" />
   <package id="System.Reactive.Core" version="3.1.1" targetFramework="net461" />
   <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net461" />
   <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net461" />
   <package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net461" />
   <package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net461" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net461" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
+  <package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net461" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
+  <package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net461" />
   <package id="WindowsAPICodePack-Core" version="1.1.1" targetFramework="net461" />
   <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/IContext.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/IContext.cs
index 906047c2a..d817c5d46 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/IContext.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/IContext.cs
@@ -8,6 +8,6 @@ namespace Tango.Scripting.Basic
 {
     public interface IContext
     {
-        void WriteLine(String s);
+        
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index ff7a3acc2..31be3a714 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -78,7 +78,7 @@ namespace Tango.Scripting.Basic
             }
         }
 
-        public static Project New(String name, String code)
+        public static Project New(String name)
         {
             Project p = new Project();
 
@@ -88,14 +88,6 @@ namespace Tango.Scripting.Basic
             p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Enumerable) });
             p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Form) });
             p.ReferenceAssemblies.Add(new ReferenceAssembly() { FromType = typeof(Project) });
-
-            p.Scripts.Add(new Script()
-            {
-                Name = name,
-                IsEntryPoint = true,
-                Code = code,
-            });
-
             return p;
         }
 
@@ -111,6 +103,7 @@ namespace Tango.Scripting.Basic
 
                 foreach (var script in Scripts)
                 {
+                    script.LoadCount = 0;
                     String code = script.Code;
                     String codeFile = Path.Combine(tempFolder, script.Name);
 
@@ -119,14 +112,14 @@ namespace Tango.Scripting.Basic
                     foreach (var file in Scripts.Where(x => !x.IsEntryPoint && script != x).Select(x => Path.Combine(tempFolder, x.Name)))
                     {
                         loadingString = $"#load \"{file}\"\n";
+                        script.LoadCount++;
                     }
 
                     code = loadingString + code;
 
                     if (!script.IsEntryPoint)
                     {
-
-
+                        //In case we use #load
                         //foreach (var match in Regex.Matches(code, "#load \".+\"").OfType<Match>())
                         //{
                         //    String line = match.ToString();
@@ -143,9 +136,6 @@ namespace Tango.Scripting.Basic
                         //        }
                         //    }
                         //}
-
-
-
                         File.WriteAllText(codeFile, code);
                     }
                     else
@@ -162,14 +152,19 @@ namespace Tango.Scripting.Basic
 
                 var compileResults = s.Compile();
 
-                foreach (var error in compileResults.Where(x => x.Severity == Microsoft.CodeAnalysis.DiagnosticSeverity.Error || x.Severity == Microsoft.CodeAnalysis.DiagnosticSeverity.Warning))
+                foreach (var error in compileResults.Where(x => x.Severity == Microsoft.CodeAnalysis.DiagnosticSeverity.Error))
                 {
                     CompilationError cError = new CompilationError();
                     cError.File = System.IO.Path.GetFileName(error.Location.SourceTree.FilePath);
+                    if (cError.File == String.Empty)
+                    {
+                        cError.File = Scripts.Single(x => x.IsEntryPoint).Name;
+                    }
+                    Script errorScript = Scripts.Single(x => x.Name == cError.File);
                     cError.Message = error.GetMessage();
                     cError.Severity = error.Severity;
                     var line = error.Location.GetMappedLineSpan();
-                    cError.Line = line.StartLinePosition.Line + 1;
+                    cError.Line = line.StartLinePosition.Line + 1 + (errorScript != null ? errorScript.LoadCount : 0);
                     cError.Column = line.StartLinePosition.Character + 1;
                     cError.Length = line.EndLinePosition.Character - line.StartLinePosition.Character;
                     result.Errors.Add(cError);
@@ -185,7 +180,7 @@ namespace Tango.Scripting.Basic
 
             if (result.Errors.Count > 0)
             {
-                throw new InvalidOperationException("There were compilation errors.");
+                throw new InvalidOperationException($"Cannot run project with the following compilation errors:\n{String.Join(Environment.NewLine, result.Errors.Select(x => x.Message))}");
             }
 
             Thread scriptThread = null;
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Script.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Script.cs
index fce05636d..753026149 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Script.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Script.cs
@@ -24,6 +24,8 @@ namespace Tango.Scripting.Basic
             set { _isSelected = value; RaisePropertyChangedAuto(); }
         }
 
+        [JsonIgnore]
+        public int LoadCount { get; internal set; }
 
         public static Script New(String file)
         {
@@ -34,12 +36,13 @@ namespace Tango.Scripting.Basic
             };
         }
 
-        public static Script New(String name, String code)
+        public static Script New(String name, String code, bool isEntryPoint = false)
         {
             return new Script()
             {
                 Name = name,
                 Code = code,
+                IsEntryPoint = isEntryPoint,
             };
         }
     }
-- 
cgit v1.3.1