diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeRenderer.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeRenderer.cs index b4ca0419db5..d7e7e931292 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeRenderer.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Ink/StrokeRenderer.cs @@ -317,7 +317,7 @@ internal static void CalcGeometryAndBounds(StrokeNodeIterator iterator, // | |----| | // |------------| // - prevPrevStrokeNode = iterator[index - 1, prevPrevStrokeNode.Index - 1]; ; + prevPrevStrokeNode = iterator[index - 1, prevPrevStrokeNode.Index - 1]; prevPrevStrokeNodeBounds = Rect.Union(prevStrokeNodeBounds, prevPrevStrokeNodeBounds); // at this point prevPrevStrokeNodeBounds already contains this node diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGestureConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGestureConverter.cs index 65c7343d2aa..f3cada1b257 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGestureConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Command/MouseGestureConverter.cs @@ -63,7 +63,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c string modifiersToken; if (fullName.Length == 0) - return new MouseGesture(MouseAction.None, ModifierKeys.None); ; + return new MouseGesture(MouseAction.None, ModifierKeys.None); // break apart LocalName and Prefix int Offset = fullName.LastIndexOf(MODIFIERS_DELIMITER); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs index 5f73a2da58a..b7db48e5a8d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs @@ -33,7 +33,7 @@ internal WispLogic(InputManager inputManager) { Statistics.FeaturesUsed |= StylusTraceLogger.FeatureFlags.WispStackEnabled; - _inputManager = new SecurityCriticalData(inputManager); ; + _inputManager = new SecurityCriticalData(inputManager); _inputManager.Value.PreProcessInput += new PreProcessInputEventHandler(PreProcessInput); _inputManager.Value.PreNotifyInput += new NotifyInputEventHandler(PreNotifyInput); _inputManager.Value.PostProcessInput += new ProcessInputEventHandler(PostProcessInput); @@ -885,7 +885,7 @@ private void PreProcessInput(object sender, PreProcessInputEventArgs e) else if (input.Report.Type == InputType.Stylus) { RawStylusInputReport stylusInputReport = (RawStylusInputReport)input.Report; - WispStylusDevice stylusDevice = stylusInputReport?.StylusDevice?.As(); ; // RTI sets this if it finds StylusDevice based on Id. + WispStylusDevice stylusDevice = stylusInputReport?.StylusDevice?.As(); // RTI sets this if it finds StylusDevice based on Id. bool cancelInput = true; // Only process if we see we have valid input data. if (stylusInputReport.InputSource != null && stylusInputReport.PenContext != null) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs index 06fa04b9ff5..2375a05c18d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndTarget.cs @@ -2037,7 +2037,7 @@ internal static bool IsPerMonitorDpiScalingSupportedOnCurrentPlatform { get { - return OSVersionHelper.IsOsWindows10RS1OrGreater; ; + return OSVersionHelper.IsOsWindows10RS1OrGreater; } } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamilyConverter.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamilyConverter.cs index 860bda2ca09..f77df1a829b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamilyConverter.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/FontFamilyConverter.cs @@ -126,7 +126,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c return new FontFamily(baseUri, s); } - return base.ConvertFrom(context, cultureInfo, o); ; + return base.ConvertFrom(context, cultureInfo, o); } /// diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs index a0fc1ef6a55..ec0ca345fab 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/PresentationSource.cs @@ -220,7 +220,7 @@ public static void RemoveSourceChangedHandler(IInputElement e, SourceChangedEven } if (info == null || info.Count == 0) { - uie.VisualAncestorChanged -= new Visual.AncestorChangedEventHandler(uie.OnVisualAncestorChanged); ; + uie.VisualAncestorChanged -= new Visual.AncestorChangedEventHandler(uie.OnVisualAncestorChanged); RemoveElementFromWatchList(uie); } } @@ -234,7 +234,7 @@ public static void RemoveSourceChangedHandler(IInputElement e, SourceChangedEven } if (info == null || info.Count == 0) { - uie3D.VisualAncestorChanged -= new Visual.AncestorChangedEventHandler(uie3D.OnVisualAncestorChanged); ; + uie3D.VisualAncestorChanged -= new Visual.AncestorChangedEventHandler(uie3D.OnVisualAncestorChanged); RemoveElementFromWatchList(uie3D); } } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/Journaling.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/Journaling.cs index fcfd3b6e530..7f3c19fddfb 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/Journaling.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/Journaling.cs @@ -272,7 +272,7 @@ protected JournalEntryPageFunction(SerializationInfo info, StreamingContext cont : base(info, context) { _pageFunctionId = (Guid)info.GetValue("_pageFunctionId", typeof(Guid)); - _parentPageFunctionId = (Guid)info.GetValue("_parentPageFunctionId", typeof(Guid)); ; + _parentPageFunctionId = (Guid)info.GetValue("_parentPageFunctionId", typeof(Guid)); } // diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/TextAdaptor.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/TextAdaptor.cs index 23de590f01a..2d2e9b6e36e 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/TextAdaptor.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/TextAdaptor.cs @@ -103,7 +103,7 @@ internal Rect[] GetBoundingRectangles(ITextPointer start, ITextPointer end, bool { if (!textView.Contains(start) && start.CompareTo(textSegments[0].Start) < 0) { - start = textSegments[0].Start.CreatePointer(); ; + start = textSegments[0].Start.CreatePointer(); } if (!textView.Contains(end) && end.CompareTo(textSegments[textSegments.Count-1].End) > 0) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs index 059ab63d990..174004f7ce2 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/RtfToXamlReader.cs @@ -8641,7 +8641,7 @@ internal void ProcessImage(FormatState formatState) { // Read the windows metafile from the rtf content and then convert it // to bitmap data then save it as PNG on the container image part - MemoryStream metafileStream = new MemoryStream(); ; + MemoryStream metafileStream = new MemoryStream(); using (metafileStream) { diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextSelection.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextSelection.cs index a7b68e134e6..dfbe236adf6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextSelection.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/TextSelection.cs @@ -841,12 +841,12 @@ void ITextSelection.ExtendSelectionByMouse(ITextPointer cursorPosition, bool for if (anchorWordRange.Start.CompareTo(cursorWordRange.Start) <= 0) { startPosition = anchorWordRange.Start.GetFrozenPointer(LogicalDirection.Forward); - movingPosition = cursorWordRange.End.GetFrozenPointer(LogicalDirection.Backward); ; + movingPosition = cursorWordRange.End.GetFrozenPointer(LogicalDirection.Backward); } else { startPosition = anchorWordRange.End.GetFrozenPointer(LogicalDirection.Backward); - movingPosition = cursorWordRange.Start.GetFrozenPointer(LogicalDirection.Forward); ; + movingPosition = cursorWordRange.Start.GetFrozenPointer(LogicalDirection.Forward); } // Note that we use includeCellAtMovingPosition=true because we want that hit-tested table cell diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfKnownMemberInvoker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfKnownMemberInvoker.cs index 57073976e1b..7cec13f35a0 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfKnownMemberInvoker.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfKnownMemberInvoker.cs @@ -53,7 +53,7 @@ public override ShouldSerializeResult ShouldSerializeValue(object instance) Type declaringType = _member.UnderlyingMember.DeclaringType; string methodName = $"ShouldSerialize{_member.Name}"; BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static; - Type[] args = new Type[] { typeof(DependencyObject) }; ; + Type[] args = new Type[] { typeof(DependencyObject) }; if (_member.IsAttachable) { _shouldSerializeMethod = declaringType.GetMethod(methodName, flags, null, args, null); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfMemberInvoker.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfMemberInvoker.cs index 291a321918c..110ca27b412 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfMemberInvoker.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/Baml2006/WpfMemberInvoker.cs @@ -73,7 +73,7 @@ public override ShouldSerializeResult ShouldSerializeValue(object instance) Type declaringType = _member.UnderlyingMember.DeclaringType; string methodName = $"ShouldSerialize{_member.Name}"; BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static; - Type[] args = new Type[] { typeof(DependencyObject) }; ; + Type[] args = new Type[] { typeof(DependencyObject) }; if (_member.IsAttachable) { _shouldSerializeMethod = declaringType.GetMethod(methodName, flags, null, args, null); diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/JournalEntry.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/JournalEntry.cs index 24ca2f8c0a7..6fbae77b3ae 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/JournalEntry.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Navigation/JournalEntry.cs @@ -409,7 +409,7 @@ internal int Id /// internal Guid NavigationServiceId { - get { return _jeGroupState.NavigationServiceId; ; } + get { return _jeGroupState.NavigationServiceId; } } ///