diff --git a/Test/UnitTests/BehaviorUtilities.cs b/Test/UnitTests/BehaviorUtilities.cs index 2bb00d8..3202940 100644 --- a/Test/UnitTests/BehaviorUtilities.cs +++ b/Test/UnitTests/BehaviorUtilities.cs @@ -168,8 +168,10 @@ public override void Fail(string message) } #endregion +#if !NETCOREAPP private TraceListener[] storedListeners; - private DebugTraceListener debugTraceListener; +#endif + private DebugTraceListener debugTraceListener = new DebugTraceListener(); public List Messages { @@ -205,4 +207,4 @@ public void Dispose() #endregion } -} \ No newline at end of file +} diff --git a/src/Microsoft.Xaml.Behaviors/Core/ExtendedVisualStateManager.cs b/src/Microsoft.Xaml.Behaviors/Core/ExtendedVisualStateManager.cs index cbb912b..80b394a 100644 --- a/src/Microsoft.Xaml.Behaviors/Core/ExtendedVisualStateManager.cs +++ b/src/Microsoft.Xaml.Behaviors/Core/ExtendedVisualStateManager.cs @@ -779,6 +779,7 @@ private static Storyboard ExtractLayoutStoryboard(VisualState state) /// Subsequent code will check these rectangles both before and after the layout change. /// /// The control whose layout is changing state. + /// The template root. /// The storyboard containing the layout changes. /// Any previous values from previous state navigations that might be reverted. /// The set of elements currently in motion, if there is a state change transition ongoing. @@ -1014,8 +1015,10 @@ internal static Rect GetLayoutRect(FrameworkElement element) /// Get the opacities of elements at the time of the state change, instead of visibilities, because the state change may be in process and the current value is the most important. /// /// The control whose state is changing. + /// The template root. /// The storyboard with the layout properties. /// The set of original values. + /// The elements currently in motion /// private static Dictionary GetOldOpacities(FrameworkElement control, FrameworkElement templateRoot, Storyboard layoutStoryboard, List originalValueRecords, List movingElements) { @@ -1078,6 +1081,7 @@ private static Dictionary GetOldOpacities(FrameworkEle /// All values that are overwritten will be stored in the collection of OriginalValueRecords so that they can be replaced later. /// /// The control whose state is changing. + /// The template root. /// The Storyboard holding the layout properties. /// The store of original values. [SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "This is done in a single pass for performance reasons.")] @@ -1186,6 +1190,8 @@ private static object GetValueFromTimeline(Timeline timeline, out bool gotValue) /// they do not affect their sibling elements. /// /// The set of elements that will be moving. + /// The old Rect. + /// The new Rect. private static void WrapMovingElementsInCanvases(List movingElements, Dictionary oldRects, Dictionary newRects) { foreach (FrameworkElement movedElement in movingElements) @@ -1286,6 +1292,7 @@ private static void UnwrapMovingElementsFromCanvases(List movi /// /// The source of the layout properties. /// The destination of the layout properties. + /// A flag to indicate if a restore is occuring. private static void CopyLayoutProperties(FrameworkElement source, FrameworkElement target, bool restoring) { WrapperCanvas parentCanvas = (restoring ? source : target) as WrapperCanvas; @@ -1339,8 +1346,7 @@ private static void CopyLayoutProperties(FrameworkElement source, FrameworkEleme /// /// Create the actual Storyboard that will be used to animate the transition. Use all previously calculated results. /// - /// The duration of the animation. - /// The easing function to be used in the animation. + /// The transition. /// The set of elements that will be moving. /// The old opacities of the elements whose visibility properties are changing. /// The Storyboard. diff --git a/src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj b/src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj index 4eb3d52..2197520 100644 --- a/src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj +++ b/src/Microsoft.Xaml.Behaviors/Microsoft.Xaml.Behaviors.csproj @@ -23,29 +23,11 @@ WPF;$(DefineConstants) true $(GenerateNuspecDependsOn);TimestampNugetPackage - - - 1701;1702; + 1701;1702;1591 - - - - - - - False - - - False - - - False - - - Code @@ -73,10 +55,6 @@ - - - -