Fixed some warnings

Fixed wrong version displayed

src/BuildVision.Common/AppVersionInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 
@@ -12,12 +13,11 @@ public class AppVersionInfo
 
         public AppVersionInfo()
         {
-            Assembly assembly = Assembly.GetExecutingAssembly();
-            AssemblyName assemblyName = assembly.GetName();
-            Version version = assemblyName.Version;
+            var assembly = Assembly.GetExecutingAssembly();
+            var versionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
 
-            AppVersion = version.ToString(3);
-            BuildVersion = version.ToString(4);
+            AppVersion = new Version(versionInfo.ProductVersion).ToString();
+            BuildVersion = new Version(versionInfo.FileVersion).ToString();
             BuildDateTime = RetrieveLinkerTimestamp(assembly);
         }
 
@@ -26,7 +26,7 @@ public AppVersionInfo()
         /// </summary>
         private static DateTime RetrieveLinkerTimestamp(Assembly assembly)
         {
-            string filePath = assembly.Location;
+            var filePath = assembly.Location;
             const int PeHeaderOffset = 60;
             const int LinkerTimestampOffset = 8;
             var buffer = new byte[2048];
@@ -45,8 +45,8 @@ private static DateTime RetrieveLinkerTimestamp(Assembly assembly)
                 }
             }
 
-            int i = BitConverter.ToInt32(buffer, PeHeaderOffset);
-            int secondsSince1970 = BitConverter.ToInt32(buffer, i + LinkerTimestampOffset);
+            var i = BitConverter.ToInt32(buffer, PeHeaderOffset);
+            var secondsSince1970 = BitConverter.ToInt32(buffer, i + LinkerTimestampOffset);
             var dt = new DateTime(1970, 1, 1, 0, 0, 0);
             dt = dt.AddSeconds(secondsSince1970);
             dt = dt.AddHours(TimeZone.CurrentTimeZone.GetUtcOffset(dt).Hours);

src/BuildVision.Common/Extensions/DateTimeExtensions.cs

@@ -6,12 +6,7 @@ public static class DateTimeExtensions
     {
         public static DateTime Truncate(this DateTime dateTime, TimeSpan timeSpan)
         {
-            if (timeSpan <= TimeSpan.Zero)
-            {
-                return dateTime;
-            }
-
-            return dateTime.AddTicks(-(dateTime.Ticks % timeSpan.Ticks));
+            return timeSpan <= TimeSpan.Zero ? dateTime : dateTime.AddTicks(-(dateTime.Ticks % timeSpan.Ticks));
         }
     }
 }

src/BuildVision.Common/Properties/GlobalSuppressions.cs

@@ -0,0 +1,9 @@
+
+// This file is used by Code Analysis to maintain SuppressMessage 
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given 
+// a specific target and scoped to a namespace, type, member, etc.
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.Common.FilePathHelper.ShortenPath(System.String,System.Int32)~System.String")]
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.Common.Diagnostics.SessionTelemetry.#ctor")]

src/BuildVision.Common/PropertyColumnSorter.cs

@@ -6,8 +6,7 @@
 
 namespace BuildVision.Common
 {
-    public class PropertyColumnSorter<T> : IComparer
-        where T : class
+    public class PropertyColumnSorter<T> : IComparer where T : class
     {
         private readonly int _direction;
         private readonly PropertyInfo _propertyInfo;

src/BuildVision.Contracts/Properties/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+
+// This file is used by Code Analysis to maintain SuppressMessage 
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given 
+// a specific target and scoped to a namespace, type, member, etc.
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~P:BuildVision.Contracts.Exceptions.PropertyNotFoundException.Message")]
+

src/BuildVision.UI/BuildVision.UI.csproj

@@ -95,6 +95,7 @@
     <Compile Include="Converters\InProgressToVisibleConverter.cs" />
     <Compile Include="Converters\StateIconKeyToIconConverter.cs" />
     <Compile Include="Enums\ResetTaskBarItemInfoCondition.cs" />
+    <Compile Include="Properties\GlobalSuppressions.cs" />
     <Compile Include="Models\SortDescription.cs" />
     <Compile Include="Enums\SortOrder.cs" />
     <Compile Include="Enums\WindowState.cs" />

src/BuildVision.UI/Properties/GlobalSuppressions.cs

@@ -0,0 +1,37 @@
+
+// This file is used by Code Analysis to maintain SuppressMessage 
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given 
+// a specific target and scoped to a namespace, type, member, etc.
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~F:BuildVision.UI.Components.SpinnerControl.FormattedValuePropertyKey")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~F:BuildVision.UI.Extensions.VectorResources._baseUri")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Converters.DataGridLengthStringConverter.Convert(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)~System.Object")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Converters.DataGridLengthStringConverter.ConvertBack(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)~System.Object")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Converters.GridColumnSettingsToColumnExampleValueConverter.FormatExample(System.Object,System.String)~System.String")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Converters.MultiBindingStringFormatConverter.Convert(System.Object[],System.Type,System.Object,System.Globalization.CultureInfo)~System.Object")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Converters.SubtractConstantConverter.Convert(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)~System.Object")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Helpers.BuildMessagesFactory.GetBuildBeginMajorMessage(BuildVision.Contracts.Models.IBuildInformationModel)~System.String")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Helpers.BuildMessagesFactory.GetBuildDoneExtraMessage(BuildVision.Contracts.Models.IBuildInformationModel)~System.String")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Helpers.BuildMessagesFactory.GetBuildDoneMajorMessage(BuildVision.Contracts.Models.IBuildInformationModel)~System.String")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Helpers.BuildMessagesFactory.GetExtraTimePartString(System.TimeSpan)~System.String")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Helpers.BuildMessagesFactory.GetMainString(BuildVision.Contracts.Models.IBuildInformationModel)~System.String")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Helpers.BuildMessagesFactory.GetTimeString(System.Nullable{System.DateTime})~System.String")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.ViewModels.BuildVisionPaneViewModel.CopyErrorMessageToClipboard(BuildVision.UI.Models.ProjectItem)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~P:BuildVision.UI.Modelss.GridColumnAttribute.DateTimeExampleValue")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~P:BuildVision.UI.Modelss.GridColumnAttribute.TimeSpanExampleValue")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~P:BuildVision.UI.Settings.Models.BuildMessagesSettings.BuildBeginMajorMessageStringFormat")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~P:BuildVision.UI.Settings.Models.BuildMessagesSettings.BuildDoneMajorMessageStringFormat")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~P:BuildVision.UI.Settings.Models.BuildMessagesSettings.DateTimeFormat")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~P:BuildVision.UI.Settings.Models.BuildMessagesSettings.ExtraMessageStringFormat")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~P:BuildVision.UI.Settings.Models.BuildMessagesSettings.TimeSpanFormat")]
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Converters.DataGridLengthStringConverter.ConvertBack(System.Object,System.Type,System.Object,System.Globalization.CultureInfo)~System.Object")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Converters.GridColumnSettingsToColumnExampleValueConverter.FormatExample(System.Object,System.String)~System.String")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Converters.MultiBindingStringFormatConverter.Convert(System.Object[],System.Type,System.Object,System.Globalization.CultureInfo)~System.Object")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.DataGrid.ColumnsManager.GenerateColumns(System.Collections.ObjectModel.ObservableCollection{System.Windows.Controls.DataGridColumn},BuildVision.UI.Settings.Models.GridSettings)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.DataGrid.ColumnsManager.SyncColumnSettings(System.Collections.ObjectModel.ObservableCollection{System.Windows.Controls.DataGridColumn},BuildVision.UI.Settings.Models.GridSettings)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.ErrorsGrid.ErrorsGridRowOnMouseLeftButtonUp(System.Object,System.Windows.Input.MouseButtonEventArgs)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.Extensions.VectorResources.TryGet(System.String,System.String)~System.Windows.Controls.ControlTemplate")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.ViewModels.BuildVisionPaneViewModel.CopyErrorMessageToClipboard(BuildVision.UI.Models.ProjectItem)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:BuildVision.UI.ViewModels.BuildVisionPaneViewModel.OpenContainingFolder")]

