Initial flow is working again.. needs much more cleanup but we are on…

… the right track :)

src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs

@@ -27,6 +27,7 @@
 using BuildVision.Exports.ViewModels;
 using BuildVision.Exports.Providers;
 using BuildVision.Contracts.Models;
+using Microsoft.VisualStudio;
 
 namespace BuildVision.UI.ViewModels
 {
@@ -181,9 +182,9 @@ public DataGridHeadersVisibility GridHeadersVisibility
         }
 
         private ProjectItem _selectedProjectItem;
-        private readonly IBuildService _buildManager;
         private readonly IBuildingProjectsProvider _buildingProjectsProvider;
         private readonly IBuildInformationProvider _buildInformationProvider;
+        private readonly IBuildService _buildService;
 
         public ProjectItem SelectedProjectItem
         {
@@ -192,11 +193,11 @@ public ProjectItem SelectedProjectItem
         }
 
         [ImportingConstructor]
-        public BuildVisionPaneViewModel(IBuildService buildManager, IBuildingProjectsProvider buildingProjectsProvider, IBuildInformationProvider buildInformationProvider, IPackageSettingsProvider settingsProvider, ISolutionProvider solutionProvider)
+        public BuildVisionPaneViewModel(IBuildingProjectsProvider buildingProjectsProvider, IBuildInformationProvider buildInformationProvider, IPackageSettingsProvider settingsProvider, ISolutionProvider solutionProvider, IBuildService buildService)
         {
-            _buildManager = buildManager;
             _buildingProjectsProvider = buildingProjectsProvider;
             _buildInformationProvider = buildInformationProvider;
+            _buildService = buildService;
             BuildInformationModel = _buildInformationProvider.GetBuildInformationModel();
             SolutionModel = solutionProvider.GetSolutionModel();
             ControlSettings = settingsProvider.Settings;
@@ -359,38 +360,38 @@ private void CopyErrorMessageToClipboard(ProjectItem projectItem)
 
         public ICommand SelectedProjectOpenContainingFolderAction => new RelayCommand(obj => OpenContainingFolder(),
                 canExecute: obj => (SelectedProjectItem != null && !string.IsNullOrEmpty(SelectedProjectItem.FullName)));
-    
+
         //public ICommand SelectedProjectCopyBuildOutputFilesToClipboardAction => new RelayCommand(
-        //    obj => _buildManager.ProjectCopyBuildOutputFilesToClipBoard(SelectedProjectItem),
+        //    obj => _buildService.ProjectCopyBuildOutputFilesToClipBoard(SelectedProjectItem),
         //    canExecute: obj => (SelectedProjectItem != null && !string.IsNullOrEmpty(SelectedProjectItem.UniqueName) && !ControlSettings.ProjectItemSettings.CopyBuildOutputFileTypesToClipboard.IsEmpty));
 
         //public ICommand SelectedProjectBuildAction => new RelayCommand(
-        //    obj => _buildManager.RaiseCommandForSelectedProject(SelectedProjectItem, (int)VSConstants.VSStd97CmdID.BuildCtx),
+        //    obj => _buildService.RaiseCommandForSelectedProject(SelectedProjectItem, (int)VSConstants.VSStd97CmdID.BuildCtx),
         //    canExecute: obj => IsProjectItemEnabledForActions());
 
 
         //public ICommand SelectedProjectRebuildAction => new RelayCommand(
-        //    obj => _buildManager.RaiseCommandForSelectedProject(SelectedProjectItem, (int)VSConstants.VSStd97CmdID.RebuildCtx),
+        //    obj => _buildService.RaiseCommandForSelectedProject(SelectedProjectItem, (int)VSConstants.VSStd97CmdID.RebuildCtx),
         //    canExecute: obj => IsProjectItemEnabledForActions());
 
         //public ICommand SelectedProjectCleanAction => new RelayCommand(
-        //    obj => _buildManager.RaiseCommandForSelectedProject(SelectedProjectItem, (int)VSConstants.VSStd97CmdID.CleanCtx),
+        //    obj => _buildService.RaiseCommandForSelectedProject(SelectedProjectItem, (int)VSConstants.VSStd97CmdID.CleanCtx),
         //    canExecute: obj => IsProjectItemEnabledForActions());
 
         public ICommand SelectedProjectCopyErrorMessagesAction => new RelayCommand(obj => CopyErrorMessageToClipboard(SelectedProjectItem),
         canExecute: obj => SelectedProjectItem?.ErrorsCount > 0);
 
-        public ICommand BuildSolutionAction => new RelayCommand(obj => _buildManager.BuildSolution());
+        public ICommand BuildSolutionAction => new RelayCommand(obj => _buildService.BuildSolution());
 
-        public ICommand RebuildSolutionAction => new RelayCommand(obj => _buildManager.RebuildSolution());
+        public ICommand RebuildSolutionAction => new RelayCommand(obj => _buildService.RebuildSolution());
 
-        public ICommand CleanSolutionAction => new RelayCommand(obj => _buildManager.CleanSolution());
+        public ICommand CleanSolutionAction => new RelayCommand(obj => _buildService.CleanSolution());
 
-        public ICommand CancelBuildSolutionAction => new RelayCommand(obj => _buildManager.CancelBuildSolution());
+        public ICommand CancelBuildSolutionAction => new RelayCommand(obj => _buildService.CancelBuildSolution());
 
-        public ICommand OpenGridColumnsSettingsAction => new RelayCommand(obj => _buildManager.ShowGridColumnsSettingsPage()); 
+        public ICommand OpenGridColumnsSettingsAction => new RelayCommand(obj => _buildService.ShowGridColumnsSettingsPage()); 
 
-        public ICommand OpenGeneralSettingsAction => new RelayCommand(obj => _buildManager.ShowGeneralSettingsPage()); 
+        public ICommand OpenGeneralSettingsAction => new RelayCommand(obj => _buildService.ShowGeneralSettingsPage()); 
 
         #endregion
     }

