From ee697f7a3350d0a97bddee4de3a2ae4f9d285052 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 2 May 2018 17:36:54 +0300
Subject: merge

---
 .../MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 8e6f11452..931130a05 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -13,6 +13,7 @@ using Tango.MachineStudio.Common.Speech;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.MachineStudio.Common.Video;
 using Tango.MachineStudio.UI.Authentication;
+using Tango.MachineStudio.UI.Console;
 using Tango.MachineStudio.UI.Html;
 using Tango.MachineStudio.UI.Modules;
 using Tango.MachineStudio.UI.Navigation;
@@ -64,7 +65,6 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Unregister<IHtmlPresenter>();
             TangoIOC.Default.Unregister<ITeamFoundationServiceClient>();
 
-            TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com/DefaultCollection", "Roy", "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa"));
             TangoIOC.Default.Register<INotificationProvider, DefaultNotificationProvider>();
             TangoIOC.Default.Register<IAuthenticationProvider, DefaultAuthenticationProvider>();
             TangoIOC.Default.Register<INavigationManager, DefaultNavigationManager>();
@@ -76,6 +76,7 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>();
             TangoIOC.Default.Register<ISpeechProvider, DefaultSpeechProvider>();
             TangoIOC.Default.Register<IHtmlPresenter, DefaultHtmlPresenter>();
+            TangoIOC.Default.Register<TeamFoundationServiceExtendedClient>(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa"));
 
             TangoIOC.Default.Register<MainViewVM>();
             TangoIOC.Default.Register<LoadingViewVM>();
@@ -85,6 +86,7 @@ namespace Tango.MachineStudio.UI
             TangoIOC.Default.Register<ConnectedMachineViewVM>();
             TangoIOC.Default.Register<MachineLoginViewVM>();
             TangoIOC.Default.Register<UpdateViewVM>();
+            TangoIOC.Default.Register<ConsoleWindowVM>();
 
             //Register View (Supervising Controller Pattern).
             //if (!ViewModelBase.IsInDesignModeStatic)
@@ -157,5 +159,13 @@ namespace Tango.MachineStudio.UI
                 return TangoIOC.Default.GetInstance<UpdateViewVM>();
             }
         }
+
+        public ConsoleWindowVM ConsoleWindowVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<ConsoleWindowVM>();
+            }
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.3.1