From 3ec6acb33022f58a2c51b1fdfada873fb79f4b4a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 25 Oct 2020 17:23:54 +0000 Subject: [PATCH] Automated dotnet-format update (#12589) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../ShellNavigatingTests.cs | 6 +++--- .../ShellParameterPassingTests.cs | 2 +- Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs | 2 +- Xamarin.Forms.Core/FlexEnums.cs | 2 +- Xamarin.Forms.Core/RectTypeConverter.cs | 2 +- Xamarin.Forms.Core/Shell/Shell.cs | 14 +++++++------- Xamarin.Forms.Core/Shell/ShellSection.cs | 2 +- Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs | 2 +- .../Renderers/FormsWebViewClient.cs | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Xamarin.Forms.Core.UnitTests/ShellNavigatingTests.cs b/Xamarin.Forms.Core.UnitTests/ShellNavigatingTests.cs index bbcaa78a7..531d56444 100644 --- a/Xamarin.Forms.Core.UnitTests/ShellNavigatingTests.cs +++ b/Xamarin.Forms.Core.UnitTests/ShellNavigatingTests.cs @@ -390,7 +390,7 @@ namespace Xamarin.Forms.Core.UnitTests public async Task PoppingSamePageSetsCorrectNavigationSource() { Routing.RegisterRoute("detailspage", typeof(ContentPage)); - var shell = new TestShell(CreateShellItem(shellItemRoute:"item1")); + var shell = new TestShell(CreateShellItem(shellItemRoute: "item1")); await shell.GoToAsync("detailspage/detailspage"); await shell.Navigation.PopAsync(); @@ -471,7 +471,7 @@ namespace Xamarin.Forms.Core.UnitTests public async Task ChangingShellSectionSetsCorrectNavigationSource() { var shell = new TestShell( - CreateShellItem(shellSectionRoute:"item1") + CreateShellItem(shellSectionRoute: "item1") ); shell.Items[0].Items.Add(CreateShellSection(shellContentRoute: "item2")); @@ -486,7 +486,7 @@ namespace Xamarin.Forms.Core.UnitTests public async Task ChangingShellContentSetsCorrectNavigationSource() { var shell = new TestShell( - CreateShellItem(shellContentRoute:"item1") + CreateShellItem(shellContentRoute: "item1") ); shell.Items[0].Items[0].Items.Add(CreateShellContent(shellContentRoute: "item2")); diff --git a/Xamarin.Forms.Core.UnitTests/ShellParameterPassingTests.cs b/Xamarin.Forms.Core.UnitTests/ShellParameterPassingTests.cs index 91bcde0c2..767ae9735 100644 --- a/Xamarin.Forms.Core.UnitTests/ShellParameterPassingTests.cs +++ b/Xamarin.Forms.Core.UnitTests/ShellParameterPassingTests.cs @@ -260,7 +260,7 @@ namespace Xamarin.Forms.Core.UnitTests [Test] public async Task NavigatingBackAbsolutelyClearsParametersFromPreviousPage() { - var shell = new TestShell(CreateShellItem(shellItemRoute:"item")); + var shell = new TestShell(CreateShellItem(shellItemRoute: "item")); Routing.RegisterRoute("details", typeof(ShellTestPage)); diff --git a/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs b/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs index 973cbcb4b..d42809b8f 100644 --- a/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs +++ b/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs @@ -142,7 +142,7 @@ namespace Xamarin.Forms.Core.UITests public void DragAndDrop(string from, string to) { DragAndDrop( - FindFirstElement(WinQuery.FromMarked(from)), + FindFirstElement(WinQuery.FromMarked(from)), FindFirstElement(WinQuery.FromMarked(to)) ); } diff --git a/Xamarin.Forms.Core/FlexEnums.cs b/Xamarin.Forms.Core/FlexEnums.cs index e4802c478..d15b703bd 100644 --- a/Xamarin.Forms.Core/FlexEnums.cs +++ b/Xamarin.Forms.Core/FlexEnums.cs @@ -276,7 +276,7 @@ namespace Xamarin.Forms if (basis.IsAuto) return "auto"; if (basis.IsRelative) - return $"{basis.Length*100}%"; + return $"{basis.Length * 100}%"; return $"{basis.Length}"; } } diff --git a/Xamarin.Forms.Core/RectTypeConverter.cs b/Xamarin.Forms.Core/RectTypeConverter.cs index d406648e6..5851eeec7 100644 --- a/Xamarin.Forms.Core/RectTypeConverter.cs +++ b/Xamarin.Forms.Core/RectTypeConverter.cs @@ -29,5 +29,5 @@ namespace Xamarin.Forms return $"{r.X}, {r.Y}, {r.Width}, {r.Height}"; } - } + } } \ No newline at end of file diff --git a/Xamarin.Forms.Core/Shell/Shell.cs b/Xamarin.Forms.Core/Shell/Shell.cs index e77513068..7932e7f46 100644 --- a/Xamarin.Forms.Core/Shell/Shell.cs +++ b/Xamarin.Forms.Core/Shell/Shell.cs @@ -659,13 +659,13 @@ namespace Xamarin.Forms filteredQuery.Add(key, q.Value); } - + if (baseShellItem is ShellContent) baseShellItem.ApplyQueryAttributes(MergeData(element, filteredQuery, isPopping)); else if (isLastItem) element.SetValue(ShellContent.QueryAttributesProperty, MergeData(element, query, isPopping)); - IDictionary MergeData(Element shellElement, IDictionary data, bool isPopping) + IDictionary MergeData(Element shellElement, IDictionary data, bool isPopping) { if (!isPopping) return data; @@ -677,7 +677,7 @@ namespace Xamarin.Forms if (existing == null) return data; - foreach(var datum in existing) + foreach (var datum in existing) { if (!returnValue.ContainsKey(datum.Key)) returnValue[datum.Key] = datum.Value; @@ -1285,7 +1285,7 @@ namespace Xamarin.Forms { if (_accumulateNavigatedEvents) { - if(_accumulatedEvent == null) + if (_accumulatedEvent == null) _accumulatedEvent = args; } else @@ -1665,7 +1665,7 @@ namespace Xamarin.Forms var targetUri = ShellUriHandler.ConvertToStandardFormat(this, request.Request.FullUri); var currentUri = ShellUriHandler.ConvertToStandardFormat(this, current.FullLocation); - + var targetPaths = ShellUriHandler.RetrievePaths(targetUri.PathAndQuery); var currentPaths = ShellUriHandler.RetrievePaths(currentUri.PathAndQuery); @@ -1685,7 +1685,7 @@ namespace Xamarin.Forms if (targetPathsLength == currentPathsLength) return ShellNavigationSource.Unknown; - if(targetPathsLength < currentPathsLength) + if (targetPathsLength < currentPathsLength) { for (var i = 0; i < targetPathsLength; i++) { @@ -1710,7 +1710,7 @@ namespace Xamarin.Forms return ShellNavigationSource.Pop; } - else if(targetPathsLength > currentPathsLength) + else if (targetPathsLength > currentPathsLength) { for (var i = 0; i < currentPathsLength; i++) { diff --git a/Xamarin.Forms.Core/Shell/ShellSection.cs b/Xamarin.Forms.Core/Shell/ShellSection.cs index a7c9d45f4..acb6d9c19 100644 --- a/Xamarin.Forms.Core/Shell/ShellSection.cs +++ b/Xamarin.Forms.Core/Shell/ShellSection.cs @@ -358,7 +358,7 @@ namespace Xamarin.Forms await Navigation.PushModalAsync(page, IsNavigationAnimated(page)); break; } - else if(!isLast && navIndex < _navStack.Count) + else if (!isLast && navIndex < _navStack.Count) { Navigation.InsertPageBefore(page, _navStack[navIndex]); } diff --git a/Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs b/Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs index 726152af0..81681d222 100644 --- a/Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs +++ b/Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Reflection; using Xamarin.Forms.Internals; using Xamarin.Forms.Xaml; -using System.Linq; namespace Xamarin.Forms { diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs b/Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs index f554244c7..463cdcfd8 100644 --- a/Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs +++ b/Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs @@ -85,7 +85,7 @@ namespace Xamarin.Forms.Platform.Android [EditorBrowsable(EditorBrowsableState.Never)] public override void OnReceivedError(WView view, ClientError errorCode, string description, string failingUrl) { - if(failingUrl == _renderer?.Control.Url) + if (failingUrl == _renderer?.Control.Url) { _navigationResult = WebNavigationResult.Failure; if (errorCode == ClientError.Timeout) @@ -98,7 +98,7 @@ namespace Xamarin.Forms.Platform.Android public override void OnReceivedError(WView view, IWebResourceRequest request, WebResourceError error) { - if(request.Url.ToString() == _renderer?.Control.Url) + if (request.Url.ToString() == _renderer?.Control.Url) { _navigationResult = WebNavigationResult.Failure; if (error.ErrorCode == ClientError.Timeout)