From 77e7aacab36b0d7862f7ca6ac6201cbead2921e3 Mon Sep 17 00:00:00 2001
From: Stefan Kert <stefan.kert@sbg.at>
Date: Sun, 7 Apr 2019 21:56:21 +0200
Subject: [PATCH] Smaller cleanups and fixes to sorting

---
 src/BuildVision.UI/BuildVision.UI.csproj      |  4 --
 .../Components/ControlView.xaml               |  2 -
 .../Components/ControlView.xaml.cs            | 40 +----------
 .../Components/ProjectGrid.xaml               | 69 ++++++-------------
 .../Components/ProjectGrid.xaml.cs            | 52 +++++++-------
 .../Components/UserControl_ForTesting.xaml    | 38 ----------
 .../Enums/BuildExtraMessageFormat.cs          |  4 +-
 .../Enums/BuildMajorMessageFormat.cs          |  2 +-
 .../NavigateToBuildFailureReasonCondition.cs  |  2 +-
 src/BuildVision.UI/Enums/SortOrder.cs         |  5 +-
 src/BuildVision.UI/Enums/WindowState.cs       |  5 +-
 .../Extensions/BindingExtensions.cs           |  1 -
 .../Extensions/DataGridColumnExtensions.cs    |  2 +-
 .../Extensions/EnumerationExtension.cs        |  4 +-
 .../Extensions/ProjectStateExtensions.cs      |  4 +-
 .../Extensions/VectorResources.cs             |  6 +-
 src/BuildVision.UI/Extensions/VisualHelper.cs |  2 +-
 src/BuildVision.UI/Helpers/BindingProxy.cs    |  4 +-
 .../Helpers/BuildMessagesFactory.cs           | 16 ++---
 src/BuildVision.UI/Helpers/EnumExtensions.cs  |  4 +-
 .../Helpers/ProjectItemColumnSorter.cs        |  4 +-
 src/BuildVision.UI/Helpers/StyleConverting.cs |  6 +-
 .../Settings/Models/BaseGridColumnSettings.cs |  3 +-
 .../Settings/Models/BuildMessagesSettings.cs  |  2 +-
 .../Settings/Models/BuildProgressSettings.cs  |  1 -
 .../Settings/Models/ControlSettings.cs        |  2 +-
 .../Settings/Models/GeneralSettings.cs        |  2 +-
 .../Settings/Models/GridColumnSettings.cs     |  2 +-
 .../Settings/Models/GridSettings.cs           |  2 +-
 .../Settings/Models/WindowSettings.cs         |  2 +-
 .../ViewModels/BuildVisionPaneViewModel.cs    | 18 ++---
 31 files changed, 93 insertions(+), 217 deletions(-)
 delete mode 100644 src/BuildVision.UI/Components/UserControl_ForTesting.xaml

diff --git a/src/BuildVision.UI/BuildVision.UI.csproj b/src/BuildVision.UI/BuildVision.UI.csproj
index 837776af..8fb41c75 100644
--- a/src/BuildVision.UI/BuildVision.UI.csproj
+++ b/src/BuildVision.UI/BuildVision.UI.csproj
@@ -240,10 +240,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Components\UserControl_ForTesting.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Controls\BuildVisionProgressBar.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/BuildVision.UI/Components/ControlView.xaml b/src/BuildVision.UI/Components/ControlView.xaml
index 4f4d8e6c..edd21248 100644
--- a/src/BuildVision.UI/Components/ControlView.xaml
+++ b/src/BuildVision.UI/Components/ControlView.xaml
@@ -6,7 +6,6 @@
              xmlns:viewModels="clr-namespace:BuildVision.UI.ViewModels"
              xmlns:extensions="clr-namespace:BuildVision.UI.Extensions"
              xmlns:helpers="clr-namespace:BuildVision.UI.Helpers"
-             xmlns:contracts="clr-namespace:BuildVision.Contracts;assembly=BuildVision.Contracts"
              xmlns:customButtons="clr-namespace:BuildVision.UI.Controls.Buttons"
              xmlns:indicators="clr-namespace:BuildVision.UI.Controls.Indicators"
              xmlns:controls="clr-namespace:BuildVision.UI.Controls"
@@ -16,7 +15,6 @@
              mc:Ignorable="d"
              Name="OwnerUserControl"
              Background="{DynamicResource ToolWindowBackgroundKey}"
-             DataContextChanged="OnDataContextChanged"
              SnapsToDevicePixels="True"
              UseLayoutRounding="True"
              d:DesignHeight="148"
diff --git a/src/BuildVision.UI/Components/ControlView.xaml.cs b/src/BuildVision.UI/Components/ControlView.xaml.cs
index a86bfc17..42e9aea6 100644
--- a/src/BuildVision.UI/Components/ControlView.xaml.cs
+++ b/src/BuildVision.UI/Components/ControlView.xaml.cs
@@ -1,21 +1,6 @@
-using BuildVision.UI.Converters;
-using BuildVision.UI.DataGrid;
-using BuildVision.UI.Helpers;
-using BuildVision.UI.Models;
-using BuildVision.UI.ViewModels;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Windows;
+using System.Globalization;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Input;
 using System.Windows.Markup;
