Update Reference Sources to .NET Framework 4.6.1

SMDiagnostics/System/ServiceModel/Diagnostics/Utility.cs

@@ -28,7 +28,7 @@ internal Utility(ExceptionUtility exceptionUtility)
         [SuppressMessage(FxCop.Category.Security, FxCop.Rule.TransparentMethodsMustNotReferenceCriticalCode)] // we got APTCA approval with no requirement to fix this transparency warning
         internal static void CloseInvalidOutSafeHandle(SafeHandle handle)
         {
-            // Workaround for 64-bit CLR 
+            // Workaround for 64-bit CLR bug VSWhidbey 546830 - sometimes invalid SafeHandles come back null.
             if (handle != null)
             {
 #pragma warning disable 618

System.Activities.Presentation/System.Activities.Core.Presentation/AssemblyInfo.cs → System.Activities.Core.Presentation/AssemblyInfo.cs

@@ -2,4 +2,4 @@
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: InternalsVisibleTo("CIT.System.Activities.Core.Design, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-[assembly: SuppressMessage("Microsoft.MSInternal", "CA904:DeclareTypesInMicrosoftOrSystemNamespace", Scope = "namespace", Target = "XamlGeneratedNamespace", Justification = "Xaml Generated")]
+[assembly: SuppressMessage("Microsoft.MSInternal", "CA904:DeclareTypesInMicrosoftOrSystemNamespace", Scope = "namespace", Target = "XamlGeneratedNamespace", Justification = "Xaml Generated")]

System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FinalState.cs → System.Activities.Core.Presentation/System/Activities/Core/Presentation/FinalState.cs

@@ -12,4 +12,4 @@ namespace System.Activities.Core.Presentation
     public sealed class FinalState
     {
     }
-}
+}

System.Activities.DurableInstancing/System/Activities/DurableInstancing/SqlCommandAsyncResult.cs

@@ -35,6 +35,8 @@ sealed class SqlCommandAsyncResult : TransactedAsyncResult
                 new RetryErrorCode(10054, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // Severed tcp connection drawn from the pool
                 new RetryErrorCode(10060, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // The server was not found or was not accessible. 
                 new RetryErrorCode(10061, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Server not started
+                new RetryErrorCode(10928, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - The limit for the database resource has been reached.
+                new RetryErrorCode(10929, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - The server is currently too busy to support requests up to the maximum limit.
                 new RetryErrorCode(40143, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - server encountered error processing the request.
                 new RetryErrorCode(40197, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - server encountered error processing the request.
                 new RetryErrorCode(40501, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - server is currently busy.
@@ -116,7 +118,7 @@ static void StartCommandCallback(object state)
             SqlCommandAsyncResult thisPtr = (SqlCommandAsyncResult) state;
             try
             {
-                // this can throw on the sync path - we need to signal the callback
+                // this can throw on the [....] path - we need to signal the callback
                 thisPtr.StartCommandInternal(false);
             }
             catch (Exception e)
@@ -169,7 +171,7 @@ bool CompleteExecuteReader(IAsyncResult result)
                     this.sqlCommand.Connection.Close();
                 }
 
-                // If we completed sync then any retry is done by the original caller.
+                // If we completed [....] then any retry is done by the original caller.
                 if (!result.CompletedSynchronously)
                 {
                     if (this.CheckRetryCountAndTimer() && ShouldRetryForSqlError(exception.Number, RetryErrorOptions.RetryOnEnd))

System.Activities.Presentation/Microsoft.Tools.Common/Microsoft/Activities/Presentation/Xaml/XamlWriterExtensions.cs

@@ -26,7 +26,7 @@ public static void PropagateLineInfo(XamlWriter targetWriter, int lineNumber, in
             consumer.SetLineInfo(lineNumber, linePosition);
         }
 
-        // This method is a workaround for TFS 
+        // This method is a workaround for TFS bug #788190, since XamlReader.ReadSubtree() should (but doesn't) preserve IXamlLineInfo on the subreader
         public static void Transform(XamlReader reader, XamlWriter writer, IXamlLineInfo readerLineInfo, bool closeWriter)
         {
             IXamlLineInfoConsumer consumer = writer as IXamlLineInfoConsumer;

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Annotations/NotifyArgumentVariableAnnotationTextChanged.cs

@@ -10,7 +10,7 @@ namespace System.Activities.Presentation.Annotations
     using System.Activities.Presentation.Model;
     using System.Activities.Presentation.View;
 
-    // This is to workaround a 
+    // This is to workaround a bug that updating ModelItem from outside of ArgumentDesigner/VariableDesigner will not update it.
     internal class NotifyArgumentVariableAnnotationTextChanged : Change
     {
         public ArgumentDesigner ArgumentDesigner { get; set; }

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/CategoryList.cs

@@ -582,7 +582,7 @@ protected override void OnIsKeyboardFocusWithinChanged(DependencyPropertyChanged
 
             if (hasKeyboardFocus) 
             {
-                // We just gained keyboard focus.  Make sure we sync up the current property selection
+                // We just gained keyboard focus.  Make sure we [....] up the current property selection
                 // with the keyboard focus, so that navigation works.
                 SynchronizeSelectionFocus(StealFocusMode.OnlyIfCurrentSelectionDoesNotHaveFocusWithin);
             }

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/EditModeSwitchButtonKeyboardFix.cs

@@ -15,21 +15,21 @@ namespace System.Activities.Presentation.Internal.PropertyEditing
     using System.Activities.Presentation;
 
     // <summary>
-    // This is a fix for a 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    // This is a fix for a bug in EditModeSwitchButton which lives in System.Activities.Presentation and
+    // which has already been locked as an assembly.  EditModeSwitchButton only responds to MouseDown
+    // events to make sure that the opening of the popup extended editor works correctly.  However,
+    // that means that it will never respond to keyboard or automation events.  To fix it, this class
+    // offers up an attached DP that, when used, hooks into events offered by EditModeSwitchButton
+    // to correct this issue and still have the button do the right thing even if mouse is not involved
+    // in invoking the button.
+    //
+    // This class is associated with every instance of EditModeSwitchButton using a setter in the
+    // EditModeSwitchButton style:
+    //
+    //   &lt;Style TargetType="{x:Type PropertyEditing:EditModeSwitchButton}" BasedOn="{StaticResource {x:Type Button}}"&gt;
+    //     ...
+    //     &lt;Setter Property="Internal:EditModeSwitchButtonKeyboardFix.ApplyFix" Value="True" /&gt;
+    // </summary>
 
     class EditModeSwitchButtonKeyboardFix 
     {

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/Editors/EditorUtilities.cs

@@ -24,15 +24,15 @@ internal static class EditorUtilities
         // That information if both returned and cached for future reference.
         //
         // NOTE: This method does not handle structs correctly because it will return FALSE
-        // for struct types, which is incorrect.  However, this 
-
-
-
-
-
-
-
-
+        // for struct types, which is incorrect.  However, this bug has its counter-part in
+        // System.Activities.Presentation.dll where the default NewItemFactory only instantiates
+        // non-struct classes.  Both of these need to be fixed at the same time because
+        // they are used in conjunction.  However, MWD is currently locked.
+        //
+        // </summary>
+        // <param name="type">Type to verify</param>
+        // <returns>True if the specified type is concrete and has a default constructor,
+        // false otherwise.</returns>
         public static bool IsConcreteWithDefaultCtor(Type type) 
         {
 

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/ExtensibilityAccessor.cs

@@ -711,7 +711,7 @@ public static bool IsEditorReusable(IEnumerable<ModelProperty> properties)
 
         // Hack to deal with {x:Static ...} extensions.  The Cider Markup code currently
         // replaces all StaticExtensions with internal versions of the same class.
-        // Once 
+        // Once bug 100647 is fixed this code can go away.
         private static bool IsStaticExtension(Type type) 
         {
             return type != null && (

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/Controls/WorkaroundPopup.cs

@@ -13,14 +13,14 @@ namespace System.Activities.Presentation.Internal.PropertyEditing.FromExpression
 
     // <summary>
     // This class contains specific behavior for the Popup associated with PropertyContainer.
-    // Basically, it is a workaround for Windows OS 
-
-
-
-
-
-
-
+    // Basically, it is a workaround for Windows OS bug #1745919.  The "StaysOpen = false" setting
+    // on a Popup does not function as we expect when the Popup is created within another
+    // "StaysOpen = false" popup (or if anything has capture).  What happens is the Popup first
+    // checks if anything has capture, and only takes capture if nothing else has taken it.  But the
+    // StaysOpen behavior is implemented using the capture, so we lose that.  Also, related to that
+    // the Closed event will not be called, so to workaround both of those issues we essentially
+    // re-implement the popup capture grabbing code, except we take capture no matter what.
+    // </summary>
     internal class WorkaroundPopup : Popup
     {
         private bool releasingCapture = false;

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/CategoryContainer.xaml.cs

@@ -54,11 +54,11 @@ internal partial class CategoryContainer : ContentControl
         // Data for managing expanded state based on a filter.
         private FilterState filterIsEmpty = FilterState.Unknown;
 
-        // garylins 11/15/2006 - This variable has been added to fix 
-
-
-
-
+        // garylins 11/15/2006 - This variable has been added to fix bug 29740.  The real fix is to find
+        // a way to update CategoryContainers expansion state when the Category changes.  The bug comes about
+        // because when UpdateFilter is called from the PI, it fires the FilterUpdated event.  At this time
+        // the CategoryContainer is not yet built out, so it hasn't hooked up to listen to the event and hence
+        // never gets it's filter state related variables updated.
         private bool haveCachedExpanded = false;
         private bool wasAdvancedPinnedBeforeFilter = false;
         private bool wasExpandedBeforeFilter = true;
@@ -375,7 +375,7 @@ private static object CoerceShowAdvancedHeader(DependencyObject d, object value)
                 // ###################################################
 
                 // Bugfix: this condition used to reference editor.Category.AdvancedProperties.Count instead of
-                // editor.unconsumedAdvancedProperties, which is a 
+                // editor.unconsumedAdvancedProperties, which is a bug.
                 if ((editor.unconsumedAdvancedProperties.Count <= 0 && editor.advancedCategoryEditors.Count == 0) || !editor.AdvancedPropertyMatchesFilter)
 
                 // ###################################################
@@ -518,8 +518,8 @@ private void UpdateUnconsumedProperties(CategoryEditor newEditor, ObservableColl
         // CIDER-SPECIFIC CHANGE IN NEED OF PORTING - BEGIN
         // ###################################################
 
-        // This change is a result of 
-
+        // This change is a result of bug 88870.  Blend has this issue
+        // as well and will need to address it soon.
 
         // Original code:
 

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/PropertyContainerPopupHelper.cs

@@ -21,7 +21,7 @@ namespace System.Activities.Presentation.Internal.PropertyEditing.FromExpression
     internal class PropertyContainerPopup : WorkaroundPopup
     {
         // these events allow Acrylic to implement its workaround for Avalon/MFC interop
-        // focus issues (WinOS 
+        // focus issues (WinOS bug # 1713206)
         public static readonly RoutedCommand OnBeginExtendedEdit = new RoutedCommand("OnBeginExtendedEdit", typeof(PropertyContainerPopup));
         public static readonly RoutedCommand OnEndExtendedEdit = new RoutedCommand("OnEndExtendedEdit", typeof(PropertyContainerPopup));
 
@@ -52,10 +52,10 @@ protected override void OnClosed(EventArgs e)
                 DependencyObject potentialDescendant = Mouse.Captured as DependencyObject;
                 if (potentialDescendant != null && owningPropertyContainer.IsAncestorOf(potentialDescendant))
                 {
-                    // v1 38479: This is a mitigation for Windows OS 
-
-
-
+                    // v1 38479: This is a mitigation for Windows OS Bug 1965872.
+                    // Here we force any control which has capture to lose it, though
+                    // this situation can occur in other cases (e.g. via extensibility) but this covers the most
+                    // common cases and is a safe fix.
                     Mouse.Capture(null);
                 }
 

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/ValueEditors/ChoiceEditor.cs

@@ -70,7 +70,7 @@ internal class ChoiceEditor : Control, INotifyPropertyChanged, IIconProvider
 
         public static readonly DependencyProperty ComboBoxLoadingCursorProperty = DependencyProperty.Register("ComboBoxLoadingCursor", typeof(Cursor), typeof(ChoiceEditor), new PropertyMetadata(null));
 
-        // WORKAROUND this property is used in combination with a trigger to kick the combobox when it clears its bindings Avalon 
+        // WORKAROUND this property is used in combination with a trigger to kick the combobox when it clears its bindings Avalon bug: 1756023
         public static readonly DependencyProperty ForceBindingProperty = DependencyProperty.Register("ForceBinding", typeof(bool), typeof(ChoiceEditor), new FrameworkPropertyMetadata(false));
 
 
@@ -924,15 +924,15 @@ protected override void OnRender(DrawingContext drawingContext)
         protected override void OnTemplateChanged(ControlTemplate oldTemplate, ControlTemplate newTemplate)
         {
             this.BeginNoCommitInternalValueChangeBlock();
-            // WORKAROUND Turn off bindings on the internal combo while the template is udpating. This works around Avalon 
+            // WORKAROUND Turn off bindings on the internal combo while the template is udpating. This works around Avalon bug: 1756023
             this.ForceBinding = false;
             base.OnTemplateChanged(oldTemplate, newTemplate);
         }
 
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-            // WORKAROUND Force the bindings on our internal combo (if there is one) to update. This works around Avalon 
+            // WORKAROUND Force the bindings on our internal combo (if there is one) to update. This works around Avalon bug: 1756023
             this.ForceBinding = true;
 
             this.EndNoCommitInternalValueChangeBlock();
@@ -992,7 +992,7 @@ private void OnFinishEditing()
 
         private void ItemsSourceChanged()
         {
-            // The collection just changed, so we need to make sure that things are in sync
+            // The collection just changed, so we need to make sure that things are in [....]
 
             // ###################################################
             // CIDER-SPECIFIC CHANGE IN NEED OF PORTING - BEGIN
@@ -1131,7 +1131,7 @@ protected bool UpdateValueFromInternalValues()
 
                             this.Value = newValue;
 
-                            // At this point it is possible that the value that we just set is out of sync with the internal value
+                            // At this point it is possible that the value that we just set is out of [....] with the internal value
                             if (newValue != this.InternalValue)
                             {
                                 this.UpdateInternalValuesFromValue();

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/PropertyValueDialogHost.cs

@@ -22,7 +22,7 @@ namespace System.Activities.Presentation.Internal.PropertyEditing
     using Microsoft.Win32;
 
     // <summary>
-    // Helper class that is responsible for opening a Microsoft Form that hosts the WPF
+    // Helper class that is responsible for opening a [....] Form that hosts the WPF
     // PropertyValueDialogControl that ultimately hosts a DialogPropertyValueEditor.
     // Both PropertyInspector control as well as PropertyValueDialogControl use this class.
     // </summary>
@@ -71,7 +71,7 @@ public void OnCanOpenDialogWindow(object sender, CanExecuteRoutedEventArgs e)
 
         // <summary>
         // Called in response to OpenDialogWindow command firing. The method opens a
-        // Microsoft Form that contains an ElementHost that, in turn, contains
+        // [....] Form that contains an ElementHost that, in turn, contains
         // PropertyValueDialogControl.
         // </summary>
         // <param name="sender"></param>

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/VisualTreeUtils.cs

@@ -22,7 +22,7 @@ internal static class VisualTreeUtils
         private const int MaxSearchDepth = 5;
 
         // The maxium wpf visual tree depth
-        // this value should be kept in sync with WPF's limit
+        // this value should be kept in [....] with WPF's limit
         private const int MaxAllowedTreeDepth = 250;
 
         // <summary>

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Metadata/MetadataStore.cs

@@ -288,17 +288,17 @@ private static Attribute[] GetRawAttributes(Type objectType, string member, Memb
                 Fx.Assert(objectType != null, "objectType parameter should not be null");
                 Type reflectType = TypeDescriptor.GetReflectionType(objectType);
 
-                // There is a 
-
-
-
-
-
-
-
-
-
-
+                // There is a bug in CLR reflection that does not respect the "inherit"
+                // flag for event or property infos.  Our custom metadata type does respect
+                // this flag and correctly does the right thing.  If the object type we
+                // are passed is not a metadata type, just use the default behavior of the
+                // parent member descriptor.  It will be right, and since we're not a metadata
+                // type that means we have no overrides anyway.
+                //
+                // The reason we have to call our type with inherit, instead of just using
+                // one code path is we need to support the interleaving of CLR and 
+                // metadata table attributes up the inheritance hierarchy.  MetadataType 
+                // does that for us.
 
                 if (parentDescriptor != null && !(reflectType is MetadataType))
                 {

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/PropertyEditing/EditModeSwitchButton.cs

@@ -61,7 +61,7 @@ private static object OnCoerceEditModeProperty(DependencyObject obj, object valu
 
             EditModeSwitchButton theThis = (EditModeSwitchButton) obj;
 
-            // Sync to the owning PropertyContainer only if requested to do so
+            // [....] to the owning PropertyContainer only if requested to do so
             if (!theThis.SyncModeToOwningContainer)
                 return value;
 

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/CachedResourceDictionaryExtension.cs

@@ -21,7 +21,7 @@ public class CachedResourceDictionaryExtension : MarkupExtension
         public override object ProvideValue(IServiceProvider serviceProvider)
         {
             ResourceDictionary resourceDictionary = null;
-            // disable caching till the wpf mergedictionaries in theme dictionary 
+            // disable caching till the wpf mergedictionaries in theme dictionary bug is fixed.
             if (!Cache.TryGetValue(this.Source, out resourceDictionary))
             {
                 resourceDictionary = new ResourceDictionary();

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Hosting/WindowHelperService.cs

@@ -159,7 +159,7 @@ void HookupMessageProcessing()
                 {
                     this.hwndSource = HwndSource.FromHwnd(this.ParentWindowHwnd);
                 }
-                //if didn't succeed - (either handle is null or we are hosted in Microsoft app)
+                //if didn't succeed - (either handle is null or we are hosted in [....] app)
                 //try to create hwnd source out of designer's view 
                 if (null == this.hwndSource)
                 {