Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Microsoft.Web.WebView2 from 1.0.1418.22 to 1.0.1462.37 #112

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
<SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
<_MicrosoftWebWebView2Version>1.0.1418.22</_MicrosoftWebWebView2Version>
<_MicrosoftWebWebView2Version>1.0.1462.37</_MicrosoftWebWebView2Version>
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
<!-- must be kept in sync with the binding library version to it here: -->
<_XamarinAndroidGlideVersion>4.13.2.2</_XamarinAndroidGlideVersion>
Expand Down
4 changes: 2 additions & 2 deletions src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/src/Core/Platform/iOS/DragAndDropDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -39,7 +39,7 @@ public UIDragItem[] GetItemsForBeginningSession(UIDragInteraction interaction, I
{
return HandleDragStarting((View)_viewHandler.VirtualView, _viewHandler);
}
#endregion
#endregion

[Export("dropInteraction:canHandleSession:")]
[Preserve(Conditional = true)]
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/src/Core/Platform/iOS/ModalWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected THandler CreateHandler<THandler>(IElement view)
return CreateHandler<THandler>(view, MauiContext);
}

protected async Task<THandler> CreateHandlerAsync<THandler>(IElement view)
protected async Task<THandler> CreateHandlerAsync<THandler>(IElement view)
where THandler : IElementHandler, new() =>
await InvokeOnMainThreadAsync(() => CreateHandler<THandler>(view));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -45,7 +45,7 @@ await InvokeOnMainThreadAsync(() =>
Assert.Equal(platformShadow.Opacity, expectedShadow.Opacity);
Assert.Equal(platformShadow.Offset, expectedShadow.Offset);
}
}));
}));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/Core/src/Platform/iOS/SearchBarExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Essentials/src/Platform/PlatformUtils.android.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down