From 16f40a5ab439e9e2682a57bbdcd3a7ae66a83d49 Mon Sep 17 00:00:00 2001
From: Stefan Kert <stefan.kert@sbg.at>
Date: Sat, 23 Mar 2019 08:10:55 +0100
Subject: [PATCH] Fixed issue with indicators Added additional unittests Some
 cleanup of usings and classes

---
 .../Models/IBuildInformationModel.cs          |  3 +-
 .../Components/ControlView.xaml               | 26 ++++--
 .../Controls/BuildVisionProgressBar.xaml      |  3 +-
 .../Indicators/ErrorProjectsIndicator.cs      |  5 ++
 .../Controls/Indicators/ErrorsIndicator.cs    |  5 ++
 .../Controls/Indicators/MessagesIndicator.cs  |  5 ++
 .../Indicators/SuccessProjectsIndicator.cs    |  5 ++
 .../Indicators/UpToDateProjectsIndicator.cs   |  5 ++
 .../Indicators/WarningProjectsIndicator.cs    |  5 ++
 .../Controls/Indicators/WarningsIndicator.cs  |  5 ++
 .../Models/BuildInformationModel.cs           |  6 +-
 src/BuildVision.UI/Themes/Generic.xaml        | 10 +--
 src/BuildVision/BuildVision.csproj            | 12 +--
 .../EnvDTECodeModelLanguageConstants2.cs      |  7 ++
 .../EnvDTEProjectKinds.cs                     |  0
 .../{Core => Constants}/PackageGuids.cs       |  0
 .../{Core => Constants}/PackageIds.cs         |  0
 src/BuildVision/Core/BuildVisionPackage.cs    | 25 ------
 src/BuildVision/Helpers/ProjectExtensions.cs  | 23 ++---
 .../Helpers/ProjectItemExtensions.cs          | 59 +++++++++++-
 .../Helpers/ProjectItemsExtensions.cs         | 62 -------------
 .../Helpers/SolutionProjectsExtensions.cs     | 13 ++-
 .../Services/BuildInformationProvider.cs      |  1 +
 .../Services/BuildingProjectsProvider.cs      | 44 ++++-----
 src/BuildVision/Tool/Building/BuildManager.cs | 11 ---
 .../Tool/Building/BuildOutputLogger.cs        |  5 +-
 .../Building/WindowStateManager.cs}           | 90 ++++++++++---------
 .../PackageTests.cs                           |  2 +
 .../BuildVision.UnitTests.csproj              |  5 ++
 .../BuildEventContextExtensionsTests.cs       | 51 +++++++++++
 .../BuildMessageEventArgsExtensionsTests.cs   | 48 ++++++++++
 31 files changed, 321 insertions(+), 220 deletions(-)
 create mode 100644 src/BuildVision/Constants/EnvDTECodeModelLanguageConstants2.cs
 rename src/BuildVision/{Helpers => Constants}/EnvDTEProjectKinds.cs (100%)
 rename src/BuildVision/{Core => Constants}/PackageGuids.cs (100%)
 rename src/BuildVision/{Core => Constants}/PackageIds.cs (100%)
 delete mode 100644 src/BuildVision/Helpers/ProjectItemsExtensions.cs
 rename src/BuildVision/{Helpers/ToolWindowManager.cs => Tool/Building/WindowStateManager.cs} (59%)
 create mode 100644 test/BuildVision.UnitTests/Helpers/BuildEventContextExtensionsTests.cs
 create mode 100644 test/BuildVision.UnitTests/Helpers/BuildMessageEventArgsExtensionsTests.cs

diff --git a/src/BuildVision.Contracts/Models/IBuildInformationModel.cs b/src/BuildVision.Contracts/Models/IBuildInformationModel.cs
index 78bf0bcd..d784f83f 100644
--- a/src/BuildVision.Contracts/Models/IBuildInformationModel.cs
+++ b/src/BuildVision.Contracts/Models/IBuildInformationModel.cs
@@ -1,8 +1,9 @@
 using System;