src/BuildVision/Core/BuildVisionPackage.cs

@@ -9,6 +9,7 @@
 using BuildVision.Helpers;
 using BuildVision.Services;
 using BuildVision.Tool;
+using BuildVision.Tool.Building;
 using BuildVision.UI;
 using BuildVision.UI.Common.Logging;
 using BuildVision.UI.Settings.Models;
@@ -192,6 +193,10 @@ private async void ShowToolWindowAsync(object sender, EventArgs e)
                 await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
                 var windowFrame = (IVsWindowFrame)window.Frame;
                 ErrorHandler.ThrowOnFailure(windowFrame.Show());
+
+                var windowStateService = await GetServiceAsync(typeof(IWindowStateService)) as IWindowStateService;
+                Assumes.Present(windowStateService);
+                windowStateService.Initialize(window);
             }
             catch (Exception ex)
             {

src/BuildVision/Core/BuildVisionPane.cs

@@ -89,7 +89,7 @@ async Task<BuildVisionPaneViewModel> InitializeAsync(AsyncPackage asyncPackage)
                 var packageSettingsProvider = await asyncPackage.GetServiceAsync(typeof(IPackageSettingsProvider)) as IPackageSettingsProvider;
                 Assumes.Present(packageSettingsProvider);
 
-                var viewModel = new BuildVisionPaneViewModel(buildService, buildingProjectsProvider, buildInformationProvider, packageSettingsProvider, solutionProvider);
+                var viewModel = new BuildVisionPaneViewModel(buildingProjectsProvider, buildInformationProvider, packageSettingsProvider, solutionProvider, buildService);
 
                 View = CreateControlView();
                 View.DataContext = viewModel;

src/BuildVision/Core/ServiceProviderPackage.cs

@@ -51,7 +51,6 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
             AddService(typeof(IWindowStateService), CreateServiceAsync, true);
             AddService(typeof(IBuildProgressViewModel), CreateServiceAsync, true);
             AddService(typeof(IErrorNavigationService), CreateServiceAsync, true);
-
         }
 
         async Task<object> CreateServiceAsync(IAsyncServiceContainer container, CancellationToken cancellation, Type serviceType)

