Fix up to date check & improve logging

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageControl.xaml

@@ -5,8 +5,15 @@
                          xmlns:local="clr-namespace:Microsoft.VisualStudio.Editors.OptionPages">
     <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel>
-            <CheckBox x:Name="FastUpToDateCheck" x:Uid="General_FastUpToDateCheck" Content="{x:Static r:GeneralOptionPageResources.General_FastUpToDateCheck}" Margin="0" />
-            <CheckBox x:Name="VerboseFastUpToDateLogging" x:Uid="General_VerboseFastUpToDateLogging" Content="{x:Static r:GeneralOptionPageResources.General_VerboseFastUpToDateLogging}" Margin="0" />
+            <GroupBox x:Uid="FastUpToDateGroupBox" Header="{x:Static r:GeneralOptionPageResources.General_FastUpToDateCheck_Title}">
+                <StackPanel Orientation="Vertical">
+                    <CheckBox x:Name="FastUpToDateCheck" x:Uid="General_FastUpToDateCheck" Content="{x:Static r:GeneralOptionPageResources.General_FastUpToDateCheck}" Margin="0" />
+                    <StackPanel Orientation="Horizontal">
+                        <Label Content="{x:Static r:GeneralOptionPageResources.General_FastUpToDateCheck_LogLevel}" Margin="0" />
+                        <ComboBox x:Name="FastUpToDateLogLevel" SelectedIndex="2" ItemsSource="{x:Static local:GeneralOptionPageControl.FastUpToDateLogLevelItemSource}" x:Uid="General_LogLevel" VerticalContentAlignment="Center" Margin="0"/>
+                    </StackPanel>
+                </StackPanel>
+            </GroupBox>
         </StackPanel>
     </ScrollViewer>
 </local:OptionPageControl>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageControl.xaml.vb

@@ -9,6 +9,12 @@ Namespace Microsoft.VisualStudio.Editors.OptionPages
 
         Private _generalOptions As GeneralOptions
 
+        Public Shared ReadOnly FastUpToDateLogLevelItemSource As String() = {
+            My.Resources.GeneralOptionPageResources.General_FastUpToDateCheck_LogLevel_None,
+            My.Resources.GeneralOptionPageResources.General_FastUpToDateCheck_LogLevel_Info,
+            My.Resources.GeneralOptionPageResources.General_FastUpToDateCheck_LogLevel_Verbose
+        }
+
         Public Sub New(serviceProvider As IServiceProvider)
             MyBase.New()
 
@@ -27,11 +33,12 @@ Namespace Microsoft.VisualStudio.Editors.OptionPages
 
             binding = New Binding() With {
                     .Source = _generalOptions,
-                    .Path = New Windows.PropertyPath(NameOf(GeneralOptions.VerboseFastUpToDateLogging)),
-                    .UpdateSourceTrigger = UpdateSourceTrigger.Explicit
+                    .Path = New Windows.PropertyPath(NameOf(GeneralOptions.FastUpToDateLogLevel)),
+                    .UpdateSourceTrigger = UpdateSourceTrigger.Explicit,
+                    .Converter = LoggingLevelToInt32Converter.Instance
                     }
 
-            bindingExpression = VerboseFastUpToDateLogging.SetBinding(CheckBox.IsCheckedProperty, binding)
+            bindingExpression = FastUpToDateLogLevel.SetBinding(ComboBox.SelectedIndexProperty, binding)
             AddBinding(bindingExpression)
         End Sub
     End Class

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.cs.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.de.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.es.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.fr.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.it.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.ja.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.ko.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.pl.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.pt-BR.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.resx

@@ -120,7 +120,19 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
+  <data name="General_FastUpToDateCheck_LogLevel" xml:space="preserve">
+    <value>Logging Level:</value>
+  </data>
+  <data name="General_FastUpToDateCheck_LogLevel_Info" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="General_FastUpToDateCheck_LogLevel_None" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="General_FastUpToDateCheck_LogLevel_Verbose" xml:space="preserve">
+    <value>Verbose</value>
+  </data>
+  <data name="General_FastUpToDateCheck_Title" xml:space="preserve">
+    <value>Up to Date Checks</value>
   </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.ru.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.tr.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.zh-Hans.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptionPageResources.zh-Hant.resx

@@ -120,7 +120,4 @@
   <data name="General_FastUpToDateCheck" xml:space="preserve">
     <value>Don't call MSBuild if a project appears to be up to date.</value>
   </data>
-  <data name="General_VerboseFastUpToDateLogging" xml:space="preserve">
-    <value>Log diagnostic information for project up to date checks to the output window.</value>
-  </data>
 </root>

src/Microsoft.VisualStudio.Editors/OptionPages/GeneralOptions.vb

@@ -10,7 +10,7 @@ Namespace Microsoft.VisualStudio.Editors.OptionPages
         End Class
 
         Private Const FastUpToDateEnabledSettingKey As String = "ManagedProjectSystem\FastUpToDateCheckEnabled"
-        Private Const VerboseFastUpToDateLoggingSettingKey As String = "ManagedProjectSystem\VerboseFastUpToDateLogging"
+        Private Const FastUpToDateLogLevelSettingKey As String = "ManagedProjectSystem\FastUpToDateLogLevel"
 
         Private ReadOnly _settingsManager As ISettingsManager
 
@@ -23,12 +23,12 @@ Namespace Microsoft.VisualStudio.Editors.OptionPages
             End Set
         End Property
 
