FSE work + fixed issue with personal access token on MS and PPC.

2 files changed, 25 insertions, 9 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index 85caf4706..14a9d94da 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -73,9 +73,9 @@ namespace Tango.Scripting.Basic
         {
             ReferenceAssembliesLoaded.Clear();
 
-            foreach (var type in ReferenceAssemblies)
+            foreach (var asm in ReferenceAssemblies)
             {
-                ReferenceAssembliesLoaded.Add(type.FromType.Assembly);
+                ReferenceAssembliesLoaded.Add(Assembly.LoadFrom(asm.File));
             }
         }
 
@@ -85,10 +85,10 @@ namespace Tango.Scripting.Basic
 
             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<T>) });
+            p.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(String)));
+            p.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(Enumerable)));
+            p.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(Form)));
+            p.ReferenceAssemblies.Add(ReferenceAssembly.FromType(typeof(Project<T>)));
             return p;
         }
 
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs
index be66e026b..4b04270c1 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs
@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -8,11 +10,25 @@ namespace Tango.Scripting.Basic
 {
     public class ReferenceAssembly
     {
-        public Type FromType { get; set; }
+        public String File { get; set; }
 
+        [JsonIgnore]
         public String Name
         {
-            get { return FromType.Assembly.GetName().Name; }
+            get { return Path.GetFileNameWithoutExtension(File); }
+        }
+
+        public static ReferenceAssembly FromType(Type type)
+        {
+            ReferenceAssembly reference = new ReferenceAssembly();
+            var assembly = type.Assembly;
+            reference.File = assembly.Location;
+            return reference;
+        }
+
+        public static ReferenceAssembly FromFile(String file)
+        {
+            return new ReferenceAssembly() { File = file };
         }
     }
 }