Skip to content
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 @@ -5,7 +5,7 @@
<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>6.0.10</MicrosoftNETCoreAppRefPackageVersion>
<!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
<MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsPackageVersion>7.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsServicingPackageVersion>6.0.1</MicrosoftExtensionsServicingPackageVersion>
<MicrosoftExtensionsNewServicingPackageVersion>6.0.2</MicrosoftExtensionsNewServicingPackageVersion>
<SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
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
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);
}
}));
}));
}
}
}
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 @@ -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
Expand Down