diff options
author | Kangho Hur <kangho.hur@samsung.com> | 2017-04-24 15:37:51 +0900 |
---|---|---|
committer | Kangho Hur <kangho.hur@samsung.com> | 2017-04-24 15:51:40 +0900 |
commit | dc777ec8c892077c22561bbccf8b3ab5f795f719 (patch) | |
tree | 285b19f830a5f369b821b64273cf38053386b719 /docs | |
parent | 009dc7e81299c1c45ad3a7ce5ad3ad9161177c8e (diff) | |
download | xamarin-forms-dc777ec8c892077c22561bbccf8b3ab5f795f719.tar.gz xamarin-forms-dc777ec8c892077c22561bbccf8b3ab5f795f719.tar.bz2 xamarin-forms-dc777ec8c892077c22561bbccf8b3ab5f795f719.zip |
rebase to tags/beta-2.3.5-pre1
- this is base code of xamarin.forms 2.3.5-pre1 (https://github.com/xamarin/Xamarin.Forms/commit/fc778eb9789f50634d48fb9ad127f211b3fcfcc7)
Diffstat (limited to 'docs')
-rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml | 15 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/IOpenGlViewController.xml | 34 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml | 36 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Maps/index.xml | 2 |
4 files changed, 35 insertions, 52 deletions
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml index e492c2e0..ef9c9b52 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml @@ -287,21 +287,6 @@ 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.Core/Xamarin.Forms/IOpenGlViewController.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/IOpenGlViewController.xml new file mode 100644 index 00000000..10ea52a2 --- /dev/null +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/IOpenGlViewController.xml @@ -0,0 +1,34 @@ +<Type Name="IOpenGlViewController" FullName="Xamarin.Forms.IOpenGlViewController"> + <TypeSignature Language="C#" Value="public interface IOpenGlViewController : Xamarin.Forms.IViewController" /> + <TypeSignature Language="ILAsm" Value=".class public interface auto ansi abstract IOpenGlViewController implements class Xamarin.Forms.IElementController, class Xamarin.Forms.IViewController, class Xamarin.Forms.IVisualElementController" /> + <AssemblyInfo> + <AssemblyName>Xamarin.Forms.Core</AssemblyName> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <Interfaces> + <Interface> + <InterfaceName>Xamarin.Forms.IViewController</InterfaceName> + </Interface> + </Interfaces> + <Docs> + <summary>To be added.</summary> + <remarks>To be added.</remarks> + </Docs> + <Members> + <Member MemberName="DisplayRequested"> + <MemberSignature Language="C#" Value="public event EventHandler DisplayRequested;" /> + <MemberSignature Language="ILAsm" Value=".event class System.EventHandler DisplayRequested" /> + <MemberType>Event</MemberType> + <AssemblyInfo> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <ReturnValue> + <ReturnType>System.EventHandler</ReturnType> + </ReturnValue> + <Docs> + <summary>To be added.</summary> + <remarks>To be added.</remarks> + </Docs> + </Member> + </Members> +</Type> diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml index fca4c272..31d3543e 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/NavigationPage.xml @@ -226,42 +226,6 @@ </remarks> </Docs> </Member> - <Member MemberName="RootPage"> - <MemberSignature Language="C#" Value="public Xamarin.Forms.Page RootPage { get; }" /> - <MemberSignature Language="ILAsm" Value=".property instance class Xamarin.Forms.Page RootPage" /> - <MemberType>Property</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.Page</ReturnType> - </ReturnValue> - <Docs> - <summary> - The <see cref="T:Xamarin.Forms.Page" /> that is the root of the navigation stack. - </summary> - <value>To be added.</value> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="RootPageProperty"> - <MemberSignature Language="C#" Value="public static readonly Xamarin.Forms.BindableProperty RootPageProperty;" /> - <MemberSignature Language="ILAsm" Value=".field public static initonly class Xamarin.Forms.BindableProperty RootPageProperty" /> - <MemberType>Field</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>Xamarin.Forms.BindableProperty</ReturnType> - </ReturnValue> - <Docs> - <summary> - Identifies the <see cref="P:Xamarin.Forms.NavigationPage.RootPage" /> property. - </summary> - <remarks> - </remarks> - </Docs> - </Member> <Member MemberName="GetBackButtonTitle"> <MemberSignature Language="C#" Value="public static string GetBackButtonTitle (Xamarin.Forms.BindableObject page);" /> <MemberSignature Language="ILAsm" Value=".method public static hidebysig string GetBackButtonTitle(class Xamarin.Forms.BindableObject page) cil managed" /> diff --git a/docs/Xamarin.Forms.Maps/index.xml b/docs/Xamarin.Forms.Maps/index.xml index cb165a30..318b3c5e 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.InternalsVisibleTo("Xamarin.Forms.Maps.macOS")</AttributeName> + <AttributeName>System.Runtime.CompilerServices.CompilationRelaxations(8)</AttributeName> </Attribute> <Attribute> <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("Xamarin.Forms.Maps.macOS")</AttributeName> |