[NUI] Adjust directory (#903)

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / internal / Xaml / XamlParser.cs

diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs b/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs
index 63f30da..fa00be6 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs
+++ b/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs
@@ -40,7 +40,7 @@ namespace Tizen.NUI.Xaml
 {
     internal static class XamlParser
     {
-        public const string XFUri = "http://xamarin.com/schemas/2014/forms";
+        public const string XFUri = "http://tizen.org/Tizen.NUI/2018/XAML";
         public const string NUI2018Uri = "http://tizen.org/Tizen.NUI/2018/XAML";
         public const string X2006Uri = "http://schemas.microsoft.com/winfx/2006/xaml";
         public const string X2009Uri = "http://schemas.microsoft.com/winfx/2009/xaml";
@@ -274,22 +274,8 @@ namespace Tizen.NUI.Xaml
             foreach (var kvp in xmlns) {
                 var prefix = kvp.Key;
 
-                string typeName = null, ns = null, asm = null, targetPlatform = null;
-                XmlnsHelper.ParseXmlns(kvp.Value, out typeName, out ns, out asm, out targetPlatform);
-                if (targetPlatform == null)
-                    continue;
-                try {
-                    if (targetPlatform != Device.RuntimePlatform)
-                    {
-                        // Special case for Windows backward compatibility
-                        if (targetPlatform == "Windows" && Device.RuntimePlatform == Device.UWP)
-                            continue;
-                        
-                        prefixes.Add(prefix);
-                    }
-                } catch (InvalidOperationException) {
-                    prefixes.Add(prefix);
-                }
+                string typeName = null, ns = null, asm = null;
+                XmlnsHelper.ParseXmlns(kvp.Value, out typeName, out ns, out asm);
             }
             return prefixes;
         }
@@ -355,7 +341,7 @@ namespace Tizen.NUI.Xaml
 
             if (lookupAssemblies.Count == 0) {
                 string ns, asmstring, _;
-                XmlnsHelper.ParseXmlns(namespaceURI, out _, out ns, out asmstring, out _);
+                XmlnsHelper.ParseXmlns(namespaceURI, out _, out ns, out asmstring);
                 lookupAssemblies.Add(new XmlnsDefinitionAttribute(namespaceURI, ns) {
                     AssemblyName = asmstring ?? currentAssembly.FullName
                 });