src/BuildVision/Core/Services.cs

@@ -26,9 +26,9 @@ static TResult GetGlobalService<T, TResult>(IServiceProvider provider = null) wh
 
         public static IComponentModel ComponentModel => GetGlobalService<SComponentModel, IComponentModel>();
 
-        public static IVsSolution GetSolution(this IServiceProvider provider)
+        public static Solution GetSolution(this IServiceProvider provider)
         {
-            return GetGlobalService<SVsSolution, IVsSolution>(provider);
+            return Dte.Solution;
         }
     }
 }

src/BuildVision/Services/BuildInformationProvider.cs

@@ -131,9 +131,9 @@ private int GetProjectsCount()
                 case BuildScopes.BuildScopeSolution:
                     try
                     {
-                        var solution = _dte.Solution;
+                        var solution = _serviceProvider.GetSolution();
                         if (solution != null)
-                            projectsCount = _solution.GetProjects().Count;
+                            projectsCount = solution.GetProjects().Count;
                     }
                     catch (Exception ex)
                     {
@@ -170,10 +170,6 @@ public void BuildFinished(IEnumerable<IProjectItem> projects, bool success, bool
             {
                 return;
             }
-            if (_buildInformationModel.CurrentBuildState == BuildState.InProgress)
-            {
-                return;
-            }
 
             if (_buildInformationModel.BuildScope == BuildScopes.BuildScopeSolution)
             {
@@ -240,21 +236,18 @@ public void BuildFinished(IEnumerable<IProjectItem> projects, bool success, bool
 
         public void Run(CancellationToken cancellationToken)
         {
-            lock (_buildProcessLockObject)
+            while (!cancellationToken.IsCancellationRequested)
             {
-                while (!cancellationToken.IsCancellationRequested)
-                {
-                    BuildUpdate();
+                BuildUpdate();
 
-                    for (int i = 0; i < BuildInProcessQuantumSleep * BuildInProcessCountOfQuantumSleep; i += BuildInProcessQuantumSleep)
+                for (int i = 0; i < BuildInProcessQuantumSleep * BuildInProcessCountOfQuantumSleep; i += BuildInProcessQuantumSleep)
+                {
+                    if (cancellationToken.IsCancellationRequested)
                     {
-                        if (cancellationToken.IsCancellationRequested)
-                        {
-                            break;
-                        }
-
-                        System.Threading.Thread.Sleep(BuildInProcessQuantumSleep);
+                        break;
                     }
+
+                    System.Threading.Thread.Sleep(BuildInProcessQuantumSleep);
                 }
             }
         }

src/BuildVision/Services/BuildProgressViewModel.cs

@@ -15,7 +15,6 @@ namespace BuildVision.UI.ViewModels
 { 
     public class BuildProgressViewModel : BindableBase, IBuildProgressViewModel
     {
-        private readonly ControlSettings _settings;
         private readonly IPackageSettingsProvider _packageSettingsProvider;
         private IBuildInformationModel _buildInformationModel;
         private CancellationTokenSource _resetTaskBarInfoCts;
@@ -51,7 +50,7 @@ public BuildProgressViewModel(IPackageSettingsProvider packageSettingsProvider)
 
         private void UpdateTaskBarInfo()
         {
-            if (!_settings.GeneralSettings.BuildProgressSettings.TaskBarProgressEnabled)
+            if (!_packageSettingsProvider.Settings.GeneralSettings.BuildProgressSettings.TaskBarProgressEnabled)
                 return;
 
             TaskbarItemProgressState state;
@@ -74,7 +73,7 @@ private void UpdateTaskBarInfo()
         public void ResetTaskBarInfo(bool ifTaskBarProgressEnabled = true)
         {
             if (_taskbarItemInfo.IsValueCreated 
-                && _settings.GeneralSettings.BuildProgressSettings.TaskBarProgressEnabled == ifTaskBarProgressEnabled)
+                && _packageSettingsProvider.Settings.GeneralSettings.BuildProgressSettings.TaskBarProgressEnabled == ifTaskBarProgressEnabled)
             {
                 TaskbarItemInfo.ProgressState = TaskbarItemProgressState.None;
                 TaskbarItemInfo.ProgressValue = 0;
@@ -148,7 +147,7 @@ public void OnBuildDone()
 
         private void ResetTaskBarInfoOnBuildDone()
         {
-            var buildProgressSettings = _settings.GeneralSettings.BuildProgressSettings;
+            var buildProgressSettings = _packageSettingsProvider.Settings.GeneralSettings.BuildProgressSettings;
             if (!buildProgressSettings.TaskBarProgressEnabled)
                 return;
 

src/BuildVision/Services/IWindowStateService.cs

@@ -1,9 +1,11 @@
 using BuildVision.UI.Settings.Models.ToolWindow;
+using Microsoft.VisualStudio.Shell;
 
 namespace BuildVision.Tool.Building
 {
     public interface IWindowStateService
     {
         void ApplyToolWindowStateAction(WindowStateAction windowStateAction);
+        void Initialize(ToolWindowPane toolWindowPane);
     }
 }

src/BuildVision/Services/StatusBarNotificationService.cs

@@ -35,7 +35,7 @@ public void ShowText(string str)
 
         public void ShowTextWithFreeze(string str)
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
+            //ThreadHelper.ThrowIfNotOnUIThread();
             var statusBar = _serviceProvider.GetService(typeof(IVsStatusbar)) as IVsStatusbar;
             var settings = _serviceProvider.GetService(typeof(IPackageSettingsProvider)) as IPackageSettingsProvider;
             if (settings == null || statusBar == null)

src/BuildVision/Services/WindowStateService.cs

@@ -1,9 +1,6 @@
 using System;
 using System.ComponentModel.Composition;
-using System.Linq;
-using BuildVision.Helpers;
 using BuildVision.UI.Settings.Models.ToolWindow;
-using BuildVision.Views.Settings;
 using EnvDTE;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
@@ -12,6 +9,8 @@
 
 namespace BuildVision.Tool.Building
 {
+    [Export(typeof(IWindowStateService))]
+    [PartCreationPolicy(CreationPolicy.Shared)]
     public class WindowStateService : IWindowStateService
     {
         private DTE _dte;
@@ -125,19 +124,23 @@ private void ApplyToolWindowStateAction(WindowState windowState)
             }
         }
 
-        public void ApplyToolWindowStateAction(WindowStateAction windowStateAction)
+        public void Initialize(ToolWindowPane toolWindowPane)
         {
             if (_window == null || _windowFrame == null)
             {
                 ThreadHelper.ThrowIfNotOnUIThread();
                 _dte = _serviceProvider.GetService(typeof(DTE)) as DTE;
                 if (_dte == null)
                     throw new InvalidOperationException("Unable to get DTE instance.");
-                _windowFrame = (IVsWindowFrame)(_package.FindToolWindow(typeof(BuildVisionPane), 0, false) ?? _package.FindToolWindow(typeof(BuildVisionPane), 0, true));
+                _windowFrame = (IVsWindowFrame)toolWindowPane.Frame;
                 _window = GetWindowInstance(_dte, typeof(BuildVisionPane).GUID);
                 if (_window == null)
                     throw new InvalidOperationException("Unable to get Window instance.");
             }
+        }
+
+        public void ApplyToolWindowStateAction(WindowStateAction windowStateAction)
+        {
             ApplyToolWindowStateAction(windowStateAction.State); 
         }
     }