summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Delcroix <stephane@delcroix.org>2016-12-05 10:32:28 +0100
committerGitHub <noreply@github.com>2016-12-05 10:32:28 +0100
commit17280b260f07b12a23bb4af2679183b39beb8fd6 (patch)
tree5f2b058e5bd819cf27a867a87b900aa3ddd27054
parent5b892512abf535f50be39a04fbd5168356a1118d (diff)
downloadxamarin-forms-17280b260f07b12a23bb4af2679183b39beb8fd6.tar.gz
xamarin-forms-17280b260f07b12a23bb4af2679183b39beb8fd6.tar.bz2
xamarin-forms-17280b260f07b12a23bb4af2679183b39beb8fd6.zip
[Xaml] revert namespace change for XmlnsDefAttr (#610)
* [Xaml] revert namespace change for XmlnsDefAttr * fix
-rw-r--r--Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs2
-rw-r--r--Xamarin.Forms.Core/Properties/AssemblyInfo.cs1
-rw-r--r--Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs5
-rw-r--r--Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs1
-rw-r--r--Xamarin.Forms.Xaml/XamlParser.cs2
-rw-r--r--docs/Xamarin.Forms.Xaml/index.xml16
6 files changed, 13 insertions, 14 deletions
diff --git a/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs b/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs
index e97784ba..7682ec86 100644
--- a/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs
+++ b/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs
@@ -1,9 +1,9 @@
using System.Collections.Generic;
using System.Linq;
-using System.Windows.Markup;
using System.Xml;
using Mono.Cecil;
using Mono.Cecil.Rocks;
+using Xamarin.Forms.Internals;
using Xamarin.Forms.Xaml;
namespace Xamarin.Forms.Build.Tasks
diff --git a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs b/Xamarin.Forms.Core/Properties/AssemblyInfo.cs
index 86eb9571..6bbdb600 100644
--- a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.Core/Properties/AssemblyInfo.cs
@@ -1,6 +1,5 @@
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 e82efbf2..4178dc92 100644
--- a/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs
+++ b/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs
@@ -1,6 +1,7 @@
-´╗┐using System.Diagnostics;
+´╗┐using System;
+using System.Diagnostics;
-namespace System.Windows.Markup
+namespace Xamarin.Forms.Internals
{
[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
[DebuggerDisplay("{XmlNamespace}, {ClrNamespace}, {AssemblyName}")]
diff --git a/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs b/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs
index 6b853103..4ed09c20 100644
--- a/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs
@@ -1,6 +1,5 @@
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 5cc95068..594d1c6b 100644
--- a/Xamarin.Forms.Xaml/XamlParser.cs
+++ b/Xamarin.Forms.Xaml/XamlParser.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
-using System.Windows.Markup;
using System.Xml;
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Xaml
{
diff --git a/docs/Xamarin.Forms.Xaml/index.xml b/docs/Xamarin.Forms.Xaml/index.xml
index 1c150307..e61a4ad8 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>System.Windows.Markup.XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms.Xaml")</AttributeName>
+ <AttributeName>Xamarin.Forms.Internals.Preserve</AttributeName>
</Attribute>
<Attribute>
- <AttributeName>System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "Xamarin.Forms.Xaml")</AttributeName>
+ <AttributeName>Xamarin.Forms.Internals.XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms.Xaml")</AttributeName>
</Attribute>
<Attribute>
- <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>
+ <AttributeName>Xamarin.Forms.Internals.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "Xamarin.Forms.Xaml")</AttributeName>
</Attribute>
<Attribute>
- <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>
+ <AttributeName>Xamarin.Forms.Internals.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName>
</Attribute>
<Attribute>
- <AttributeName>System.Windows.Markup.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "Xamarin.Forms.Xaml")</AttributeName>
+ <AttributeName>Xamarin.Forms.Internals.XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName>
</Attribute>
<Attribute>
- <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>
+ <AttributeName>Xamarin.Forms.Internals.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "Xamarin.Forms.Xaml")</AttributeName>
</Attribute>
<Attribute>
- <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>
+ <AttributeName>Xamarin.Forms.Internals.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.Internals.Preserve</AttributeName>
+ <AttributeName>Xamarin.Forms.Internals.XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")</AttributeName>
</Attribute>
</Attributes>
</Assembly>