-using System.Windows.Media;
 
 namespace BuildVision.UI
 {
@@ -24,8 +9,6 @@ namespace BuildVision.UI
     /// </summary>
     public partial class ControlView : UserControl
     {
-        private BuildVisionPaneViewModel _viewModel;
-
         public ControlView()
         {
             InitializeComponent();
@@ -33,26 +16,5 @@ public ControlView()
             // By default, WPF uses en-US as the culture, regardless of the system settings.
             Language = XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag);
         }
-
-        private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            Debug.Assert(DataContext != null);
-
-            _viewModel = (BuildVisionPaneViewModel) DataContext;
-            _viewModel.PropertyChanged += ViewModelOnPropertyChanged;
-        }
-
-        private void ViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            //TODO implement logic for scrolling tu currentproject
-            //if (_viewModel.CurrentProject != null && e.PropertyName == "CurrentProject")
-            //{
-            //    // TODO: Remove SelectedIndex = -1 and implement Unselect row feature by clicking on selected row.
-            //    Grid.SelectedIndex = -1;
-
-            //    if (Grid.SelectedIndex == -1)
-            //        Grid.ScrollIntoView(_viewModel.CurrentProject);
-            //}
-        }
     }
 }
diff --git a/src/BuildVision.UI/Components/ProjectGrid.xaml b/src/BuildVision.UI/Components/ProjectGrid.xaml
index 7985074c..03aa0ee2 100644
--- a/src/BuildVision.UI/Components/ProjectGrid.xaml
+++ b/src/BuildVision.UI/Components/ProjectGrid.xaml
@@ -118,7 +118,7 @@
                   ScrollViewer.HorizontalScrollBarVisibility="Auto"
                   ScrollViewer.IsDeferredScrollingEnabled="False"
                   ScrollViewer.VerticalScrollBarVisibility="Auto"
-                  SelectedItem="{Binding SelectedProjectItem}"
+                  SelectedItem="{Binding BuildInformationModel.CurrentProject}"
                   SelectionMode="Single"
                   SelectionUnit="FullRow"
                   Sorting="GridOnSorting"
@@ -172,21 +172,13 @@
 
         <DataGrid.RowStyle>
             <Style TargetType="DataGridRow">
-
-                <Setter Property="Foreground"
-                            Value="{DynamicResource ToolWindowTextKey}" />
-                <Setter Property="BorderThickness"
-                            Value="0,1,0,1" />
-                <Setter Property="BorderBrush"
-                            Value="{Binding Background, RelativeSource={RelativeSource self}}" />
-
-                <Setter Property="DetailsVisibility"
-                            Value="{Binding ErrorsCount, Mode=OneWay, Converter={StaticResource PositiveNumberToVisibilityConverter}}" />
-                <EventSetter Event="PreviewMouseLeftButtonDown"
-                                 Handler="DataGridRowOnPreviewMouseLeftButtonDown" />
+                <Setter Property="Foreground" Value="{DynamicResource ToolWindowTextKey}" />
+                <Setter Property="BorderThickness" Value="0,1,0,1" />
+                <Setter Property="BorderBrush" Value="{Binding Background, RelativeSource={RelativeSource self}}" />
+                <Setter Property="DetailsVisibility" Value="{Binding ErrorsCount, Mode=OneWay, Converter={StaticResource PositiveNumberToVisibilityConverter}}" />
+                <EventSetter Event="PreviewMouseLeftButtonDown" Handler="DataGridRowOnPreviewMouseLeftButtonDown" />
 
                 <Style.Triggers>
-
                     <MultiDataTrigger>
                         <MultiDataTrigger.Conditions>
                             <Condition Value="{x:Static contracts:ProjectState.UpToDate}" Binding="{Binding Path=State}"/>
@@ -195,7 +187,6 @@
                         <Setter Property="Visibility" Value="Collapsed"/>
                     </MultiDataTrigger>
 
-
                     <MultiDataTrigger>
                         <MultiDataTrigger.Conditions>
                             <Condition Value="{x:Static contracts:ProjectState.Pending}" Binding="{Binding Path=State}"/>
@@ -207,24 +198,18 @@
                     <DataTrigger Value="True">
                         <DataTrigger.Binding>
                             <MultiBinding Converter="{StaticResource ObjectsReferencesEqualsConverter}">
-                                <Binding Path="DataContext.CurrentProject"
-                                             RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+                                <Binding Path="DataContext.CurrentProject" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
                                 <Binding Path="." />
                             </MultiBinding>
                         </DataTrigger.Binding>
