Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 8 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index fef43a35f..8ca64ca18 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -21,6 +21,8 @@ namespace Tango.Scripting.Basic
 {
     public class Project<T> : ExtendedObject where T : IContext
     {
+        public String ID { get; set; }
+
         private String _name;
         public String Name
         {
@@ -52,6 +54,8 @@ namespace Tango.Scripting.Basic
 
         public Project()
         {
+            ID = Guid.NewGuid().ToString();
+
             ApartmentState = ApartmentState.MTA;
 
             ReferenceAssemblies = new ObservableCollection<ReferenceAssembly>();
@@ -65,7 +69,7 @@ namespace Tango.Scripting.Basic
             return Task.Factory.StartNew<CompilationResult>(() =>
             {
                 var result = new CompilationResult();
-                var tempFolder = TemporaryManager.CreateFolder(Name);
+                var tempFolder = TemporaryManager.CreateFolder(Name + "_" + ID);
                 result.TemporaryProjectPath = tempFolder;
 
                 String mainScriptCode = String.Empty;
@@ -81,11 +85,12 @@ 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";
+                        loadingString += $"#load \"{file}\"\n";
                         script.LoadCount++;
-                        script.LoadCharCount += loadingString.Length;
                     }
 
+                    script.LoadCharCount += loadingString.Length;
+
                     code = loadingString + code;
 
                     if (!script.IsEntryPoint)