Update Reference Sources to .NET Framework 4.6

SMDiagnostics/System/ServiceModel/Diagnostics/EventLogCategory.cs

@@ -4,8 +4,8 @@
 
 namespace System.ServiceModel.Diagnostics
 {
-    // 
-
+    // FUTURE: This class is kept so that 4.0 Extended SKU runs fine on 4.5 Client. Will remove this in the future.
+    // Order is important here. The order must match the order of strings in ..\EventLog\EventLog.mc
     [Obsolete("This has been replaced by System.Runtime.Diagnostics.EventLogCategory")]
     enum EventLogCategory : ushort
     {
@@ -25,4 +25,4 @@ enum EventLogCategory : ushort
         ListenerAdapter
     }
 
-}
+}

SMDiagnostics/System/ServiceModel/Diagnostics/EventLogEventId.cs

@@ -4,8 +4,8 @@
 
 namespace System.ServiceModel.Diagnostics
 {
-    // 
-
+    // FUTURE: This class is kept so that 4.0 Extended SKU runs fine on 4.5 Client. Will remove this in the future.
+    // Order is important here. The order must match the order of strings in ..\EventLog\EventLog.mc
     [Obsolete("This has been replaced by System.Runtime.Diagnostics.EventLogEventId")]
     enum EventLogEventId : uint
     {

SMDiagnostics/System/ServiceModel/Diagnostics/NativeMethods.cs

@@ -19,4 +19,4 @@ static class NativeMethods
         [SecurityCritical]
         internal static extern SafeEventLogWriteHandle RegisterEventSource(string uncServerName, string sourceName);
     }
-}
+}

SMDiagnostics/System/ServiceModel/Diagnostics/TraceSourceKind.cs

@@ -9,4 +9,4 @@ enum TraceSourceKind
         DiagnosticTraceSource,
         PiiTraceSource
     }
-}
+}

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 bug VSWhidbey 546830 - sometimes invalid SafeHandles come back null.
+            // Workaround for 64-bit CLR 
             if (handle != null)
             {
 #pragma warning disable 618

System.Activities.DurableInstancing/AssemblyInfo.cs

@@ -27,4 +27,4 @@
 // by using the '*' as shown below:
 // Friend assemblies
 
-// Partial Trust :
+// Partial Trust :

System.Activities.DurableInstancing/System/Activities/DurableInstancing/InstanceCompletionAction.cs

@@ -9,4 +9,4 @@ public enum InstanceCompletionAction
         DeleteNothing = 0,
         DeleteAll
     };
-}
+}

System.Activities.DurableInstancing/System/Activities/DurableInstancing/InstanceEncodingOption.cs

@@ -9,4 +9,4 @@ public enum InstanceEncodingOption
         None = 0,
         GZip
     };
-}
+}

System.Activities.DurableInstancing/System/Activities/DurableInstancing/LoadType.cs

@@ -11,4 +11,4 @@ enum LoadType
         LoadByKey = 2,
         LoadByInstance = 3
     }
-}
+}

System.Activities.DurableInstancing/System/Activities/DurableInstancing/PrimitiveType.cs

@@ -30,4 +30,4 @@ enum PrimitiveType
         XmlQualifiedName,
         Unavailable = 99
     }
-}
+}

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

@@ -116,7 +116,7 @@ static void StartCommandCallback(object state)
             SqlCommandAsyncResult thisPtr = (SqlCommandAsyncResult) state;
             try
             {
-                // this can throw on the [....] path - we need to signal the callback
+                // this can throw on the sync path - we need to signal the callback
                 thisPtr.StartCommandInternal(false);
             }
             catch (Exception e)
@@ -169,7 +169,7 @@ bool CompleteExecuteReader(IAsyncResult result)
                     this.sqlCommand.Connection.Close();
                 }
 
-                // If we completed [....] then any retry is done by the original caller.
+                // If we completed sync then any retry is done by the original caller.
                 if (!result.CompletedSynchronously)
                 {
                     if (this.CheckRetryCountAndTimer() && ShouldRetryForSqlError(exception.Number, RetryErrorOptions.RetryOnEnd))

System.Activities.DurableInstancing/System/Activities/DurableInstancing/SuspensionStateChange.cs

@@ -10,4 +10,4 @@ enum SuspensionStateChange
         SuspendInstance = 1,
         UnsuspendInstance = 2
     };
-}
+}

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

@@ -12,4 +12,4 @@ internal enum XamlTypeKind
         PartialSupported, // I understand this type if you would like to remove some new properties
         FullySupported, // I understand this type
     }
-}
+}

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 bug #788190, since XamlReader.ReadSubtree() should (but doesn't) preserve IXamlLineInfo on the subreader
+        // This method is a workaround for TFS 
         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/AdornerLocation.cs

@@ -14,4 +14,4 @@ internal enum AdornerLocation
         TopLeft,
         BottomLeft
     }
-}
+}

System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Annotations/IDockedAnnotation.cs

@@ -24,4 +24,4 @@ Visibility Visibility
 
         void FocusOnContent();
     }
-}
+}

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 bug that updating ModelItem from outside of ArgumentDesigner/VariableDesigner will not update it.
+    // This is to workaround a 
     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 [....] up the current property selection
+                // We just gained keyboard focus.  Make sure we sync 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 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>
+    // This is a fix for a 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     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 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>
+        // for struct types, which is incorrect.  However, this 
+
+
+
+
+
+
+
+
         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 bug 100647 is fixed this code can go away.
+        // Once 
         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 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>
+    // Basically, it is a workaround for Windows OS 
+
+
+
+
+
+
+
     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 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.
+        // garylins 11/15/2006 - This variable has been added to fix 
+
+
+
+
         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 bug.
+                // editor.unconsumedAdvancedProperties, which is a 
                 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 bug 88870.  Blend has this issue
-        // as well and will need to address it soon.
+        // This change is a result of 
+
 
         // Original code:
 

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

@@ -0,0 +1,40 @@
+
+
+// -------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation. All Rights Reserved.
+// -------------------------------------------------------------------
+//From \\authoring\Sparkle\Source\1.0.1083.0\Common\Source\Framework\Properties
+namespace System.Activities.Presentation.Internal.PropertyEditing.FromExpression.Framework.PropertyInspector
+{
+    using System;
+    using System.Windows;
+    using System.Windows.Input;
+
+
+    // <summary>
+    // Standard commands and command implementations used by PropertyContainer templates
+    // and implemented by property editing hosts
+    // </summary>
+    internal static class CategoryContainerCommands
+    {
+        private static readonly RoutedCommand togglePinAdvancedProperties = new RoutedCommand("TogglePinAdvancedProperties", typeof(CategoryContainerCommands));
+        private static readonly RoutedCommand updateCategoryExpansionState = new RoutedCommand("UpdateCategoryExpansionState", typeof(CategoryContainerCommands));
+
+        // <summary>
+        // standard command to category edit host to togglePinAdvancedProperties
+        // </summary>
+        public static RoutedCommand TogglePinAdvancedProperties
+        {
+            get { return CategoryContainerCommands.togglePinAdvancedProperties; }
+        }
+
+        // <summary>
+        // standard command to property edit host to updateCategoryExpansionState
+        // </summary>
+        public static RoutedCommand UpdateCategoryExpansionState
+        {
+            get { return CategoryContainerCommands.updateCategoryExpansionState; }
+        }
+
+    }
+}