+using System.ComponentModel;
 
 namespace BuildVision.Contracts.Models
 {
-    public interface IBuildInformationModel
+    public interface IBuildInformationModel : INotifyPropertyChanged
     {
         BuildActions BuildAction { get; set; }
         DateTime? BuildFinishTime { get; set; }
diff --git a/src/BuildVision.UI/Components/ControlView.xaml b/src/BuildVision.UI/Components/ControlView.xaml
index 26d27e54..4502913b 100644
--- a/src/BuildVision.UI/Components/ControlView.xaml
+++ b/src/BuildVision.UI/Components/ControlView.xaml
@@ -174,11 +174,14 @@
                         </Style>
                     </ListBox.Resources>
 
-                    <indicators:ErrorsIndicator Value="{Binding ErrorCount}" />
+                    <indicators:ErrorsIndicator Value="{Binding BuildInformationModel.ErrorCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.ErrorCount, UpdateSourceTrigger=PropertyChanged}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
 
-                    <indicators:WarningsIndicator Value="{Binding WarningsCount}" />
+                    <indicators:WarningsIndicator Value="{Binding BuildInformationModel.WarningsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.WarningsCount, UpdateSourceTrigger=PropertyChanged}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
 
-                    <indicators:MessagesIndicator Value="{Binding MessagesCount}" />
+                    <indicators:MessagesIndicator Value="{Binding BuildInformationModel.MessagesCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.MessagesCount, UpdateSourceTrigger=PropertyChanged}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
                 </ListBox>
 
                 <Border Grid.Column="3"
@@ -213,13 +216,18 @@
                         </Style>
                     </ListBox.Resources>
 
-                    <indicators:SuccessProjectsIndicator Value="{Binding SucceededProjectsCount}" />
+                    <indicators:SuccessProjectsIndicator Value="{Binding BuildInformationModel.SucceededProjectsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-8,0,0,0" Content="{Binding BuildInformationModel.SucceededProjectsCount}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
+                    
+                    <indicators:UpToDateProjectsIndicator Value="{Binding BuildInformationModel.UpToDateProjectsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.UpToDateProjectsCount}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
+                    
+                    <indicators:WarningProjectsIndicator Value="{Binding BuildInformationModel.WarnedProjectsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.WarnedProjectsCount}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
+                    
+                    <indicators:ErrorProjectsIndicator Value="{Binding BuildInformationModel.FailedProjectsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.FailedProjectsCount}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
 
-                    <indicators:UpToDateProjectsIndicator Value="{Binding UpToDateProjectsCount}" />
-
-                    <indicators:WarningProjectsIndicator Value="{Binding WarnedProjectsCount}" />
-
-                    <indicators:ErrorProjectsIndicator Value="{Binding FailedProjectsCount}" />
                 </ListBox>
 
             </Grid>
diff --git a/src/BuildVision.UI/Controls/BuildVisionProgressBar.xaml b/src/BuildVision.UI/Controls/BuildVisionProgressBar.xaml
index 08e1adb7..f0736e2c 100644
--- a/src/BuildVision.UI/Controls/BuildVisionProgressBar.xaml
+++ b/src/BuildVision.UI/Controls/BuildVisionProgressBar.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d"
+             xmlns:contracts="clr-namespace:BuildVision.Contracts;assembly=BuildVision.Contracts"
              d:DesignWidth="697">
     <Grid>
         <Line Name="Line"
@@ -34,7 +35,7 @@
             <Line.Style>
                 <Style>
                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding ActionProgressIsVisible, FallbackValue=True}" Value="True">
+                        <DataTrigger Binding="{Binding}" Value="{x:Static contracts:BuildState.InProgress}">
                             <DataTrigger.EnterActions>
                                 <BeginStoryboard x:Name="LineProgressBeginStoryboard">
                                     <Storyboard>
diff --git a/src/BuildVision.UI/Controls/Indicators/ErrorProjectsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/ErrorProjectsIndicator.cs
index dbf1b6aa..2f0ec56d 100644
--- a/src/BuildVision.UI/Controls/Indicators/ErrorProjectsIndicator.cs
+++ b/src/BuildVision.UI/Controls/Indicators/ErrorProjectsIndicator.cs
@@ -16,5 +16,10 @@ public ErrorProjectsIndicator()
         {
             Header = UI.Resources.ErrorProjectsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/ErrorsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/ErrorsIndicator.cs
index 566e4a0a..43e071d9 100644
--- a/src/BuildVision.UI/Controls/Indicators/ErrorsIndicator.cs
+++ b/src/BuildVision.UI/Controls/Indicators/ErrorsIndicator.cs
@@ -14,5 +14,10 @@ public ErrorsIndicator()
         {
             Header = UI.Resources.ErrorsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/MessagesIndicator.cs b/src/BuildVision.UI/Controls/Indicators/MessagesIndicator.cs
index 2fedc302..ec96368a 100644
--- a/src/BuildVision.UI/Controls/Indicators/MessagesIndicator.cs
+++ b/src/BuildVision.UI/Controls/Indicators/MessagesIndicator.cs
@@ -13,5 +13,10 @@ public MessagesIndicator()
         {
             Header = UI.Resources.MessagesIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/SuccessProjectsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/SuccessProjectsIndicator.cs
index e8873311..c799dc35 100644
--- a/src/BuildVision.UI/Controls/Indicators/SuccessProjectsIndicator.cs
+++ b/src/BuildVision.UI/Controls/Indicators/SuccessProjectsIndicator.cs
@@ -13,5 +13,10 @@ public SuccessProjectsIndicator()
         {
             Header = UI.Resources.SuccessProjectsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/UpToDateProjectsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/UpToDateProjectsIndicator.cs
index c588caf4..a3e8be66 100644
--- a/src/BuildVision.UI/Controls/Indicators/UpToDateProjectsIndicator.cs
+++ b/src/BuildVision.UI/Controls/Indicators/UpToDateProjectsIndicator.cs
@@ -13,5 +13,10 @@ public UpToDateProjectsIndicator()
         {
             Header = UI.Resources.UpToDateProjectsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/WarningProjectsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/WarningProjectsIndicator.cs
index 57b60ca9..05cb5d73 100644
--- a/src/BuildVision.UI/Controls/Indicators/WarningProjectsIndicator.cs
+++ b/src/BuildVision.UI/Controls/Indicators/WarningProjectsIndicator.cs
@@ -14,5 +14,10 @@ public WarningProjectsIndicator()
         {
             Header = UI.Resources.WarningProjectsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/WarningsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/WarningsIndicator.cs
index 414a6c68..f92db81a 100644
--- a/src/BuildVision.UI/Controls/Indicators/WarningsIndicator.cs
+++ b/src/BuildVision.UI/Controls/Indicators/WarningsIndicator.cs
@@ -13,5 +13,10 @@ public WarningsIndicator()
         {
             Header = UI.Resources.WarningsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Models/BuildInformationModel.cs b/src/BuildVision.UI/Models/BuildInformationModel.cs
index 6c07e967..96c716b5 100644
--- a/src/BuildVision.UI/Models/BuildInformationModel.cs
+++ b/src/BuildVision.UI/Models/BuildInformationModel.cs
@@ -31,21 +31,21 @@ public int MessagesCount
         private int _succeededProjectsCount;
         public int SucceededProjectsCount
         {
-            get => _warningsCount;
+            get => _succeededProjectsCount;
             set => SetProperty(ref _succeededProjectsCount, value);
         }
 
         private int _upToDateProjectsCount;
         public int UpToDateProjectsCount
         {
-            get => _warningsCount;
+            get => _upToDateProjectsCount;
             set => SetProperty(ref _upToDateProjectsCount, value);
         }
 
         private int _failedProjectsCount;
         public int FailedProjectsCount
         {
-            get => _warningsCount;
+            get => _failedProjectsCount;
             set => SetProperty(ref _failedProjectsCount, value);
         }
 
diff --git a/src/BuildVision.UI/Themes/Generic.xaml b/src/BuildVision.UI/Themes/Generic.xaml
index 10af229b..edaa2fe1 100644
--- a/src/BuildVision.UI/Themes/Generic.xaml
+++ b/src/BuildVision.UI/Themes/Generic.xaml
@@ -51,12 +51,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type indicators:ValueIndicator}">
                     <StackPanel Orientation="Vertical" ToolTipService.ShowOnDisabled="True" ToolTipService.ToolTip="{TemplateBinding Header}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ContentControl 
+                        <ContentControl 
                                 Grid.Column="0"
                                 Width="16"
                                 Height="16"
@@ -64,9 +59,6 @@
                                 ClipToBounds="True"
                                 UseLayoutRounding="False"
                                 Template="{TemplateBinding Icon}" />
-                            <Label Grid.Column="1" Content="{TemplateBinding Value}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4"/>
-
-                        </Grid>
                     </StackPanel>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/BuildVision/BuildVision.csproj b/src/BuildVision/BuildVision.csproj
index 01d1cb68..b0a7e150 100644
--- a/src/BuildVision/BuildVision.csproj
+++ b/src/BuildVision/BuildVision.csproj
@@ -91,6 +91,7 @@
     <Reference Include="System.Xaml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Constants\EnvDTECodeModelLanguageConstants2.cs" />
     <Compile Include="Services\BuildInformationProvider.cs" />
     <Compile Include="Services\BuildingProjectsProvider.cs" />
     <Compile Include="Services\ProjectFileNavigationService.cs" />
@@ -103,11 +104,10 @@
     <Compile Include="Services\StatusBarNotificationService.cs" />
     <Compile Include="Helpers\BuildEventContextExtensions.cs" />
     <Compile Include="Helpers\BuildMessageEventArgsExtensions.cs" />
-    <Compile Include="Helpers\EnvDTEProjectKinds.cs" />
-    <Compile Include="Helpers\ProjectItemExtensions.cs" />
+    <Compile Include="Constants\EnvDTEProjectKinds.cs" />
     <Compile Include="Helpers\SolutionProjectsExtensions.cs" />
     <Compile Include="Helpers\ProjectExtensions.cs" />
-    <Compile Include="Helpers\ProjectItemsExtensions.cs" />
+    <Compile Include="Helpers\ProjectItemExtensions.cs" />
     <Compile Include="Helpers\PropertiesExtensions.cs" />
     <Compile Include="Helpers\StateConverterHelper.cs" />
     <Compile Include="Helpers\UIHierarchyExtensions.cs" />
@@ -117,6 +117,7 @@
     <Compile Include="Tool\Building\BuildManager.cs" />
     <Compile Include="Tool\Building\BuildOutputLogger.cs" />
     <Compile Include="Core\IPackageContext.cs" />
+    <Compile Include="Tool\Building\WindowStateManager.cs" />
     <Compile Include="Tool\Views\Settings\BuildMessagesSettingsDialogPage.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -137,10 +138,9 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Core\BuildVisionPane.cs" />
-    <Compile Include="Core\PackageGuids.cs" />
+    <Compile Include="Constants\PackageGuids.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Core\PackageIds.cs" />
-    <Compile Include="Helpers\ToolWindowManager.cs" />
+    <Compile Include="Constants\PackageIds.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="VSPackage.resx">
diff --git a/src/BuildVision/Constants/EnvDTECodeModelLanguageConstants2.cs b/src/BuildVision/Constants/EnvDTECodeModelLanguageConstants2.cs
new file mode 100644
index 00000000..a87615d5
--- /dev/null
+++ b/src/BuildVision/Constants/EnvDTECodeModelLanguageConstants2.cs
@@ -0,0 +1,7 @@
+namespace BuildVision.Helpers
+{
+    public class EnvDTECodeModelLanguageConstants2
+    {
+        public const string CMLanguageJSharp = "{E6FDF8BF-F3D1-11D4-8576-0002A516ECE8}";
+    }
+}
diff --git a/src/BuildVision/Helpers/EnvDTEProjectKinds.cs b/src/BuildVision/Constants/EnvDTEProjectKinds.cs
similarity index 100%
rename from src/BuildVision/Helpers/EnvDTEProjectKinds.cs
rename to src/BuildVision/Constants/EnvDTEProjectKinds.cs
diff --git a/src/BuildVision/Core/PackageGuids.cs b/src/BuildVision/Constants/PackageGuids.cs
similarity index 100%
rename from src/BuildVision/Core/PackageGuids.cs
rename to src/BuildVision/Constants/PackageGuids.cs
diff --git a/src/BuildVision/Core/PackageIds.cs b/src/BuildVision/Constants/PackageIds.cs
similarity index 100%
rename from src/BuildVision/Core/PackageIds.cs
rename to src/BuildVision/Constants/PackageIds.cs
diff --git a/src/BuildVision/Core/BuildVisionPackage.cs b/src/BuildVision/Core/BuildVisionPackage.cs
index ef7bca4d..6aecdf55 100644
--- a/src/BuildVision/Core/BuildVisionPackage.cs
+++ b/src/BuildVision/Core/BuildVisionPackage.cs
@@ -4,28 +4,17 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows;
-using BuildVision.Common;
-using BuildVision.Contracts;
 using BuildVision.Exports.Providers;
-using BuildVision.Helpers;
 using BuildVision.Tool;
-using BuildVision.Tool.Building;
-using BuildVision.Tool.Models;
 using BuildVision.UI;
 using BuildVision.UI.Common.Logging;
-using BuildVision.UI.Extensions;
-using BuildVision.UI.Helpers;
 using BuildVision.UI.Settings.Models;
-using BuildVision.UI.ViewModels;
 using BuildVision.Views.Settings;
 using EnvDTE;
 using EnvDTE80;
 using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.Settings;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Shell.Settings;
-using VSLangProj;
 using Task = System.Threading.Tasks.Task;
 
 namespace BuildVision.Core
@@ -148,7 +137,6 @@ private async void ShowToolWindowAsync(object sender, EventArgs e)
             }
         }
 
-
         ToolWindowPane ShowToolWindow(Guid windowGuid)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
@@ -184,18 +172,5 @@ public async Task ExecuteCommandAsync(string commandName)
             await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
             _dte.ExecuteCommand(commandName);
         }
-
-
-        async Task EnsurePackageLoaded(Guid packageGuid)
-        {
-            await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
-
-            var shell = await GetServiceAsync(typeof(SVsShell)) as IVsShell;
-            if (shell != null)
-            {
-                IVsPackage vsPackage;
-                ErrorHandler.ThrowOnFailure(shell.LoadPackage(ref packageGuid, out vsPackage));
-            }
-        }
     }
 }
diff --git a/src/BuildVision/Helpers/ProjectExtensions.cs b/src/BuildVision/Helpers/ProjectExtensions.cs
index cbc7fc9f..045f6af8 100644
--- a/src/BuildVision/Helpers/ProjectExtensions.cs
+++ b/src/BuildVision/Helpers/ProjectExtensions.cs
@@ -1,28 +1,19 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-
-using EnvDTE;
-using EnvDTE80;
-
-using Microsoft.Win32;
-using VSLangProj;
 using System.Globalization;
-using Microsoft.VisualStudio.Shell.Interop;
-using System.IO;
+using System.Linq;
 using System.Text;
+using BuildVision.Contracts;
 using BuildVision.UI;
 using BuildVision.UI.Common.Logging;
-using BuildVision.Contracts;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell.Interop;
+using Microsoft.Win32;
+using VSLangProj;
 
 namespace BuildVision.Helpers
 {
-    public class EnvDTECodeModelLanguageConstants2
-    {
-        public const string CMLanguageJSharp = "{E6FDF8BF-F3D1-11D4-8576-0002A516ECE8}";
-    }
-
     public static class ProjectExtensions
     {
         private static readonly HashSet<string> _hiddenProjectsUniqueNames = new HashSet<string>
diff --git a/src/BuildVision/Helpers/ProjectItemExtensions.cs b/src/BuildVision/Helpers/ProjectItemExtensions.cs
index 24955def..d45fbd45 100644
--- a/src/BuildVision/Helpers/ProjectItemExtensions.cs
+++ b/src/BuildVision/Helpers/ProjectItemExtensions.cs
@@ -1,5 +1,5 @@
-using System.Linq;
-
+using System;
+using System.Linq;
 using EnvDTE;
 
 namespace BuildVision.Helpers
@@ -16,5 +16,58 @@ public static bool ProjectItemIsDirty(this ProjectItem projectItem)
 
             return false;
         }
+
+        /// <summary>
+        /// Find file in projects collection.
+        /// </summary>
+        /// <param name="items">Projects collection.</param>
+        /// <param name="filePath">File path, relative to the <paramref name="items"/> root.</param>
+        /// <returns>The found file or <c>null</c>.</returns>
+        public static ProjectItem FindProjectItem(this ProjectItems items, string filePath)
+        {
+            if (string.IsNullOrEmpty(filePath))
+                throw new ArgumentException("Argument `filePath` is null or empty.", "filePath");
+
+            int backslashIndex = filePath.IndexOf("\\", StringComparison.Ordinal);
+            bool findFolder = (backslashIndex != -1);
+            if (findFolder)
+            {
+                string folderName = filePath.Substring(0, backslashIndex);
+                foreach (ProjectItem item in items)
+                {
+                    if (item.Kind != Constants.vsProjectItemKindVirtualFolder &&
+                        item.Kind != Constants.vsProjectItemKindPhysicalFolder)
+                        continue;
+
+                    if (folderName == item.Name)
+                    {
+                        string nextpath = filePath.Substring(backslashIndex + 1);
+                        return FindProjectItem(item.ProjectItems, nextpath);
+                    }
+                }
+            }
+            else
+            {
+                string fileName = filePath;
+                foreach (ProjectItem item in items)
+                {
+                    if (item.Kind != Constants.vsProjectItemKindPhysicalFile)
+                        continue;
+
+                    if (item.Name == fileName)
+                        return item;
+
+                    // Nested item, e.g. Default.aspx or MainWindow.xaml.
+                    if (item.ProjectItems.Count > 0)
+                    {
+                        ProjectItem childItem = FindProjectItem(item.ProjectItems, fileName);
+                        if (childItem != null)
+                            return childItem;
+                    }
+                }
+            }
+
+            return null;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision/Helpers/ProjectItemsExtensions.cs b/src/BuildVision/Helpers/ProjectItemsExtensions.cs
deleted file mode 100644
index ab6f065c..00000000
--- a/src/BuildVision/Helpers/ProjectItemsExtensions.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-
-using EnvDTE;
-
-namespace BuildVision.Helpers
-{
-    public static class ProjectItemsExtensions
-    {
-        /// <summary>
-        /// Find file in projects collection.
-        /// </summary>
-        /// <param name="items">Projects collection.</param>
-        /// <param name="filePath">File path, relative to the <paramref name="items"/> root.</param>
-        /// <returns>The found file or <c>null</c>.</returns>
-        public static ProjectItem FindProjectItem(this ProjectItems items, string filePath)
-        {
-            if (string.IsNullOrEmpty(filePath))
-                throw new ArgumentException("Argument `filePath` is null or empty.", "filePath");
-
-            int backslashIndex = filePath.IndexOf("\\", StringComparison.Ordinal);
-            bool findFolder = (backslashIndex != -1);
-            if (findFolder)
-            {
-                string folderName = filePath.Substring(0, backslashIndex);
-                foreach (ProjectItem item in items)
-                {
-                    if (item.Kind != EnvDTE.Constants.vsProjectItemKindVirtualFolder &&
-                        item.Kind != EnvDTE.Constants.vsProjectItemKindPhysicalFolder)
-                        continue;
-
-                    if (folderName == item.Name)
-                    {
-                        string nextpath = filePath.Substring(backslashIndex + 1);
-                        return FindProjectItem(item.ProjectItems, nextpath);
-                    }
-                }
-            }
-            else
-            {
-                string fileName = filePath;
-                foreach (ProjectItem item in items)
-                {
-                    if (item.Kind != EnvDTE.Constants.vsProjectItemKindPhysicalFile)
-                        continue;
-
-                    if (item.Name == fileName)
-                        return item;
-
-                    // Nested item, e.g. Default.aspx or MainWindow.xaml.
-                    if (item.ProjectItems.Count > 0)
-                    {
-                        ProjectItem childItem = FindProjectItem(item.ProjectItems, fileName);
-                        if (childItem != null)
-                            return childItem;
-                    }
-                }
-            }
-
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/BuildVision/Helpers/SolutionProjectsExtensions.cs b/src/BuildVision/Helpers/SolutionProjectsExtensions.cs
index 0f6389bb..bf565a66 100644
--- a/src/BuildVision/Helpers/SolutionProjectsExtensions.cs
+++ b/src/BuildVision/Helpers/SolutionProjectsExtensions.cs
@@ -1,15 +1,14 @@
-using System;
+using System;
 using System.Collections.Generic;
-using EnvDTE;
-using IServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
+using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
+using BuildVision.Core;
 using BuildVision.UI;
-using System.IO;
 using BuildVision.UI.Common.Logging;
-using BuildVision.Core;
+using EnvDTE;
+using IServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
 using ProjectItem = BuildVision.UI.Models.ProjectItem;
-using System.Linq;
-using BuildVision.Common;
 
 namespace BuildVision.Helpers
 {
diff --git a/src/BuildVision/Services/BuildInformationProvider.cs b/src/BuildVision/Services/BuildInformationProvider.cs
index 1fc323a0..9f1e9c4e 100644
--- a/src/BuildVision/Services/BuildInformationProvider.cs
+++ b/src/BuildVision/Services/BuildInformationProvider.cs
@@ -26,6 +26,7 @@ public class BuildInformationProvider : IBuildInformationProvider
         private BuildInformationModel _buildInformationModel;
         private BuildEvents _buildEvents;
         private DTE2 _dte;
+        private string _origTextCurrentState;
 
         [ImportingConstructor]
         public BuildInformationProvider(
diff --git a/src/BuildVision/Services/BuildingProjectsProvider.cs b/src/BuildVision/Services/BuildingProjectsProvider.cs
index f492d82e..c06b0a63 100644
--- a/src/BuildVision/Services/BuildingProjectsProvider.cs
+++ b/src/BuildVision/Services/BuildingProjectsProvider.cs
@@ -22,7 +22,7 @@ public class BuildingProjectsProvider : IBuildingProjectsProvider
         private readonly ISolutionProvider _solutionProvider;
         private readonly IBuildInformationProvider _buildInformationProvider;
         private readonly IBuildOutputLogger _buildOutputLogger;
-
+        private readonly IPackageContext _packageContext;
         private ObservableCollection<IProjectItem> _projects;
 
         [ImportingConstructor]
@@ -35,7 +35,6 @@ public BuildingProjectsProvider(
             _solutionProvider = solutionProvider;
             _buildInformationProvider = buildInformationProvider;
             _buildOutputLogger = buildOutputLogger;
-
             _buildOutputLogger.OnErrorRaised += BuildOutputLogger_OnErrorRaised;
             ReloadCurrentProjects();
         }
@@ -59,7 +58,7 @@ private void BuildOutputLogger_OnErrorRaised(BuildProjectContextEntry projectEnt
 
                     case ErrorLevel.Warning:
                         errorItem.Init((BuildWarningEventArgs) e);
-                        throw new ArgumentOutOfRangeException("errorLevel");
+                        break;
                     case ErrorLevel.Error:
                         errorItem.Init((BuildErrorEventArgs) e);
                         break;
@@ -214,28 +213,33 @@ public void ProjectBuildFinished(string projectIdentifier, bool succeess, bool c
                     throw new ArgumentOutOfRangeException(nameof(buildAction));
             }
             currentProject.State = projectState;
+
+            var buildInformationModel = _buildInformationProvider.GetBuildInformationModel();
+            buildInformationModel.SucceededProjectsCount = _projects.Count(x => x.State == ProjectState.BuildDone || x.State == ProjectState.CleanDone);
+            buildInformationModel.FailedProjectsCount = _projects.Count(x => x.State == ProjectState.BuildError || x.State == ProjectState.CleanError);
+            buildInformationModel.WarnedProjectsCount = _projects.Count(x => x.State == ProjectState.BuildWarning);
+            buildInformationModel.UpToDateProjectsCount = _projects.Count(x => x.State == ProjectState.UpToDate);
+            buildInformationModel.MessagesCount = _projects.Sum(x => x.MessagesCount);
+            buildInformationModel.ErrorCount = _projects.Sum(x => x.ErrorsCount);
+            buildInformationModel.WarningsCount = _projects.Sum(x => x.WarningsCount);
+
             //OnBuildProjectDone(new BuildProjectEventArgs(currentProject, projectState, eventTime, buildedProject));
 
-            //if (e.ProjectState == ProjectState.BuildError && _viewModel.ControlSettings.GeneralSettings.StopBuildAfterFirstError)
+            //if (currentProject.State == ProjectState.BuildError && _packageContext..ControlSettings.GeneralSettings.StopBuildAfterFirstError)
             //    CancelBuildAsync();
 
-            //try
-            //{
-            //    ProjectItem currentProject = e.ProjectItem;
-            //    currentProject.State = e.ProjectState;
-            //    currentProject.BuildFinishTime = DateTime.Now;
-            //    currentProject.UpdatePostBuildProperties(e.BuildedProjectInfo);
-
-            //    if (!_viewModel.ProjectsList.Contains(currentProject))
-            //        _viewModel.ProjectsList.Add(currentProject);
+            try
+            {
+                currentProject.BuildFinishTime = DateTime.Now;
+                //currentProject.UpdatePostBuildProperties(e.BuildedProjectInfo);
 
-            //    if (ReferenceEquals(_viewModel.CurrentProject, e.ProjectItem) && BuildingProjects.Any())
-            //        _viewModel.CurrentProject = BuildingProjects.Last();
-            //}
-            //catch (Exception ex)
-            //{
-            //    ex.TraceUnknownException();
-            //}
+                //if (ReferenceEquals(_viewModel.CurrentProject, e.ProjectItem) && BuildingProjects.Any())
+                //    _viewModel.CurrentProject = BuildingProjects.Last();
+            }
+            catch (Exception ex)
+            {
+                ex.TraceUnknownException();
+            }
 
             //_viewModel.UpdateIndicators(this);
 
diff --git a/src/BuildVision/Tool/Building/BuildManager.cs b/src/BuildVision/Tool/Building/BuildManager.cs
index b4332002..f9a2671e 100644
--- a/src/BuildVision/Tool/Building/BuildManager.cs
+++ b/src/BuildVision/Tool/Building/BuildManager.cs
@@ -4,7 +4,6 @@
 using System.ComponentModel;
 using System.ComponentModel.Composition;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -229,16 +228,6 @@ private void CommandEvents_AfterExecute(string guid, int id, object customIn, ob
             }
         }
 
-        private void ApplyWindowState(UI.Settings.Models.ControlSettings settings)
-        {
-            // Figure out when build  is canceled
-            //int errorProjectsCount = _viewModel.ProjectsList.Count(item => item.State.IsErrorState());
-            //if (errorProjectsCount > 0 || BuildIsCancelled)
-            //    ApplyToolWindowStateAction(settings.WindowSettings.WindowActionOnBuildError);
-            //else
-            //    ApplyToolWindowStateAction(settings.WindowSettings.WindowActionOnBuildSuccess);
-        }
-
         public void RaiseCommandForSelectedProject()
         {
             throw new NotImplementedException();
diff --git a/src/BuildVision/Tool/Building/BuildOutputLogger.cs b/src/BuildVision/Tool/Building/BuildOutputLogger.cs
index b4cd5b30..1b518800 100644
--- a/src/BuildVision/Tool/Building/BuildOutputLogger.cs
+++ b/src/BuildVision/Tool/Building/BuildOutputLogger.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -19,7 +19,6 @@ namespace BuildVision.Tool.Building
     public class BuildOutputLogger : Logger, IBuildOutputLogger
     {
         private readonly Guid _loggerId;
-        private readonly LoggerVerbosity _loggerVerbosity;
 
         public RegisterLoggerResult LoggerState { get; set; }
 
@@ -28,7 +27,7 @@ public class BuildOutputLogger : Logger, IBuildOutputLogger
         public BuildOutputLogger(Guid loggerId, LoggerVerbosity loggerVerbosity)
         {
             _loggerId = loggerId;
-            _loggerVerbosity = loggerVerbosity;
+            Verbosity = loggerVerbosity;
         }
 
         public override void Initialize(IEventSource eventSource)
diff --git a/src/BuildVision/Helpers/ToolWindowManager.cs b/src/BuildVision/Tool/Building/WindowStateManager.cs
similarity index 59%
rename from src/BuildVision/Helpers/ToolWindowManager.cs
rename to src/BuildVision/Tool/Building/WindowStateManager.cs
index 2d5f0756..f8dd8dec 100644
--- a/src/BuildVision/Helpers/ToolWindowManager.cs
+++ b/src/BuildVision/Tool/Building/WindowStateManager.cs
@@ -1,26 +1,34 @@
-using System;
-
+using System;
+using System.ComponentModel.Composition;
+using System.Linq;
+using BuildVision.Helpers;
+using BuildVision.UI.Settings.Models.ToolWindow;
 using EnvDTE;
 using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using BuildVision.Core;
-using BuildVision.Tool;
-using BuildVision.UI.Models;
+using WindowState = BuildVision.UI.Models.WindowState;
 
-namespace BuildVision.Helpers
+namespace BuildVision.Tool.Building
 {
-    public class ToolWindowManager
+    public class WindowStateManager
     {
         private readonly DTE _dte;
         private readonly IVsWindowFrame _windowFrame;
         private readonly Window _window;
 
-        public ToolWindowManager(DTE dte, IVsWindowFrame windowFrame)
+        private readonly IServiceProvider _serviceProvider;
+
+        [ImportingConstructor]
+        public WindowStateManager([Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider)
         {
+            _serviceProvider = serviceProvider;
+
+            _dte = serviceProvider.GetService(typeof(DTE)) as DTE;
             if (_dte == null)
                 throw new InvalidOperationException("Unable to get DTE instance.");
 
-            _windowFrame = windowFrame;
+            _windowFrame = serviceProvider.GetService(typeof(IVsWindowFrame)) as IVsWindowFrame;
             if (_windowFrame == null)
                 throw new InvalidOperationException("Unable to get IVsWindowFrame instance.");
 
@@ -29,47 +37,36 @@ public ToolWindowManager(DTE dte, IVsWindowFrame windowFrame)
                 throw new InvalidOperationException("Unable to get Window instance.");
         }
 
-        public bool IsVisible()
-        {
-            int isOnScreen;
-            int result = _windowFrame.IsOnScreen(out isOnScreen);
-            return (result == VSConstants.S_OK
-                    && isOnScreen == 1
-                    && _windowFrame.IsVisible() == VSConstants.S_OK);
-        }
-
-        public void Show()
+        private bool IsVisible()
         {
-            _windowFrame.Show();
+            int result = _windowFrame.IsOnScreen(out var isOnScreen);
+            return (result == VSConstants.S_OK && isOnScreen == 1 && _windowFrame.IsVisible() == VSConstants.S_OK);
         }
 
-        public void ShowNoActivate()
-        {
-            _windowFrame.ShowNoActivate();
-        }
-
-        public void Close()
-        {
-            _windowFrame.Hide();
-        }
-
-        public void Hide()
+        private void Hide()
         {
             if (!IsVisible())
+            {
                 return;
+            }
 
-            Window window = _window;
+            var window = _window;
             switch (window.WindowState)
             {
                 case vsWindowState.vsWindowStateNormal:
                     if (!window.IsFloating)
+                    {
                         MinimizeToolWindow();
+                    }
                     else
-                        Close();
+                    {
+                        _windowFrame.Hide();
+                    }
+
                     break;
 
                 case vsWindowState.vsWindowStateMaximize:
-                    Close();
+                    _windowFrame.Hide();
                     break;
 
                 case vsWindowState.vsWindowStateMinimize:
@@ -86,28 +83,28 @@ private void MinimizeToolWindow()
             // or _window.IsFloating.
             _window.AutoHides = true;
 
-            Window win = _dte.ActiveWindow;
+            var win = _dte.ActiveWindow;
             if (win != _window)
             {
                 win.Activate();
                 return;
             }
 
-            Document doc = _dte.ActiveDocument;
+            var doc = _dte.ActiveDocument;
             if (doc != null)
                 doc.Activate();
         }
 
         private static Window GetWindowInstance(DTE dte, Guid windowGuid)
         {
-            Windows windows = dte.Windows;
-
+            var windows = dte.Windows;
             for (int i = 1; i <= windows.Count; i++)
             {
-                Window window = windows.Item(i);
-                Guid guid;
-                if (Guid.TryParse(window.ObjectKind, out guid) && guid == windowGuid)
+                var window = windows.Item(i);
+                if (Guid.TryParse(window.ObjectKind, out var guid) && guid == windowGuid)
+                {
                     return window;
+                }
             }
 
             return null;
@@ -120,20 +117,25 @@ private void ApplyToolWindowStateAction(WindowState windowState)
                 case WindowState.Nothing:
                     break;
                 case WindowState.Show:
-                    Show();
+                    _windowFrame.Show();
                     break;
                 case WindowState.ShowNoActivate:
-                    ShowNoActivate();
+                    _windowFrame.ShowNoActivate();
                     break;
                 case WindowState.Hide:
                     Hide();
                     break;
                 case WindowState.Close:
-                    Close();
+                    _windowFrame.Hide();
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(windowState));
             }
         }
+
+        public void ApplyToolWindowStateAction(WindowStateAction windowStateAction)
+        {
+            ApplyToolWindowStateAction(windowStateAction.State); 
+        }
     }
 }
diff --git a/test/BuildVision.IntegrationTests/PackageTests.cs b/test/BuildVision.IntegrationTests/PackageTests.cs
index 09c8f73e..a298453e 100644
--- a/test/BuildVision.IntegrationTests/PackageTests.cs
+++ b/test/BuildVision.IntegrationTests/PackageTests.cs
@@ -18,6 +18,7 @@ public class PackageTests
         private static IVsUIShell UiShellService => GlobalServices.GetService<SVsUIShell>() as IVsUIShell;
         private static DTE DTE => GlobalServices.GetService<DTE>() as DTE;
 
+        [Trait("Category", "SkipWhenLiveUnitTesting")]
         [VsixFact(VisualStudioVersion.Current, RootSuffix = "Exp", RunOnUIThread = true)]
         public void PackageLoad_Should_Succeed()
         {
@@ -29,6 +30,7 @@ public void PackageLoad_Should_Succeed()
             Assert.NotNull(package);
         }
 
+        [Trait("Category", "SkipWhenLiveUnitTesting")]
         [VsixFact(VisualStudioVersion.Current, RootSuffix = "Exp", RunOnUIThread = true)]
         public void ClickOnBuildVisionMenuItem_Should_ShowBuildVision()
         {
diff --git a/test/BuildVision.UnitTests/BuildVision.UnitTests.csproj b/test/BuildVision.UnitTests/BuildVision.UnitTests.csproj
index 5ac76b63..56f2fbd9 100644
--- a/test/BuildVision.UnitTests/BuildVision.UnitTests.csproj
+++ b/test/BuildVision.UnitTests/BuildVision.UnitTests.csproj
@@ -13,5 +13,10 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\BuildVision.Common\BuildVision.Common.csproj" />
+    <ProjectReference Include="..\..\src\BuildVision\BuildVision.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
   </ItemGroup>
 </Project>
diff --git a/test/BuildVision.UnitTests/Helpers/BuildEventContextExtensionsTests.cs b/test/BuildVision.UnitTests/Helpers/BuildEventContextExtensionsTests.cs
new file mode 100644
index 00000000..9359adb2
--- /dev/null
+++ b/test/BuildVision.UnitTests/Helpers/BuildEventContextExtensionsTests.cs
@@ -0,0 +1,51 @@
+using BuildVision.Helpers;
+using FluentAssertions;
+using Microsoft.Build.Framework;
+using Xunit;
+
+namespace BuildVision.UnitTests
+{
+    public class BuildEventContextExtensionsTests
+    {
+        [Fact]
+        public void IsBuildEventContextInvalid_ShouldReturn_False_IfValid()
+        {
+            var buildEventContext = new BuildEventContext(0, projectInstanceId: 0, projectContextId: 0, targetId: 0, taskId: 0);
+
+            var result = BuildEventContextExtensions.IsBuildEventContextInvalid(buildEventContext);
+            result.Should().BeFalse();
+        }
+
+        [Fact]
+        public void IsBuildEventContextInvalid_ShouldReturn_True_IfNull()
+        {
+            var result = BuildEventContextExtensions.IsBuildEventContextInvalid(null);
+            result.Should().BeTrue();
+        }
+
+        [Fact]
+        public void IsBuildEventContextInvalid_ShouldReturn_True_If_BuildEventContextInvalid()
+        {
+            var result = BuildEventContextExtensions.IsBuildEventContextInvalid(BuildEventContext.Invalid);
+            result.Should().BeTrue();
+        }
+
+        [Fact]
+        public void IsBuildEventContextInvalid_ShouldReturn_True_If_ProjectContextId_MatchesBuildEventContext_InvalidProjectContextId()
+        {
+            var buildEventContext = new BuildEventContext(0, projectInstanceId: 0, projectContextId: BuildEventContext.InvalidProjectContextId, targetId: 0, taskId: 0);
+
+            var result = BuildEventContextExtensions.IsBuildEventContextInvalid(buildEventContext);
+            result.Should().BeTrue();
+        }
+
+        [Fact]
+        public void IsBuildEventContextInvalid_ShouldReturn_True_If_ProjectInstanceId_MatchesBuildEventContext_InvalidProjectInstanceId()
+        {
+            var buildEventContext = new BuildEventContext(0, projectInstanceId: BuildEventContext.InvalidProjectInstanceId, projectContextId: 0, targetId: 0, taskId: 0);
+
+            var result = BuildEventContextExtensions.IsBuildEventContextInvalid(buildEventContext);
+            result.Should().BeTrue();
+        }
+    }
+}
diff --git a/test/BuildVision.UnitTests/Helpers/BuildMessageEventArgsExtensionsTests.cs b/test/BuildVision.UnitTests/Helpers/BuildMessageEventArgsExtensionsTests.cs
new file mode 100644
index 00000000..44c643df
--- /dev/null
+++ b/test/BuildVision.UnitTests/Helpers/BuildMessageEventArgsExtensionsTests.cs
@@ -0,0 +1,48 @@
+using System;
+using BuildVision.Helpers;
+using BuildVision.Tool.Building;
+using FluentAssertions;
+using Microsoft.Build.Framework;
+using Xunit;
+
+namespace BuildVision.UnitTests
+{
+    public class BuildMessageEventArgsExtensionsTests
+    {
+        [Theory]
+        [InlineData(LoggerVerbosity.Diagnostic, MessageImportance.High)]
+        [InlineData(LoggerVerbosity.Diagnostic, MessageImportance.Normal)]
+        [InlineData(LoggerVerbosity.Diagnostic, MessageImportance.Low)]
+        [InlineData(LoggerVerbosity.Detailed, MessageImportance.High)]
+        [InlineData(LoggerVerbosity.Detailed, MessageImportance.Normal)]
+        [InlineData(LoggerVerbosity.Detailed, MessageImportance.Low)]
+        [InlineData(LoggerVerbosity.Normal, MessageImportance.High)]
+        [InlineData(LoggerVerbosity.Normal, MessageImportance.Normal)]
+        [InlineData(LoggerVerbosity.Minimal, MessageImportance.High)]
+        public void IsUserMessage_ShouldReturn_True_ForCombinations(LoggerVerbosity loggerVerbosity, MessageImportance messageImportance)
+        {
+            var buildMessageEventArgs = new BuildMessageEventArgs("", "", "", messageImportance);
+            var buildOutputLogger = new BuildOutputLogger(Guid.NewGuid(), loggerVerbosity);
+
+            var isUserMessage = BuildMessageEventArgsExtensions.IsUserMessage(buildMessageEventArgs, buildOutputLogger);
+            isUserMessage.Should().BeTrue();
+        }
+
+        [Theory]
+        [InlineData(LoggerVerbosity.Normal, MessageImportance.Low)]
+        [InlineData(LoggerVerbosity.Minimal, MessageImportance.Normal)]
+        [InlineData(LoggerVerbosity.Minimal, MessageImportance.Low)]
+        [InlineData(LoggerVerbosity.Quiet, MessageImportance.High)]
+        [InlineData(LoggerVerbosity.Quiet, MessageImportance.Normal)]
+        [InlineData(LoggerVerbosity.Quiet, MessageImportance.Low)]
+        public void IsUserMessage_ShouldReturn_False_If_ForCombinations(LoggerVerbosity loggerVerbosity, MessageImportance messageImportance)
+        {
+            var buildMessageEventArgs = new BuildMessageEventArgs("", "", "", messageImportance);
+            var buildOutputLogger = new BuildOutputLogger(Guid.NewGuid(), loggerVerbosity);
+
+            var isUserMessage = BuildMessageEventArgsExtensions.IsUserMessage(buildMessageEventArgs, buildOutputLogger);
+            isUserMessage.Should().BeFalse();
+        }
+    }
+}
+