-                        <Setter Property="BorderBrush"
-                                    Value="CornflowerBlue" />
-                        <Setter Property="BorderThickness"
-                                    Value="0,1,0,1" />
+                        <Setter Property="BorderBrush" Value="CornflowerBlue" />
+                        <Setter Property="BorderThickness" Value="0,1,0,1" />
                     </DataTrigger>
 
                     <!-- TODO: Make Selected row style similar to style in VisualStudio.-->
-                    <Trigger Property="IsSelected"
-                                 Value="True">
-                        <Setter Property="BorderBrush"
-                                    Value="DodgerBlue" />
-                        <Setter Property="BorderThickness"
-                                    Value="0,1,0,1" />
+                    <Trigger Property="IsSelected" Value="True">
+                        <Setter Property="BorderBrush" Value="DodgerBlue" />
+                        <Setter Property="BorderThickness" Value="0,1,0,1" />
                     </Trigger>
 
                 </Style.Triggers>
@@ -235,14 +220,11 @@
             <ContextMenu>
                 <MenuItem Header="{x:Static res:Resources.SelectedProjectItemMenuItems}"
                               ItemsSource="{Binding Source={StaticResource SelectedProjectMenuItems}}"
-                              Visibility="{Binding SelectedProjectItem,
-                                                   Converter={StaticResource NotNullToVisibilityConverter}}" />
-                <Separator Visibility="{Binding SelectedProjectItem,
-                                                   Converter={StaticResource NotNullToVisibilityConverter}}" />
+                              Visibility="{Binding SelectedProjectItem, Converter={StaticResource NotNullToVisibilityConverter}}" />
+                <Separator Visibility="{Binding SelectedProjectItem, Converter={StaticResource NotNullToVisibilityConverter}}" />
                 <MenuItem Header="{x:Static res:Resources.GridHeaderVisibleMenuItem}"
                               IsCheckable="True"
-                              IsChecked="{Binding GridHeadersVisibility,
-                                                  Converter={StaticResource ResourceKey=ColumnHeadersVisibilityToBool}}" />
+                              IsChecked="{Binding GridHeadersVisibility, Converter={StaticResource ResourceKey=ColumnHeadersVisibilityToBool}}" />
                 <MenuItem Header="{x:Static res:Resources.HideUpToDateTargetsMenuItem}"
                               IsCheckable="True"
                               IsChecked="{Binding HideUpToDateTargets}" />
@@ -250,8 +232,7 @@
                               ItemsSource="{Binding Source={StaticResource GridColumnsMenuItems}}">
                     <MenuItem.ItemContainerStyle>
                         <Style TargetType="{x:Type MenuItem}">
-                            <Setter Property="StaysOpenOnClick"
-                                        Value="True" />
+                            <Setter Property="StaysOpenOnClick" Value="True" />
                             <Setter Property="IsCheckable"
                                         Value="True" />
                             <Setter Property="IsChecked"
@@ -284,24 +265,18 @@
                                                   OverridesDefaultStyle="True"
                                                   Template="{StaticResource ExpanderTemplate}">
                                         <Expander.IsExpanded>
-                                            <MultiBinding Converter="{StaticResource ResourceKey=ExpanderIsExpandedConverter}"
-                                                              Mode="OneWay">
+                                            <MultiBinding Converter="{StaticResource ResourceKey=ExpanderIsExpandedConverter}" Mode="OneWay">
                                                 <Binding Mode="OneWay" />
-                                                <Binding Path="DataContext.ControlSettings.GridSettings.CollapsedGroups"
-                                                             Source="{x:Reference OwnerUserControl}" />
+                                                <Binding Path="DataContext.ControlSettings.GridSettings.CollapsedGroups" Source="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
                                             </MultiBinding>
                                         </Expander.IsExpanded>
                                         <Expander.Header>
-                                            <StackPanel VerticalAlignment="Center"
-                                                            Orientation="Horizontal">
+                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
                                                 <TextBlock Foreground="{DynamicResource GrayTextKey}">
                                                     <TextBlock.Text>
-                                                        <MultiBinding Converter="{StaticResource ResourceKey=MultiBindingStringFormatConverter}"
-                                                                          Mode="OneWay">
-                                                            <Binding Path="DataContext.ControlSettings.GridSettings.GroupHeaderRawFormat"
-                                                                         Source="{x:Reference OwnerUserControl}" />
-                                                            <Binding Path="DataContext.GridGroupHeaderName"
-                                                                         Source="{x:Reference OwnerUserControl}" />
+                                                        <MultiBinding Converter="{StaticResource ResourceKey=MultiBindingStringFormatConverter}" Mode="OneWay">
+                                                            <Binding Path="DataContext.ControlSettings.GridSettings.GroupHeaderRawFormat" Source="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+                                                            <Binding Path="DataContext.GridGroupHeaderName" Source="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
                                                             <Binding Path="Name" />
                                                             <Binding Path="ItemCount" />
                                                         </MultiBinding>
