MERGE

1 files changed, 12 insertions, 3 deletions

diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
index d8a744fea..b156371c5 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
@@ -89,6 +89,7 @@ namespace Tango.Scripting.IDE
             RegisterProjectType(new UnitTestProjectType());
 
             Solution = new Solution();
+            Solution.SolutionLocation = @"C:\Test";
             Solution.Projects.Add(_projectTypes.First().NewProject("Test Project.stub"));
 
             //Init Commands
@@ -150,21 +151,29 @@ namespace Tango.Scripting.IDE
             
             if (vm.DialogResult)
             {
-
+                Solution newSolution = new Solution();
+                newSolution.Name = vm.SolutionName;
+                newSolution.SolutionLocation = vm.ProjectLocation;
+                Solution = newSolution;
+                StringBuilder builder = new StringBuilder(vm.ProjectLocation);
+                builder.AppendFormat(@"\{0}", vm.ProjectName);
+                Solution.Projects.Add(vm.SelectedProjectType.NewProject(builder.ToString()));
             }
         }
         private async void AddProject()
         {
             var vm = await NotificationManager.ShowDialog<AddProjectViewVM>(new AddProjectViewVM()
             {
-                //ProjectLocation = Directory.GetParent(Environment.CurrentDirectory).Parent.Parent.FullName
+                ProjectLocation = Solution.SolutionLocation
                 //ProjectLocation = Path.GetDirectoryName(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase))
                 //ProjectLocation = "Current Solution folder..."
             });
 
             if (vm.DialogResult)
             {
-
+                StringBuilder builder = new StringBuilder(vm.ProjectLocation);
+                builder.AppendFormat(@"\{0}", vm.ProjectName);
+                Solution.Projects.Add(vm.SelectedProjectType.NewProject(builder.ToString()));
             }
         }
         public bool IsSolutionProject(IProject SelectedItem)