From 6feee7c5fcbdb48904f86874845f2f79a7fb534e Mon Sep 17 00:00:00 2001 From: "guowei.wang" Date: Wed, 13 Jul 2022 20:25:20 +0800 Subject: [PATCH] [NUI][XamlBuild] Fix issues of xamlbuild. --- src/Tizen.NUI.Components/Properties/AssemblyInfo.cs | 6 +----- src/Tizen.NUI.Extension/Properties/AssemblyInfo.cs | 6 +----- .../XamlBuild/CompiledConverters/BindablePropertyConverter.cs | 2 +- .../src/public/XamlBuild/SetPropertiesVisitor.cs | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) mode change 100644 => 100755 src/Tizen.NUI.Extension/Properties/AssemblyInfo.cs diff --git a/src/Tizen.NUI.Components/Properties/AssemblyInfo.cs b/src/Tizen.NUI.Components/Properties/AssemblyInfo.cs index acb4636..8b14343 100755 --- a/src/Tizen.NUI.Components/Properties/AssemblyInfo.cs +++ b/src/Tizen.NUI.Components/Properties/AssemblyInfo.cs @@ -1,8 +1,4 @@ using Tizen.NUI; // Xamarin.Forms.Loader.dll Xamarin.Forms.Xaml.XamlLoader.Load(object, string), kzu@microsoft.com -[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI.Components")] -[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] -[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] -[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] -[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] \ No newline at end of file +[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI.Components")] \ No newline at end of file diff --git a/src/Tizen.NUI.Extension/Properties/AssemblyInfo.cs b/src/Tizen.NUI.Extension/Properties/AssemblyInfo.cs old mode 100644 new mode 100755 index ce1350a..cafcb90 --- a/src/Tizen.NUI.Extension/Properties/AssemblyInfo.cs +++ b/src/Tizen.NUI.Extension/Properties/AssemblyInfo.cs @@ -1,8 +1,4 @@ using Tizen.NUI; // Xamarin.Forms.Loader.dll Xamarin.Forms.Xaml.XamlLoader.Load(object, string), kzu@microsoft.com -[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI.Extension")] -[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] -[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] -[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] -[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] \ No newline at end of file +[assembly: XmlnsDefinition("http://tizen.org/Tizen.NUI/2018/XAML", "Tizen.NUI.Extension")] \ No newline at end of file diff --git a/src/Tizen.NUI.XamlBuild/src/public/XamlBuild/CompiledConverters/BindablePropertyConverter.cs b/src/Tizen.NUI.XamlBuild/src/public/XamlBuild/CompiledConverters/BindablePropertyConverter.cs index c4cc2c4..773775c 100755 --- a/src/Tizen.NUI.XamlBuild/src/public/XamlBuild/CompiledConverters/BindablePropertyConverter.cs +++ b/src/Tizen.NUI.XamlBuild/src/public/XamlBuild/CompiledConverters/BindablePropertyConverter.cs @@ -57,7 +57,7 @@ namespace Tizen.NUI.Xaml.Core.XamlC ( parent.XmlType.Name == "Trigger" || parent.XmlType.Name == "DataTrigger" || parent.XmlType.Name == "MultiTrigger" - || parent.XmlType.Name == "Style")) { + || parent.XmlType.Name == "XamlStyle")) { var ttnode = (parent as ElementNode).Properties [new XmlName("", "TargetType")]; if (ttnode is ValueNode) typeName = (ttnode as ValueNode).Value as string; diff --git a/src/Tizen.NUI.XamlBuild/src/public/XamlBuild/SetPropertiesVisitor.cs b/src/Tizen.NUI.XamlBuild/src/public/XamlBuild/SetPropertiesVisitor.cs index 8d91d71..45db5e6 100755 --- a/src/Tizen.NUI.XamlBuild/src/public/XamlBuild/SetPropertiesVisitor.cs +++ b/src/Tizen.NUI.XamlBuild/src/public/XamlBuild/SetPropertiesVisitor.cs @@ -475,7 +475,7 @@ namespace Tizen.NUI.Xaml.Build.Tasks } else yield return Create(Ldnull); yield return Instruction.Create(OpCodes.Newobj, module.ImportReference(ctorinforef)); - yield return Instruction.Create(OpCodes.Callvirt, module.ImportPropertySetterReference((NUIXamlCTask.bindingAssemblyName, NUIXamlCTask.bindingNameSpace, "BindingExtension"), propertyName: "TypedBinding")); + yield return Instruction.Create(OpCodes.Callvirt, module.ImportPropertySetterReference((NUIXamlCTask.bindingAssemblyName, NUIXamlCTask.xamlNameSpace, "BindingExtension"), propertyName: "TypedBinding")); } static IList> ParsePath(string path, TypeReference tSourceRef, IXmlLineInfo lineInfo, ModuleDefinition module) -- 2.7.4