diff options
| author | Stephane Delcroix <stephane@delcroix.org> | 2016-04-17 23:59:44 +0200 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-04-17 14:59:44 -0700 |
| commit | cdd6d4defc844b605890e7ad731e27e373b09bf4 (patch) | |
| tree | ddf897b6bf475273a247891898a6c7daf7fb2079 /docs | |
| parent | 0b10ab0c130c814b4ab1595c8d13c4c6c9c9d5df (diff) | |
| download | xamarin-forms-cdd6d4defc844b605890e7ad731e27e373b09bf4.tar.gz xamarin-forms-cdd6d4defc844b605890e7ad731e27e373b09bf4.tar.bz2 xamarin-forms-cdd6d4defc844b605890e7ad731e27e373b09bf4.zip | |
Merged ResourceDictionary (#97)
* [X] Support Merged RD
* [X] Support RD as xaml roots
* [XamlC] I have no idea how that used to work before
* [C] Remove debugging statements
* fix docs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml index 862bf40a..95690874 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/ResourceDictionary.xml @@ -1,6 +1,6 @@ <Type Name="ResourceDictionary" FullName="Xamarin.Forms.ResourceDictionary"> - <TypeSignature Language="C#" Value="public sealed class ResourceDictionary : System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<string,object>>, System.Collections.Generic.IDictionary<string,object>, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string,object>>" /> - <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit ResourceDictionary extends System.Object implements class System.Collections.Generic.ICollection`1<valuetype System.Collections.Generic.KeyValuePair`2<string, object>>, class System.Collections.Generic.IDictionary`2<string, object>, class System.Collections.Generic.IEnumerable`1<valuetype System.Collections.Generic.KeyValuePair`2<string, object>>, class System.Collections.IEnumerable" /> + <TypeSignature Language="C#" Value="public class ResourceDictionary : System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<string,object>>, System.Collections.Generic.IDictionary<string,object>, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string,object>>" /> + <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ResourceDictionary extends System.Object implements class System.Collections.Generic.ICollection`1<valuetype System.Collections.Generic.KeyValuePair`2<string, object>>, class System.Collections.Generic.IDictionary`2<string, object>, class System.Collections.Generic.IEnumerable`1<valuetype System.Collections.Generic.KeyValuePair`2<string, object>>, class System.Collections.IEnumerable" /> <AssemblyInfo> <AssemblyName>Xamarin.Forms.Core</AssemblyName> <AssemblyVersion>1.0.0.0</AssemblyVersion> @@ -243,6 +243,27 @@ <remarks>To be added.</remarks> </Docs> </Member> + <Member MemberName="MergedWith"> + <MemberSignature Language="C#" Value="public Type MergedWith { get; set; }" /> + <MemberSignature Language="ILAsm" Value=".property instance class System.Type MergedWith" /> + <MemberType>Property</MemberType> + <AssemblyInfo> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <Attributes> + <Attribute> + <AttributeName>Xamarin.Forms.TypeConverter(typeof(Xamarin.Forms.TypeTypeConverter))</AttributeName> + </Attribute> + </Attributes> + <ReturnValue> + <ReturnType>System.Type</ReturnType> + </ReturnValue> + <Docs> + <summary>To be added.</summary> + <value>To be added.</value> + <remarks>To be added.</remarks> + </Docs> + </Member> <Member MemberName="Remove"> <MemberSignature Language="C#" Value="public bool Remove (string key);" /> <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance bool Remove(string key) cil managed" /> |