diff options
| -rw-r--r-- | Xamarin.Forms.Maps.iOS/MapRenderer.cs | 1 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.iOS/Forms.cs | 1 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs | 1 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs | 1 | ||||
| -rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml | 15 | ||||
| -rw-r--r-- | docs/Xamarin.Forms.Maps/index.xml | 2 |
6 files changed, 17 insertions, 4 deletions
diff --git a/Xamarin.Forms.Maps.iOS/MapRenderer.cs b/Xamarin.Forms.Maps.iOS/MapRenderer.cs index 2fac61a8..bdb7e68d 100644 --- a/Xamarin.Forms.Maps.iOS/MapRenderer.cs +++ b/Xamarin.Forms.Maps.iOS/MapRenderer.cs @@ -210,7 +210,6 @@ namespace Xamarin.Forms.Maps.MacOS } #endif // For iOS versions < 9, the MKMapView will be disposed in ViewRenderer's Dispose method - if (_locationManager != null) { _locationManager.Dispose(); diff --git a/Xamarin.Forms.Platform.iOS/Forms.cs b/Xamarin.Forms.Platform.iOS/Forms.cs index f2ba923f..50f7834d 100644 --- a/Xamarin.Forms.Platform.iOS/Forms.cs +++ b/Xamarin.Forms.Platform.iOS/Forms.cs @@ -53,6 +53,7 @@ namespace Xamarin.Forms return s_isiOS9OrNewer.Value; } } +#endif internal static bool IsiOS10OrNewer diff --git a/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs b/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs index d2ead786..45fd2443 100644 --- a/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs +++ b/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs @@ -3,7 +3,6 @@ using Xamarin.Forms.Xaml.Internals; using Xamarin.Forms.Internals; #if __MOBILE__ using UIKit; - [assembly: Xamarin.Forms.Dependency(typeof(Xamarin.Forms.Platform.iOS.NativeValueConverterService))] namespace Xamarin.Forms.Platform.iOS #else diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs index 446cc95e..dda2dd5d 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs @@ -2,7 +2,6 @@ using Foundation; using Xamarin.Forms.Internals; #if __MOBILE__ using UIKit; - namespace Xamarin.Forms.Platform.iOS #else using AppKit; diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml index ef9c9b52..e492c2e0 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml @@ -287,6 +287,21 @@ Device.BeginInvokeOnMainThread (() => { <remarks>To be added.</remarks> </Docs> </Member> + <Member MemberName="macOS"> + <MemberSignature Language="C#" Value="public const string macOS;" /> + <MemberSignature Language="ILAsm" Value=".field public static literal string macOS" /> + <MemberType>Field</MemberType> + <AssemblyInfo> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <ReturnValue> + <ReturnType>System.String</ReturnType> + </ReturnValue> + <Docs> + <summary>To be added.</summary> + <remarks>To be added.</remarks> + </Docs> + </Member> <Member MemberName="OnPlatform"> <MemberSignature Language="C#" Value="public static void OnPlatform (Action iOS = null, Action Android = null, Action WinPhone = null, Action Default = null);" /> <MemberSignature Language="ILAsm" Value=".method public static hidebysig void OnPlatform(class System.Action iOS, class System.Action Android, class System.Action WinPhone, class System.Action Default) cil managed" /> diff --git a/docs/Xamarin.Forms.Maps/index.xml b/docs/Xamarin.Forms.Maps/index.xml index 318b3c5e..cb165a30 100644 --- a/docs/Xamarin.Forms.Maps/index.xml +++ b/docs/Xamarin.Forms.Maps/index.xml @@ -33,7 +33,7 @@ <AttributeName>System.Resources.NeutralResourcesLanguage("en")</AttributeName> </Attribute> <Attribute> - <AttributeName>System.Runtime.CompilerServices.CompilationRelaxations(8)</AttributeName> + <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.macOS")</AttributeName> </Attribute> <Attribute> <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.macOS")</AttributeName> |