src/BuildVision/BuildVision.csproj

@@ -86,9 +86,10 @@
     <Compile Include="Extensions\BuildActionsExtensions.cs" />
     <Compile Include="Extensions\BuildStateExtensions.cs" />
     <Compile Include="Extensions\IServiceProviderExtensions.cs" />
+    <Compile Include="Properties\GlobalSuppressions.cs" />
     <Compile Include="Services\BuildInformationProvider.cs" />
     <Compile Include="Services\ErrorNavigationService.cs" />
-    <Compile Include="Services\IWindowStateService.cs" />
+    <Compile Include="Interfaces\IWindowStateService.cs" />
     <Compile Include="Services\SolutionProvider.cs" />
     <Compile Include="Helpers\ProjectIdentifierGenerator.cs" />
     <Compile Include="Core\BuildVisionPackage.cs" />

src/BuildVision/Core/Services.cs

@@ -45,6 +45,12 @@ public static IVsSolution GetSolution(this IServiceProvider provider)
             return GetGlobalService<SVsSolution, IVsSolution>(provider);
         }
 
+        public static Solution GetDteSolution(this IServiceProvider provider)
+        {
+            var ret = provider.GetService(typeof(DTE)) as DTE2;
+            return ret.Solution;
+        }
+
         public static IVsSolution GetSolution()
         {
             return GetGlobalService<SVsSolution, IVsSolution>();

src/BuildVision/Extensions/IServiceProviderExtensions.cs

@@ -1,4 +1,6 @@
 using System;
+using BuildVision.Common.Logging;
+using Serilog;
 
 namespace BuildVision.Extensions
 {

src/BuildVision/Helpers/SolutionProjectsExtensions.cs

@@ -80,36 +80,16 @@ public static IList<Project> GetProjects(this Solution solution)
             return list;
         }
 
-        public static Project GetProject(this Solution solution, Func<Project, bool> cond)
+        public static Project FirstOrDefaultProject(this Solution solution, Func<Project, bool> cond)
         {
-            var projects = solution.Projects;
-            var item = projects.GetEnumerator();
-            while (item.MoveNext())
-            {
-                var project = item.Current as Project;
-                if (project == null)
-                {
-                    continue;
-                }
-
-                if (project.Kind == EnvDTEProjectKinds.ProjectKindSolutionFolder)
-                {
-                    var sub = project.GetSubProject(cond);
-                    if (sub != null)
-                    {
-                        return sub;
-                    }
-                }
-                else if (!project.IsHidden())
-                {
-                    if (cond(project))
-                    {
-                        return project;
-                    }
-                }
-            }
+            var projects = solution.GetProjects();
+            return projects.FirstOrDefault(cond);
+        }
 
-            return null;
+        public static Project FirstProject(this Solution solution, Func<Project, bool> cond)
+        {
+            var projects = solution.GetProjects();
+            return projects.First(cond);
         }
 
         public static IList<ProjectItem> GetProjectItems(this Solution solution)

src/BuildVision/Services/IWindowStateService.cs → src/BuildVision/Interfaces/IWindowStateService.cs

@@ -1,6 +1,5 @@
 using BuildVision.UI.Settings.Models.ToolWindow;
 using Microsoft.VisualStudio.Shell;
-
 namespace BuildVision.Tool.Building
 {
     public interface IWindowStateService