Fixed errorlist

StefanKert · Oct 21, 2019 · 3ea37b7 · 3ea37b7
1 parent f316dcf
commit 3ea37b7
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/src/BuildVision.UI/App.xaml.cs b/src/BuildVision.UI/App.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System.Diagnostics;
+using System.Windows;
 
 namespace BuildVision.UI
 {

diff --git a/src/BuildVision.UI/Components/ErrorsGrid.xaml b/src/BuildVision.UI/Components/ErrorsGrid.xaml
@@ -7,6 +7,7 @@
              xmlns:contracts="clr-namespace:BuildVision.Contracts;assembly=BuildVision.Contracts"
              xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
              xmlns:models="clr-namespace:BuildVision.UI.Models"
+             xmlns:vsfx="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
              mc:Ignorable="d" 
              d:DesignHeight="300" 
              d:DesignWidth="300" 
@@ -53,8 +54,8 @@
                 <DataGrid.Resources>
                     <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
                     <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="Transparent" />
-                    <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}"  Color="{Binding ElementName=ToolWindowTextKey, Path=Color}" />
-                    <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{Binding ElementName=ToolWindowTextKey, Path=Color}" />
+                    <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}"  Color="{DynamicResource vsfx.VsColors.ToolWindowTextKey}" />
+                    <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="{DynamicResource vsfx.VsColors.ToolWindowTextKey}" />
                     <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}" Color="Transparent" />
                 </DataGrid.Resources>
                 <DataGrid.Columns>

diff --git a/src/BuildVision.UI/Components/ProjectGrid.xaml b/src/BuildVision.UI/Components/ProjectGrid.xaml
@@ -128,7 +128,7 @@
                         <Setter Property="Foreground" Value="{DynamicResource ToolWindowTextKey}" />
                     </Trigger>
 
-                    <DataTrigger Binding="{Binding BuildInformationModel.ErrorsCount, Converter={StaticResource NumberToIsPositiveConverter}}" Value="True">
+                    <DataTrigger Binding="{Binding ErrorsCount, Converter={StaticResource NumberToIsPositiveConverter}}" Value="True">
                         <Setter Property="Background" Value="PaleVioletRed" />
                         <Setter Property="Foreground" Value="Black" />
                     </DataTrigger>
@@ -161,7 +161,7 @@
                 <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 BuildInformationModel.ErrorsCount, Mode=OneWay, Converter={StaticResource PositiveNumberToVisibilityConverter}}" />
+                <Setter Property="DetailsVisibility" Value="{Binding ErrorsCount, Mode=OneWay, Converter={StaticResource PositiveNumberToVisibilityConverter}}" />
                 <EventSetter Event="PreviewMouseLeftButtonDown" Handler="DataGridRowOnPreviewMouseLeftButtonDown" />
 
                 <Style.Triggers>

diff --git a/src/BuildVision.UI/Models/SortDescription.cs b/src/BuildVision.UI/Models/SortDescription.cs
@@ -8,12 +8,12 @@ public class SortDescription
 
         public string Property { get; set; }
 
+        public SortDescription() { }
+
         public SortDescription(SortOrder order, string property)
         {
             Order = order;
             Property = property;
         }
-
-        public SortDescription() { }
     }
 }
diff --git a/src/BuildVision.UI/Models/WindowStateAction.cs b/src/BuildVision.UI/Models/WindowStateAction.cs
@@ -6,11 +6,11 @@ public class WindowStateAction
     {
         public WindowState State { get; set; }
 
+        public WindowStateAction() { }
+
         public WindowStateAction(WindowState state)
         {
             State = state;
         }
-
-        public WindowStateAction() { }
     }
 }
diff --git a/src/BuildVision/BuildVision.csproj b/src/BuildVision/BuildVision.csproj
@@ -247,6 +247,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="SerilogTraceListener">
+      <Version>3.2.0</Version>
+    </PackageReference>
   </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>

diff --git a/src/BuildVision/Core/BuildVisionPackage.cs b/src/BuildVision/Core/BuildVisionPackage.cs
@@ -21,6 +21,7 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Serilog;
+using SerilogTraceListener;
 using Task = System.Threading.Tasks.Task;
 using ui = Microsoft.VisualStudio.VSConstants.UICONTEXT;
 
@@ -64,6 +65,10 @@ public BuildVisionPackage()
         {
             _logger.Information("Starting {ProductName} with Version {PackageVersion}", Resources.ProductName, ApplicationInfo.GetPackageVersion(this));
 
+            PresentationTraceSources.Refresh();
+            PresentationTraceSources.DataBindingSource.Listeners.Add(new SerilogTraceListener.SerilogTraceListener(_logger));
+            PresentationTraceSources.DataBindingSource.Switch.Level = SourceLevels.Error | SourceLevels.Critical | SourceLevels.Warning;
+
             if (Application.Current != null)
             {
                 Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException;