diff options
-rw-r--r-- | Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs | 1 | ||||
-rw-r--r-- | Xamarin.Forms.Core/Properties/AssemblyInfo.cs | 1 | ||||
-rw-r--r-- | Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs | 9 | ||||
-rw-r--r-- | Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | Xamarin.Forms.Xaml/XamlParser.cs | 1 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/XmlnsDefinitionAttribute.xml | 92 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Core/index.xml | 4 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Xaml/index.xml | 16 |
8 files changed, 17 insertions, 109 deletions
diff --git a/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs b/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs index 185c2722..e97784ba 100644 --- a/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs +++ b/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using System.Windows.Markup; using System.Xml; using Mono.Cecil; using Mono.Cecil.Rocks; diff --git a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs b/Xamarin.Forms.Core/Properties/AssemblyInfo.cs index 6bbdb600..86eb9571 100644 --- a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Core/Properties/AssemblyInfo.cs @@ -1,5 +1,6 @@ using System.Reflection; using System.Runtime.CompilerServices; +using System.Windows.Markup; using Xamarin.Forms; using Xamarin.Forms.Internals; diff --git a/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs b/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs index 2d6b0758..e82efbf2 100644 --- a/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs +++ b/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs @@ -1,11 +1,10 @@ -using System; -using System.Reflection; -using System.Diagnostics; -namespace Xamarin.Forms +using System.Diagnostics; + +namespace System.Windows.Markup { [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)] [DebuggerDisplay("{XmlNamespace}, {ClrNamespace}, {AssemblyName}")] - public sealed class XmlnsDefinitionAttribute : Attribute + sealed class XmlnsDefinitionAttribute : Attribute { public string XmlNamespace { get; } public string ClrNamespace { get; } diff --git a/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs b/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs index d6b8ae9c..6b853103 100644 --- a/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs @@ -1,5 +1,7 @@ using System.Reflection; using System.Runtime.CompilerServices; +using System.Windows.Markup; + using Xamarin.Forms; using Xamarin.Forms.Internals; diff --git a/Xamarin.Forms.Xaml/XamlParser.cs b/Xamarin.Forms.Xaml/XamlParser.cs index 9e841b9f..5cc95068 100644 --- a/Xamarin.Forms.Xaml/XamlParser.cs +++ b/Xamarin.Forms.Xaml/XamlParser.cs @@ -30,6 +30,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Reflection; +using System.Windows.Markup; using System.Xml; namespace Xamarin.Forms.Xaml diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/XmlnsDefinitionAttribute.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/XmlnsDefinitionAttribute.xml deleted file mode 100644 index 2c20764b..00000000 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/XmlnsDefinitionAttribute.xml +++ /dev/null @@ -1,92 +0,0 @@ -<Type Name="XmlnsDefinitionAttribute" FullName="Xamarin.Forms.XmlnsDefinitionAttribute"> - <TypeSignature Language="C#" Value="public sealed class XmlnsDefinitionAttribute : Attribute" /> - <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit XmlnsDefinitionAttribute extends System.Attribute" /> - <AssemblyInfo> - <AssemblyName>Xamarin.Forms.Core</AssemblyName> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <Base> - <BaseTypeName>System.Attribute</BaseTypeName> - </Base> - <Interfaces /> - <Attributes> - <Attribute> - <AttributeName>System.AttributeUsage(System.AttributeTargets.Assembly, AllowMultiple=true)</AttributeName> - </Attribute> - <Attribute> - <AttributeName>System.Diagnostics.DebuggerDisplay("{XmlNamespace}, {ClrNamespace}, {AssemblyName}")</AttributeName> - </Attribute> - </Attributes> - <Docs> - <summary>To be added.</summary> - <remarks>To be added.</remarks> - </Docs> - <Members> - <Member MemberName=".ctor"> - <MemberSignature Language="C#" Value="public XmlnsDefinitionAttribute (string xmlNamespace, string clrNamespace);" /> - <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string xmlNamespace, string clrNamespace) cil managed" /> - <MemberType>Constructor</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <Parameters> - <Parameter Name="xmlNamespace" Type="System.String" /> - <Parameter Name="clrNamespace" Type="System.String" /> - </Parameters> - <Docs> - <param name="xmlNamespace">To be added.</param> - <param name="clrNamespace">To be added.</param> - <summary>To be added.</summary> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="AssemblyName"> - <MemberSignature Language="C#" Value="public string AssemblyName { get; set; }" /> - <MemberSignature Language="ILAsm" Value=".property instance string AssemblyName" /> - <MemberType>Property</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.String</ReturnType> - </ReturnValue> - <Docs> - <summary>To be added.</summary> - <value>To be added.</value> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="ClrNamespace"> - <MemberSignature Language="C#" Value="public string ClrNamespace { get; }" /> - <MemberSignature Language="ILAsm" Value=".property instance string ClrNamespace" /> - <MemberType>Property</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.String</ReturnType> - </ReturnValue> - <Docs> - <summary>To be added.</summary> - <value>To be added.</value> - <remarks>To be added.</remarks> - </Docs> - </Member> - <Member MemberName="XmlNamespace"> - <MemberSignature Language="C#" Value="public string XmlNamespace { get; }" /> - <MemberSignature Language="ILAsm" Value=".property instance string XmlNamespace" /> - <MemberType>Property</MemberType> - <AssemblyInfo> - <AssemblyVersion>2.0.0.0</AssemblyVersion> - </AssemblyInfo> - <ReturnValue> - <ReturnType>System.String</ReturnType> - </ReturnValue> - <Docs> - <summary>To be added.</summary> - <value>To be added.</value> - <remarks>To be added.</remarks> - </Docs> - </Member> - </Members> -</Type> diff --git a/docs/Xamarin.Forms.Core/index.xml b/docs/Xamarin.Forms.Core/index.xml index 7d6b9079..f13fd562 100644 --- a/docs/Xamarin.Forms.Core/index.xml +++ b/docs/Xamarin.Forms.Core/index.xml @@ -143,9 +143,6 @@ <Attribute> <AttributeName>Xamarin.Forms.Internals.Preserve</AttributeName> </Attribute> - <Attribute> - <AttributeName>Xamarin.Forms.XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms")</AttributeName> - </Attribute> </Attributes> </Assembly> </Assemblies> @@ -441,7 +438,6 @@ <Type Name="WebView" Kind="Class" /> <Type Name="WebViewSource" Kind="Class" /> <Type Name="WebViewSourceTypeConverter" Kind="Class" /> - <Type Name="XmlnsDefinitionAttribute" Kind="Class" /> </Namespace> <Namespace Name="Xamarin.Forms.Internals"> <Type Name="CellExtensions" Kind="Class" /> diff --git a/docs/Xamarin.Forms.Xaml/index.xml b/docs/Xamarin.Forms.Xaml/index.xml index 6121f09b..1c150307 100644 --- a/docs/Xamarin.Forms.Xaml/index.xml +++ b/docs/Xamarin.Forms.Xaml/index.xml @@ -48,28 +48,28 @@ <AttributeName>System.Runtime.Versioning.TargetFramework(".NETPortable,Version=v4.5,Profile=Profile259", FrameworkDisplayName=".NET Portable Subset")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.Internals.Preserve</AttributeName> + <AttributeName>System.Windows.Markup.XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms.Xaml")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms.Xaml")</AttributeName> + <AttributeName>System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "Xamarin.Forms.Xaml")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "Xamarin.Forms.Xaml")</AttributeName> + <AttributeName>System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName> + <AttributeName>System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName> + <AttributeName>System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "Xamarin.Forms.Xaml")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "Xamarin.Forms.Xaml")</AttributeName> + <AttributeName>System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName> + <AttributeName>System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName> + <AttributeName>Xamarin.Forms.Internals.Preserve</AttributeName> </Attribute> </Attributes> </Assembly> |