diff --git a/src/BuildVision.UI/Components/ProjectGrid.xaml.cs b/src/BuildVision.UI/Components/ProjectGrid.xaml.cs
index 74b3a8de..c41be47c 100644
--- a/src/BuildVision.UI/Components/ProjectGrid.xaml.cs
+++ b/src/BuildVision.UI/Components/ProjectGrid.xaml.cs
@@ -1,28 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
+using System.ComponentModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using BuildVision.UI.Converters;
+using BuildVision.UI.DataGrid;
+using BuildVision.UI.Helpers;
 using BuildVision.UI.ViewModels;
 
 namespace BuildVision.UI.Components
 {
-    /// <summary>
-    /// Interaction logic for ProjectGrid.xaml
-    /// </summary>
     public partial class ProjectGrid : UserControl
     {
         private BuildVisionPaneViewModel _viewModel;
@@ -42,20 +32,24 @@ private void GridOnTargetUpdated(object sender, DataTransferEventArgs e)
 
         private void RefreshSortDirectionInGrid()
         {
-            //DataGridColumn dataGridColumn = Grid.Columns.FirstOrDefault(col => col.GetBindedProperty() == _viewModel.GridSortDescription.Property);
-            //if (dataGridColumn != null)
-            //    dataGridColumn.SortDirection = _viewModel.GridSortDescription.Order.ToSystem();
+            DataGridColumn dataGridColumn = Grid.Columns.FirstOrDefault(col => col.GetBindedProperty() == _viewModel.GridSortDescription.Property);
+            if (dataGridColumn != null)
+            {
+                dataGridColumn.SortDirection = _viewModel.GridSortDescription.Order.ToSystem();
+            }
         }
 
         private void GridOnSorting(object sender, DataGridSortingEventArgs e)
         {
             if (_viewModel.GridSorting.CanExecute(e))
+            {
                 _viewModel.GridSorting.Execute(e);
+            }
         }
 
         private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-            _viewModel = (BuildVisionPaneViewModel) DataContext;
+            _viewModel = (BuildVisionPaneViewModel)DataContext;
             _viewModel.SetGridColumnsRef(Grid.Columns);
             _viewModel.PropertyChanged += ViewModelOnPropertyChanged;
         }
@@ -63,20 +57,20 @@ private void OnDataContextChanged(object sender, DependencyPropertyChangedEventA
         private void ViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             //TODO implement logic for scrolling tu currentproject
-            //if (_viewModel.CurrentProject != null && e.PropertyName == "CurrentProject")
-            //{
-            //    // TODO: Remove SelectedIndex = -1 and implement Unselect row feature by clicking on selected row.
-            //    Grid.SelectedIndex = -1;
-
-            //    if (Grid.SelectedIndex == -1)
-            //        Grid.ScrollIntoView(_viewModel.CurrentProject);
-            //}
+            if (_viewModel.BuildInformationModel.CurrentProject != null && e.PropertyName == "CurrentProject")
+            {
+                // TODO: Remove SelectedIndex = -1 and implement Unselect row feature by clicking on selected row.
+                Grid.SelectedIndex = -1;
+
+                if (Grid.SelectedIndex == -1)
+                    Grid.ScrollIntoView(_viewModel.BuildInformationModel.CurrentProject);
+            }
         }
 
         private void DataGridExpanderOnExpanded(object sender, RoutedEventArgs e)
         {
             ExpanderIsExpandedConverter.SaveState(
-                (Expander) sender,
+                (Expander)sender,
                 false,
                 _viewModel.ControlSettings.GridSettings.CollapsedGroups);
             e.Handled = true;
@@ -85,7 +79,7 @@ private void DataGridExpanderOnExpanded(object sender, RoutedEventArgs e)
         private void DataGridExpanderOnCollapsed(object sender, RoutedEventArgs e)
         {
             ExpanderIsExpandedConverter.SaveState(
-                (Expander) sender,
+                (Expander)sender,
                 true,
                 _viewModel.ControlSettings.GridSettings.CollapsedGroups);
             e.Handled = true;
@@ -101,7 +95,7 @@ private void DataGridExpanderOnPreviewMouseWheel(object sender, MouseWheelEventA
                 Source = sender
             };
 
-            var parent = (UIElement) VisualTreeHelper.GetParent((DependencyObject) sender);
+            var parent = (UIElement)VisualTreeHelper.GetParent((DependencyObject)sender);
             parent.RaiseEvent(eventArg);
         }
 
@@ -115,7 +109,7 @@ private void DataGridRowDetailsOnMouseLeftButtonDown(object sender, MouseButtonE
         // Autofocus for RowDetails (without extra mouse click).
         private void DataGridRowOnPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            var row = (DataGridRow) sender;
+            var row = (DataGridRow)sender;
             if (!row.IsSelected && e.Source is DataGridDetailsPresenter)
             {
                 row.Focusable = true;
diff --git a/src/BuildVision.UI/Components/UserControl_ForTesting.xaml b/src/BuildVision.UI/Components/UserControl_ForTesting.xaml
deleted file mode 100644
index 3ca36881..00000000
--- a/src/BuildVision.UI/Components/UserControl_ForTesting.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             Width="78"
-             Height="40"
-             mc:Ignorable="d">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Rectangle Grid.ColumnSpan="2" Fill="Transparent" />
-        <Path x:Name="Arrow"
-                      Grid.Column="0"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Data="M 0,5 L 10,5 M 5,0 L 5,10"
-                      Stroke="#FF666666"
-                      StrokeThickness="2">
-        </Path>
-
-        <Path x:Name="Arrow2"
-                      Grid.Column="1"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Data="M 0,1 L 10,1"
-                      RenderTransformOrigin="0.5,0.5"
-                      Stroke="#FF666666"
-                      StrokeThickness="2">
-        </Path>
-
-        <ContentPresenter x:Name="HeaderContent"
-                          Grid.Column="1"
-                          Margin="4,0,0,0"
-                          ContentSource="Content" />
-    </Grid>
-</UserControl>
diff --git a/src/BuildVision.UI/Enums/BuildExtraMessageFormat.cs b/src/BuildVision.UI/Enums/BuildExtraMessageFormat.cs
index 731d461f..ca0bfd90 100644
--- a/src/BuildVision.UI/Enums/BuildExtraMessageFormat.cs
+++ b/src/BuildVision.UI/Enums/BuildExtraMessageFormat.cs
@@ -1,4 +1,4 @@
-using BuildVision.UI.Helpers;
+using BuildVision.UI.Helpers;
 
 namespace BuildVision.UI.Models
 {
@@ -16,4 +16,4 @@ public enum BuildExtraMessageFormat
         [DisplayString(ResourceName = nameof(Resources.EnumBuildStateExtraLabelTemplate_TotalMinutesWithSeconds))]
         TotalMinutesWithSeconds
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Enums/BuildMajorMessageFormat.cs b/src/BuildVision.UI/Enums/BuildMajorMessageFormat.cs
index cc5dcf1f..4352d695 100644
--- a/src/BuildVision.UI/Enums/BuildMajorMessageFormat.cs
+++ b/src/BuildVision.UI/Enums/BuildMajorMessageFormat.cs
@@ -10,4 +10,4 @@ public enum BuildMajorMessageFormat
         [DisplayString(ResourceName = nameof(Resources.EnumBuildStateLabelTemplate_ShortForm))]
         Unnamed
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Enums/NavigateToBuildFailureReasonCondition.cs b/src/BuildVision.UI/Enums/NavigateToBuildFailureReasonCondition.cs
index ca707e7e..ad85b36b 100644
--- a/src/BuildVision.UI/Enums/NavigateToBuildFailureReasonCondition.cs
+++ b/src/BuildVision.UI/Enums/NavigateToBuildFailureReasonCondition.cs
@@ -13,4 +13,4 @@ public enum NavigateToBuildFailureReasonCondition
         [DisplayString(ResourceName = nameof(Resources.NavigateToBuildFailureReasonCondition_OnBuildDone))]
         OnBuildDone
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Enums/SortOrder.cs b/src/BuildVision.UI/Enums/SortOrder.cs
index 85c16854..5b8f3b28 100644
--- a/src/BuildVision.UI/Enums/SortOrder.cs
+++ b/src/BuildVision.UI/Enums/SortOrder.cs
@@ -1,5 +1,4 @@
-using BuildVision.UI;
-using BuildVision.UI.Helpers;
+using BuildVision.UI.Helpers;
 
 namespace BuildVision.UI.Models
 {
@@ -14,4 +13,4 @@ public enum SortOrder
         [DisplayString(ResourceName = nameof(Resources.EnumSortOrder_Desc))]
         Descending
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Enums/WindowState.cs b/src/BuildVision.UI/Enums/WindowState.cs
index 14f57e61..24cb1ed9 100644
--- a/src/BuildVision.UI/Enums/WindowState.cs
+++ b/src/BuildVision.UI/Enums/WindowState.cs
@@ -1,5 +1,4 @@
-using BuildVision.UI;
-using BuildVision.UI.Helpers;
+using BuildVision.UI.Helpers;
 
 namespace BuildVision.UI.Models
 {
@@ -20,4 +19,4 @@ public enum WindowState
         [DisplayString(ResourceName = nameof(Resources.EnumWindowState_Close))]
         Close
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Extensions/BindingExtensions.cs b/src/BuildVision.UI/Extensions/BindingExtensions.cs
index 6e50ade2..b7b8945a 100644
--- a/src/BuildVision.UI/Extensions/BindingExtensions.cs
+++ b/src/BuildVision.UI/Extensions/BindingExtensions.cs
@@ -1,5 +1,4 @@
 using System.Windows;
-using System.Windows.Data;
 
 namespace BuildVision.UI.Extensions
 {
diff --git a/src/BuildVision.UI/Extensions/DataGridColumnExtensions.cs b/src/BuildVision.UI/Extensions/DataGridColumnExtensions.cs
index 6b325a46..33a9d049 100644
--- a/src/BuildVision.UI/Extensions/DataGridColumnExtensions.cs
+++ b/src/BuildVision.UI/Extensions/DataGridColumnExtensions.cs
@@ -17,6 +17,6 @@ public static string GetName(DependencyObject obj)
         public static void SetName(DependencyObject obj, string value)
         {
             obj.SetValue(NameProperty, value);
-        } 
+        }
     }
 }
diff --git a/src/BuildVision.UI/Extensions/EnumerationExtension.cs b/src/BuildVision.UI/Extensions/EnumerationExtension.cs
index 9d9073f3..26112ff6 100644
--- a/src/BuildVision.UI/Extensions/EnumerationExtension.cs
+++ b/src/BuildVision.UI/Extensions/EnumerationExtension.cs
@@ -1,7 +1,7 @@
-using BuildVision.UI.Helpers;
-using System;
+using System;
 using System.Linq;
 using System.Windows.Markup;
+using BuildVision.UI.Helpers;
 
 namespace BuildVision.UI.Extensions
 {
diff --git a/src/BuildVision.UI/Extensions/ProjectStateExtensions.cs b/src/BuildVision.UI/Extensions/ProjectStateExtensions.cs
index 6b0a04fe..2f08a65f 100644
--- a/src/BuildVision.UI/Extensions/ProjectStateExtensions.cs
+++ b/src/BuildVision.UI/Extensions/ProjectStateExtensions.cs
@@ -1,5 +1,5 @@
-using BuildVision.Contracts;
-using System.Windows.Controls;
+using System.Windows.Controls;
+using BuildVision.Contracts;
 
 namespace BuildVision.UI.Extensions
 {
diff --git a/src/BuildVision.UI/Extensions/VectorResources.cs b/src/BuildVision.UI/Extensions/VectorResources.cs
index ba9eef6d..4d1c067d 100644
--- a/src/BuildVision.UI/Extensions/VectorResources.cs
+++ b/src/BuildVision.UI/Extensions/VectorResources.cs
@@ -1,5 +1,4 @@
-using BuildVision.UI;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Management.Instrumentation;
 using System.Windows;
@@ -15,8 +14,7 @@ public static class VectorResources
 
         private static object GetResource(string resourceDictionaryRelativeUri, string resourceKey)
         {
-            ResourceDictionary dict;
-            if (_cachedResources.TryGetValue(resourceDictionaryRelativeUri, out dict))
+            if (_cachedResources.TryGetValue(resourceDictionaryRelativeUri, out var dict))
             {
                 return dict[resourceKey];
             }
diff --git a/src/BuildVision.UI/Extensions/VisualHelper.cs b/src/BuildVision.UI/Extensions/VisualHelper.cs
index bb5485ef..e91ca506 100644
--- a/src/BuildVision.UI/Extensions/VisualHelper.cs
+++ b/src/BuildVision.UI/Extensions/VisualHelper.cs
@@ -48,4 +48,4 @@ public static IEnumerable<T> FindVisualChildren<T>(DependencyObject obj)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Helpers/BindingProxy.cs b/src/BuildVision.UI/Helpers/BindingProxy.cs
index 652e08e8..476b6952 100644
--- a/src/BuildVision.UI/Helpers/BindingProxy.cs
+++ b/src/BuildVision.UI/Helpers/BindingProxy.cs
@@ -15,8 +15,8 @@ protected override Freezable CreateInstanceCore()
 
         public object Data
         {
-            get { return (object) GetValue(DataProperty); }
-            set { SetValue(DataProperty, value); }
+            get => GetValue(DataProperty);
+            set => SetValue(DataProperty, value);
         }
 
         // Using a DependencyProperty as the backing store for Data.  This enables animation, styling, binding, etc...
diff --git a/src/BuildVision.UI/Helpers/BuildMessagesFactory.cs b/src/BuildVision.UI/Helpers/BuildMessagesFactory.cs
index 6283bc51..ca7fdc36 100644
--- a/src/BuildVision.UI/Helpers/BuildMessagesFactory.cs
+++ b/src/BuildVision.UI/Helpers/BuildMessagesFactory.cs
@@ -1,12 +1,8 @@
 using System;
-using System.Linq;
 using BuildVision.Contracts;
-using BuildVision.UI.Models;
-using BuildVision.UI.Settings.Models;
-using BuildVision.Core;
-using BuildVision.Exports.Providers;
 using BuildVision.Contracts.Models;
 using BuildVision.Exports.Factories;
+using BuildVision.UI.Models;
 using BuildVision.Views.Settings;
 
 namespace BuildVision.UI.Helpers
@@ -71,7 +67,7 @@ private string GetBeginAtString(BuildActions? buildAction)
 
                 case BuildActions.BuildActionBuild:
                     return Resources.BuildActionBuild_BeginAtString;
-  
+
                 case BuildActions.BuildActionClean:
                     return Resources.BuildActionClean_BeginAtString;
                 default:
@@ -104,7 +100,7 @@ private string GetUnitName(BuildScopes buildScope)
                 case BuildScopes.BuildScopeSolution:
                     unitName = Resources.BuildScopeSolution_UnitName;
                     //if (_labelSettings.ShowSolutionName)
-                        //unitName += string.Format(Resources.BuildScopeSolution_SolutionNameTemplate, solutionItem.Name);
+                    //unitName += string.Format(Resources.BuildScopeSolution_SolutionNameTemplate, solutionItem.Name);
                     break;
 
                 case BuildScopes.BuildScopeBatch:
@@ -133,7 +129,7 @@ public string GetBuildBeginExtraMessage(IBuildInformationModel buildInformationM
             var timeSpan = DateTime.Now.Subtract(buildInformationModel.BuildStartTime.Value);
             if (timeSpan.TotalSeconds > _packageSettingsProvider.Settings.BuildMessagesSettings.ExtraMessageDelay)
             {
-                return GetExtraTimePartString( timeSpan);
+                return GetExtraTimePartString(timeSpan);
             }
 
             return string.Empty;
@@ -168,7 +164,7 @@ private string GetBuildDoneMajorMessage(IBuildInformationModel buildInformationM
                 case BuildScopes.BuildScopeSolution:
                     unitName = Resources.BuildScopeSolution_UnitName;
                     //if (_labelSettings.ShowSolutionName)
-                        //unitName += string.Format(Resources.BuildScopeSolution_SolutionNameTemplate, solutionItem.Name);
+                    //unitName += string.Format(Resources.BuildScopeSolution_SolutionNameTemplate, solutionItem.Name);
                     break;
 
                 case BuildScopes.BuildScopeBatch:
@@ -234,7 +230,7 @@ private string GetResultName(BuildResultState resultState)
                 case BuildResultState.Unknown: // Check if this is right
                     return Resources.BuildActionFinished_Clean;
                 default:
-                    return Resources.BuildActionFinished; 
+                    return Resources.BuildActionFinished;
             }
         }
 
diff --git a/src/BuildVision.UI/Helpers/EnumExtensions.cs b/src/BuildVision.UI/Helpers/EnumExtensions.cs
index f41066a7..874c4d9c 100644
--- a/src/BuildVision.UI/Helpers/EnumExtensions.cs
+++ b/src/BuildVision.UI/Helpers/EnumExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -53,4 +53,4 @@ public static string DisplayString(this Enum value)
             return (attributes.Length >= 1) ? attributes[0].DisplayString : value.ToString();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Helpers/ProjectItemColumnSorter.cs b/src/BuildVision.UI/Helpers/ProjectItemColumnSorter.cs
index 01a80d16..ad089909 100644
--- a/src/BuildVision.UI/Helpers/ProjectItemColumnSorter.cs
+++ b/src/BuildVision.UI/Helpers/ProjectItemColumnSorter.cs
@@ -1,6 +1,6 @@
+using System.ComponentModel;
 using BuildVision.Common;
 using BuildVision.UI.Models;
-using System.ComponentModel;
 
 namespace BuildVision.UI.Helpers
 {
@@ -11,4 +11,4 @@ public ProjectItemColumnSorter(ListSortDirection direction, string propertyName)
         {
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Helpers/StyleConverting.cs b/src/BuildVision.UI/Helpers/StyleConverting.cs
index ddc42fdb..7c302501 100644
--- a/src/BuildVision.UI/Helpers/StyleConverting.cs
+++ b/src/BuildVision.UI/Helpers/StyleConverting.cs
@@ -1,9 +1,9 @@
-using BuildVision.UI.Models;
-using System;
+using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Media.Imaging;
+using BuildVision.UI.Models;
 
 namespace BuildVision.UI.Helpers
 {
@@ -91,4 +91,4 @@ public static SortOrder ToMedia(this ListSortDirection? listSortDirection)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/BuildVision.UI/Settings/Models/BaseGridColumnSettings.cs b/src/BuildVision.UI/Settings/Models/BaseGridColumnSettings.cs
index 82127fc4..26e8fc3a 100644
--- a/src/BuildVision.UI/Settings/Models/BaseGridColumnSettings.cs
+++ b/src/BuildVision.UI/Settings/Models/BaseGridColumnSettings.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.Serialization;
+using System;
 
 namespace BuildVision.Contracts
 {
diff --git a/src/BuildVision.UI/Settings/Models/BuildMessagesSettings.cs b/src/BuildVision.UI/Settings/Models/BuildMessagesSettings.cs
index ec5468ad..0026b644 100644
--- a/src/BuildVision.UI/Settings/Models/BuildMessagesSettings.cs
+++ b/src/BuildVision.UI/Settings/Models/BuildMessagesSettings.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using BuildVision.Common;
 using BuildVision.UI.Models;
 
diff --git a/src/BuildVision.UI/Settings/Models/BuildProgressSettings.cs b/src/BuildVision.UI/Settings/Models/BuildProgressSettings.cs
index 24032fd3..60f510f8 100644
--- a/src/BuildVision.UI/Settings/Models/BuildProgressSettings.cs
+++ b/src/BuildVision.UI/Settings/Models/BuildProgressSettings.cs
@@ -1,5 +1,4 @@
 using BuildVision.UI.Models;
-using System.Runtime.Serialization;
 
 namespace BuildVision.UI.Settings.Models.BuildProgress
 {
diff --git a/src/BuildVision.UI/Settings/Models/ControlSettings.cs b/src/BuildVision.UI/Settings/Models/ControlSettings.cs
index db7c7527..0753314a 100644
--- a/src/BuildVision.UI/Settings/Models/ControlSettings.cs
+++ b/src/BuildVision.UI/Settings/Models/ControlSettings.cs
@@ -1,4 +1,4 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using BuildVision.Common;
 
 namespace BuildVision.UI.Settings.Models
diff --git a/src/BuildVision.UI/Settings/Models/GeneralSettings.cs b/src/BuildVision.UI/Settings/Models/GeneralSettings.cs
index 9e6e20f8..b4b4d694 100644
--- a/src/BuildVision.UI/Settings/Models/GeneralSettings.cs
+++ b/src/BuildVision.UI/Settings/Models/GeneralSettings.cs
@@ -1,4 +1,4 @@
-using BuildVision.Common;
+using BuildVision.Common;
 using BuildVision.UI.Models;
 using BuildVision.UI.Settings.Models.BuildProgress;
 
diff --git a/src/BuildVision.UI/Settings/Models/GridColumnSettings.cs b/src/BuildVision.UI/Settings/Models/GridColumnSettings.cs
index 7171ea9a..4925a40a 100644
--- a/src/BuildVision.UI/Settings/Models/GridColumnSettings.cs
+++ b/src/BuildVision.UI/Settings/Models/GridColumnSettings.cs
@@ -1,4 +1,4 @@
-using BuildVision.Contracts;
+using BuildVision.Contracts;
 
 namespace BuildVision.UI.Settings.Models.Columns
 {
diff --git a/src/BuildVision.UI/Settings/Models/GridSettings.cs b/src/BuildVision.UI/Settings/Models/GridSettings.cs
index c695fb06..72cd7808 100644
--- a/src/BuildVision.UI/Settings/Models/GridSettings.cs
+++ b/src/BuildVision.UI/Settings/Models/GridSettings.cs
@@ -2,8 +2,8 @@
 using System.Linq;
 using BuildVision.Common;
 using BuildVision.UI.DataGrid;
-using BuildVision.UI.Settings.Models.Columns;
 using BuildVision.UI.Models;
+using BuildVision.UI.Settings.Models.Columns;
 using BuildVision.UI.Settings.Models.Sorting;
 
 namespace BuildVision.UI.Settings.Models
diff --git a/src/BuildVision.UI/Settings/Models/WindowSettings.cs b/src/BuildVision.UI/Settings/Models/WindowSettings.cs
index 91acb467..190bcc46 100644
--- a/src/BuildVision.UI/Settings/Models/WindowSettings.cs
+++ b/src/BuildVision.UI/Settings/Models/WindowSettings.cs
@@ -1,4 +1,4 @@
-using BuildVision.Common;
+using BuildVision.Common;
 using BuildVision.UI.Models;
 using BuildVision.UI.Settings.Models.ToolWindow;
 
diff --git a/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs b/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs
index 86833a94..3c1146ad 100644
--- a/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs
+++ b/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -76,18 +77,17 @@ public string GridGroupPropertyName
 
         private CompositeCollection CreateContextMenu()
         {
-            var collection = new CompositeCollection();
-            collection.Add(new MenuItem
+            var collection = new CompositeCollection
             {
-                Header = Resources.NoneMenuItem,
-                Tag = string.Empty
-            });
+                new MenuItem
+                {
+                    Header = Resources.NoneMenuItem,
+                    Tag = string.Empty
+                }
+            };
 
-            foreach (var column in ControlSettings.GridSettings.Columns)
+            foreach (var column in ControlSettings.GridSettings.Columns.Where(ColumnsManager.ColumnIsGroupable))
             {
-                if (!ColumnsManager.ColumnIsGroupable(column))
-                    continue;
-
                 string header = column.Header;
                 var menuItem = new MenuItem
                 {