From fb2f15b91d8f8f10290602b9b7e8e4c7ce88c792 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 08:12:25 +0000 Subject: [PATCH 1/2] Bump Microsoft.JSInterop from 7.0.0 to 7.0.1 Bumps [Microsoft.JSInterop](https://github.com/dotnet/aspnetcore) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v7.0.0...v7.0.1) --- updated-dependencies: - dependency-name: Microsoft.JSInterop dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a07d20cdf313..2b3793c6ebfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 7.0.0 7.0.0 7.0.0 - 7.0.0 + 7.0.1 7.0.0-preview1.22559.1 3.3.3 From 0ef7f0e2b8d1c87aad02682f9aebd0c1f5a469ff Mon Sep 17 00:00:00 2001 From: GitHub Actions Autoformatter Date: Wed, 14 Dec 2022 08:13:36 +0000 Subject: [PATCH 2/2] Auto-format source code --- src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs | 4 ++-- .../Compatibility/Handlers/ListView/iOS/CellRenderer.cs | 2 +- src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs | 4 ++-- src/Controls/src/Core/Platform/iOS/ModalWrapper.cs | 2 +- src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs | 2 +- .../tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs | 4 ++-- .../tests/Xaml.UnitTests/NativeViewsAndBindings.xaml.cs | 2 +- src/Core/src/Handlers/Editor/EditorHandler.Android.cs | 4 ++-- src/Core/src/Handlers/ViewHandlerExtensions.Android.cs | 6 +++--- src/Core/src/Platform/Android/KeyboardManager.cs | 2 +- src/Core/src/Platform/iOS/SearchBarExtensions.cs | 6 +++--- src/Essentials/src/Accelerometer/Accelerometer.shared.cs | 4 ++-- src/Essentials/src/Platform/PlatformUtils.android.cs | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs index 078a153b29f5..ed14f198a469 100644 --- a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs +++ b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs @@ -199,12 +199,12 @@ public void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask dic.Add((NSString)"Content-Type", (NSString)contentType); // Disable local caching. This will prevent user scripts from executing correctly. dic.Add((NSString)"Cache-Control", (NSString)"no-cache, max-age=0, must-revalidate, no-store"); - if(urlSchemeTask.Request.Url != null) + if (urlSchemeTask.Request.Url != null) { using var response = new NSHttpUrlResponse(urlSchemeTask.Request.Url, statusCode, "HTTP/1.1", dic); urlSchemeTask.DidReceiveResponse(response); } - + } urlSchemeTask.DidReceiveData(NSData.FromArray(responseBytes)); urlSchemeTask.DidFinish(); diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/CellRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/CellRenderer.cs index 4b6d1df7ee7f..87659d33bd33 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/CellRenderer.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/CellRenderer.cs @@ -48,7 +48,7 @@ public virtual UITableViewCell GetCell(Cell item, UITableViewCell reusableCell, WireUpForceUpdateSizeRequested(item, tvc, tv); - if(OperatingSystem.IsIOSVersionAtLeast(14)) + if (OperatingSystem.IsIOSVersionAtLeast(14)) { var content = tvc.DefaultContentConfiguration; content.Text = item.ToString(); diff --git a/src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs b/src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs index fd34a6b6dc98..e637f31d9293 100644 --- a/src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs +++ b/src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs @@ -21,7 +21,7 @@ public DragAndDropDelegate(IPlatformViewHandler viewHandler) _viewHandler = viewHandler; } - #region UIDragInteractionDelegate +#region UIDragInteractionDelegate [Export("dragInteraction:session:willEndWithOperation:")] [Preserve(Conditional = true)] public void SessionWillEnd(UIDragInteraction interaction, IUIDragSession session, UIDropOperation operation) @@ -39,7 +39,7 @@ public UIDragItem[] GetItemsForBeginningSession(UIDragInteraction interaction, I { return HandleDragStarting((View)_viewHandler.VirtualView, _viewHandler); } - #endregion +#endregion [Export("dropInteraction:canHandleSession:")] [Preserve(Conditional = true)] diff --git a/src/Controls/src/Core/Platform/iOS/ModalWrapper.cs b/src/Controls/src/Core/Platform/iOS/ModalWrapper.cs index 5b2bac4eb04d..f99967647a54 100644 --- a/src/Controls/src/Core/Platform/iOS/ModalWrapper.cs +++ b/src/Controls/src/Core/Platform/iOS/ModalWrapper.cs @@ -104,7 +104,7 @@ public override UIInterfaceOrientation PreferredInterfaceOrientationForPresentat return base.PreferredInterfaceOrientationForPresentation(); } -// TODO: [UnsupportedOSPlatform("ios6.0")] + // TODO: [UnsupportedOSPlatform("ios6.0")] #pragma warning disable CA1416, CA1422 public override bool ShouldAutorotate() { diff --git a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs index 31a6a12a29d7..72aaeda650b0 100644 --- a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs +++ b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs @@ -67,7 +67,7 @@ protected THandler CreateHandler(IElement view) return CreateHandler(view, MauiContext); } - protected async Task CreateHandlerAsync(IElement view) + protected async Task CreateHandlerAsync(IElement view) where THandler : IElementHandler, new() => await InvokeOnMainThreadAsync(() => CreateHandler(view)); diff --git a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs index a42c70c15704..5a3acd6cc475 100644 --- a/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs +++ b/src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs @@ -36,7 +36,7 @@ await InvokeOnMainThreadAsync(() => // so on iOS we just return the shadow that was hard coded into the renderer var expectedShadow = new Shadow() { Radius = 5, Opacity = 0.8f, Offset = new Point(0, 0), Brush = Brush.Black }; - if(platformView.Element is IView element) + if (platformView.Element is IView element) { var platformShadow = element.Shadow; await AssertionExtensions.Wait(() => platformShadow != null); @@ -45,7 +45,7 @@ await InvokeOnMainThreadAsync(() => Assert.Equal(platformShadow.Opacity, expectedShadow.Opacity); Assert.Equal(platformShadow.Offset, expectedShadow.Offset); } - })); + })); } } } \ No newline at end of file diff --git a/src/Controls/tests/Xaml.UnitTests/NativeViewsAndBindings.xaml.cs b/src/Controls/tests/Xaml.UnitTests/NativeViewsAndBindings.xaml.cs index b74fff2bdb70..9966946350fc 100644 --- a/src/Controls/tests/Xaml.UnitTests/NativeViewsAndBindings.xaml.cs +++ b/src/Controls/tests/Xaml.UnitTests/NativeViewsAndBindings.xaml.cs @@ -297,7 +297,7 @@ public void Setup() [TearDown] public void TearDown() => AppInfo.SetCurrent(null); [Test] - public void NativeInContentView([Values(false)]bool useCompiledXaml) + public void NativeInContentView([Values(false)] bool useCompiledXaml) { var layout = new NativeViewsAndBindings(useCompiledXaml); layout.BindingContext = new diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs index fc969a7cf682..4cd57104dd2d 100644 --- a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs +++ b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs @@ -81,7 +81,7 @@ public static void MapPlaceholderColor(IEditorHandler handler, IEditor editor) public static void MapCharacterSpacing(IEditorHandler handler, IEditor editor) => handler.PlatformView?.UpdateCharacterSpacing(editor); - public static void MapMaxLength(IEditorHandler handler, IEditor editor) => + public static void MapMaxLength(IEditorHandler handler, IEditor editor) => handler.PlatformView?.UpdateMaxLength(editor); public static void MapIsReadOnly(IEditorHandler handler, IEditor editor) => @@ -93,7 +93,7 @@ public static void MapIsTextPredictionEnabled(IEditorHandler handler, IEditor ed public static void MapFont(IEditorHandler handler, IEditor editor) => handler.PlatformView?.UpdateFont(editor, handler.GetRequiredService()); - public static void MapHorizontalTextAlignment(IEditorHandler handler, IEditor editor) => + public static void MapHorizontalTextAlignment(IEditorHandler handler, IEditor editor) => handler.PlatformView?.UpdateHorizontalTextAlignment(editor); public static void MapVerticalTextAlignment(IEditorHandler handler, IEditor editor) => diff --git a/src/Core/src/Handlers/ViewHandlerExtensions.Android.cs b/src/Core/src/Handlers/ViewHandlerExtensions.Android.cs index 7922d1681d0f..aae9aad0225c 100644 --- a/src/Core/src/Handlers/ViewHandlerExtensions.Android.cs +++ b/src/Core/src/Handlers/ViewHandlerExtensions.Android.cs @@ -135,7 +135,7 @@ internal static void PlatformArrangeHandler(this IViewHandler viewHandler, Rect viewHandler.Invoke(nameof(IView.Frame), frame); } - internal static void PrepareForTextViewArrange(this IViewHandler handler, Rect frame) + internal static void PrepareForTextViewArrange(this IViewHandler handler, Rect frame) { if (frame.Width < 0 || frame.Height < 0) { @@ -164,7 +164,7 @@ internal static void PrepareForTextViewArrange(this IViewHandler handler, Rect f } } - internal static bool NeedsExactMeasure(this IView virtualView) + internal static bool NeedsExactMeasure(this IView virtualView) { if (virtualView.VerticalLayoutAlignment != Primitives.LayoutAlignment.Fill && virtualView.HorizontalLayoutAlignment != Primitives.LayoutAlignment.Fill) @@ -185,7 +185,7 @@ internal static bool NeedsExactMeasure(this IView virtualView) return true; } - internal static int MakeMeasureSpecExact(this Context context, double size) + internal static int MakeMeasureSpecExact(this Context context, double size) { // Convert to a native size to create the spec for measuring var deviceSize = (int)context!.ToPixels(size); diff --git a/src/Core/src/Platform/Android/KeyboardManager.cs b/src/Core/src/Platform/Android/KeyboardManager.cs index d25fda42006e..8d9e5b3903ef 100644 --- a/src/Core/src/Platform/Android/KeyboardManager.cs +++ b/src/Core/src/Platform/Android/KeyboardManager.cs @@ -110,7 +110,7 @@ public static bool IsSoftKeyboardVisible(this AView view) var insets = ViewCompat.GetRootWindowInsets(view); if (insets == null) return false; - + var result = insets.IsVisible(WindowInsetsCompat.Type.Ime()); return result; } diff --git a/src/Core/src/Platform/iOS/SearchBarExtensions.cs b/src/Core/src/Platform/iOS/SearchBarExtensions.cs index fa128cd4681d..75422ec6430b 100644 --- a/src/Core/src/Platform/iOS/SearchBarExtensions.cs +++ b/src/Core/src/Platform/iOS/SearchBarExtensions.cs @@ -23,13 +23,13 @@ internal static void UpdateBackground(this UISearchBar uiSearchBar, ISearchBar s if (background is SolidPaint solidPaint) uiSearchBar.BarTintColor = solidPaint.Color.ToPlatform(); - if(background is GradientPaint gradientPaint) + if (background is GradientPaint gradientPaint) ViewExtensions.UpdateBackground(uiSearchBar, gradientPaint); - + if (background == null) uiSearchBar.BarTintColor = UISearchBar.Appearance.BarTintColor; } - + public static void UpdateIsEnabled(this UISearchBar uiSearchBar, ISearchBar searchBar) { uiSearchBar.UserInteractionEnabled = searchBar.IsEnabled; diff --git a/src/Essentials/src/Accelerometer/Accelerometer.shared.cs b/src/Essentials/src/Accelerometer/Accelerometer.shared.cs index c381ca8939c0..d15c31c7b789 100644 --- a/src/Essentials/src/Accelerometer/Accelerometer.shared.cs +++ b/src/Essentials/src/Accelerometer/Accelerometer.shared.cs @@ -129,8 +129,8 @@ public class AccelerometerChangedEventArgs : EventArgs /// Public constructor for accelerometer data. /// /// X data - /// Y data - /// Z data + /// Y data + /// Z data public AccelerometerData(double x, double y, double z) : this((float)x, (float)y, (float)z) { diff --git a/src/Essentials/src/Platform/PlatformUtils.android.cs b/src/Essentials/src/Platform/PlatformUtils.android.cs index e5cb453c3b18..b20c8eb5e1d1 100644 --- a/src/Essentials/src/Platform/PlatformUtils.android.cs +++ b/src/Essentials/src/Platform/PlatformUtils.android.cs @@ -81,7 +81,7 @@ internal static void SetLocale(Java.Util.Locale locale) #pragma warning disable CS0618 // Type or member is obsolete #pragma warning disable CA1422 // Validate platform compatibility #pragma warning disable CA1416 // Validate platform compatibility - config.Locale = locale; + config.Locale = locale; resources.UpdateConfiguration(config, resources.DisplayMetrics); #pragma warning restore CA1422 // Validate platform compatibility #pragma warning restore CA1416 // Validate platform compatibility