From 3113ea1a8b5e13e0d937859be2408b4a97f798e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 04:19:45 +0000 Subject: [PATCH 1/2] Bump MicrosoftExtensionsPackageVersion from 6.0.0 to 7.0.0 Bumps `MicrosoftExtensionsPackageVersion` from 6.0.0 to 7.0.0. Updates `Microsoft.Extensions.Logging` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) Updates `Microsoft.Extensions.Logging.Console` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) Updates `Microsoft.Extensions.Logging.Debug` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) Updates `Microsoft.Extensions.FileProviders.Abstractions` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) Updates `Microsoft.Extensions.Configuration.Json` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) Updates `Microsoft.Extensions.Configuration.Abstractions` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) Updates `Microsoft.Extensions.DependencyInjection.Abstractions` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) Updates `Microsoft.Extensions.Primitives` from 6.0.0 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Logging dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging.Console dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging.Debug dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.FileProviders.Abstractions dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Configuration.Json dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Configuration.Abstractions dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.DependencyInjection.Abstractions dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Primitives dependency-type: direct:production update-type: version-update:semver-major ... 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 763c9b5b21b6..e9aa0d4d0182 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ 6.0.10 - 6.0.0 + 7.0.0 6.0.1 6.0.2 6.0.0 From a100efb671c18cbeb7d30153f6b2efc1b708cfb3 Mon Sep 17 00:00:00 2001 From: GitHub Actions Autoformatter Date: Tue, 8 Nov 2022 04:21:07 +0000 Subject: [PATCH 2/2] Auto-format source code --- src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs | 4 ++-- .../tests/DeviceTests/Elements/Frame/FrameTests.iOS.cs | 4 ++-- src/Essentials/src/Platform/PlatformUtils.android.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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/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/Essentials/src/Platform/PlatformUtils.android.cs b/src/Essentials/src/Platform/PlatformUtils.android.cs index 9f00b0927e9d..9035fcf75cff 100644 --- a/src/Essentials/src/Platform/PlatformUtils.android.cs +++ b/src/Essentials/src/Platform/PlatformUtils.android.cs @@ -79,7 +79,7 @@ internal static void SetLocale(Java.Util.Locale locale) else #endif #pragma warning disable CS0618 // Type or member is obsolete - config.Locale = locale; + config.Locale = locale; #pragma warning restore CS0618 // Type or member is obsolete #pragma warning disable CS0618 // Type or member is obsolete