-        Public Property VerboseFastUpToDateLogging As Boolean
+        Public Property FastUpToDateLogLevel As LogLevel
             Get
-                Return If(_settingsManager?.GetValueOrDefault(VerboseFastUpToDateLoggingSettingKey, False), False)
+                Return If(_settingsManager?.GetValueOrDefault(FastUpToDateLogLevelSettingKey, LogLevel.None), LogLevel.None)
             End Get
             Set
-                _settingsManager.SetValueAsync(VerboseFastUpToDateLoggingSettingKey, Value, isMachineLocal:=False)
+                _settingsManager.SetValueAsync(FastUpToDateLogLevelSettingKey, Value, isMachineLocal:=False)
             End Set
         End Property
 

src/Microsoft.VisualStudio.Editors/OptionPages/LogLevel.vb

@@ -0,0 +1,7 @@
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+Public Enum LogLevel
+    None
+    Info
+    Verbose
+End Enum

src/Microsoft.VisualStudio.Editors/OptionPages/LoggingLevelToInt32Converter.vb

@@ -0,0 +1,36 @@
+' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+Imports System.Globalization
+Imports System.Windows.Data
+
+Namespace Microsoft.VisualStudio.Editors.OptionPages
+    Friend NotInheritable Class LoggingLevelToInt32Converter
+        Implements IValueConverter
+
+        Private Shared ReadOnly _instance As New LoggingLevelToInt32Converter()
+
+        Public Shared ReadOnly Property Instance As LoggingLevelToInt32Converter
+            Get
+                Return _instance
+            End Get
+        End Property
+
+        Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.Convert
+            Debug.Assert(value IsNot Nothing)
+            Debug.Assert(TypeOf value Is LogLevel)
+            Debug.Assert([Enum].IsDefined(GetType(LogLevel), value))
+            Debug.Assert(targetType = GetType(Integer))
+
+            Return CInt(CType(value, LogLevel))
+        End Function
+
+        Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As CultureInfo) As Object Implements IValueConverter.ConvertBack
+            Debug.Assert(value IsNot Nothing)
+            Debug.Assert(TypeOf value Is Integer)
+            Debug.Assert(CInt(value) >= 0 AndAlso CInt(value) < [Enum].GetValues(GetType(LogLevel)).Length)
+            Debug.Assert(targetType = GetType(LogLevel))
+
+            Return CType(CInt(value), LogLevel)
+        End Function
+    End Class
+End Namespace

src/Microsoft.VisualStudio.Editors/OptionPages/OptionPageControl.vb

@@ -22,6 +22,17 @@ Namespace Microsoft.VisualStudio.Editors.OptionPages
             checkBoxStyle.Setters.Add(New Setter(ForegroundProperty, New DynamicResourceExtension(SystemColors.WindowTextBrushKey)))
             checkBoxStyle.Setters.Add(New Setter(MarginProperty, New Thickness(left:=0, top:=7, right:=0, bottom:=7)))
             Resources.Add(GetType(CheckBox), checkBoxStyle)
+
+            Dim comboBoxStyle = New Style(GetType(ComboBox))
+            comboBoxStyle.Setters.Add(New Setter(ForegroundProperty, New DynamicResourceExtension(SystemColors.WindowTextBrushKey)))
+            comboBoxStyle.Setters.Add(New Setter(MarginProperty, New Thickness(left:=0, top:=7, right:=0, bottom:=7)))
+            Resources.Add(GetType(ComboBox), comboBoxStyle)
+
+            Dim groupBoxStyle = New Style(GetType(GroupBox))
+            groupBoxStyle.Setters.Add(New Setter(ForegroundProperty, New DynamicResourceExtension(SystemColors.WindowTextBrushKey)))
+            groupBoxStyle.Setters.Add(New Setter(MarginProperty, New Thickness(left:=0, top:=0, right:=0, bottom:=3)))
+            groupBoxStyle.Setters.Add(New Setter(PaddingProperty, New Thickness(left:=7, top:=7, right:=7, bottom:=0)))
+            Resources.Add(GetType(GroupBox), groupBoxStyle)
         End Sub
 
         Protected Sub AddBinding(bindingExpression As BindingExpressionBase)

src/Microsoft.VisualStudio.Editors/OptionPages/xlf/GeneralOptionPageResources.cs.xlf

@@ -8,11 +8,6 @@
         <target state="new">Don't call MSBuild if a project appears to be up to date.</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="General_VerboseFastUpToDateLogging">
-        <source>Log diagnostic information for project up to date checks to the output window.</source>
-        <target state="new">Log diagnostic information for project up to date checks to the output window.</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.VisualStudio.Editors/OptionPages/xlf/GeneralOptionPageResources.de.xlf

@@ -8,11 +8,6 @@
         <target state="new">Don't call MSBuild if a project appears to be up to date.</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="General_VerboseFastUpToDateLogging">
-        <source>Log diagnostic information for project up to date checks to the output window.</source>
-        <target state="new">Log diagnostic information for project up to date checks to the output window.</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.VisualStudio.Editors/OptionPages/xlf/GeneralOptionPageResources.es.xlf

@@ -8,11 +8,6 @@
         <target state="new">Don't call MSBuild if a project appears to be up to date.</target>
         <note></note>
       </trans-unit>
-      <trans-unit id="General_VerboseFastUpToDateLogging">
-        <source>Log diagnostic information for project up to date checks to the output window.</source>
-        <target state="new">Log diagnostic information for project up to date checks to the output window.</target>
-        <note></note>
-      </trans-unit>
     </body>
   </file>
 </xliff>