Revert "[Tizen] add Name in Layer, LineCount in TextLabel"

This reverts commit 142dd8619669da34d3bc4413208f524eea2fdaee.

Change-Id: Ie2f2442a80612910576c232300b600e5cada4701

diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 99e5b91..1340474 100755 (executable)
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -16,9 +16,9 @@
 \r
   <PropertyGroup>\r
     <TargetFramework>netstandard1.6</TargetFramework>\r
-    <DefineConstants>$(DefineConstants)DEBUG_ON</DefineConstants>\r
+    <DefineConstants>$(DefineConstants);DEBUG_ON;DOT_NET_CORE</DefineConstants>\r
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>\r
-    <SignAssembly>True</SignAssembly>\r
+    <SignAssembly>False</SignAssembly>\r
     <AssemblyOriginatorKeyFile>TizenTVNUI.snk</AssemblyOriginatorKeyFile>\r
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>\r
   </PropertyGroup>\r

diff --git a/src/Tizen.NUI/TizenTVNUI.snk b/src/Tizen.NUI/TizenTVNUI.snk
deleted file mode 100755 (executable)
index 957e8d4..0000000
Binary files a/src/Tizen.NUI/TizenTVNUI.snk and /dev/null differ

diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index bc794d7..19a0111 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@ -101,7 +101,7 @@ namespace Tizen.NUI.BaseComponents
             internal static readonly int ELLIPSIS = NDalicManualPINVOKE.TextLabel_Property_ELLIPSIS_get();
             internal static readonly int AUTO_SCROLL_STOP_MODE = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_STOP_MODE_get();
             internal static readonly int AUTO_SCROLL_LOOP_DELAY = NDalicManualPINVOKE.TextLabel_Property_AUTO_SCROLL_LOOP_DELAY_get();
-            internal static readonly int LINE_COUNT = OUTLINE + 5;
+
         }
 
         /// <summary>
@@ -708,18 +708,5 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-        /// <summary>
-        /// The line count of text.
-        /// </summary>
-        public int LineCount
-        {
-            get
-            {
-                int temp = 0;
-                GetProperty(TextLabel.Property.LINE_COUNT).Get(out temp);
-                return temp;
-            }
-        }
-
     }
 }

diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs
index 474146c..28e6247 100755 (executable)
--- a/src/Tizen.NUI/src/public/Layer.cs
+++ b/src/Tizen.NUI/src/public/Layer.cs
@@ -427,35 +427,5 @@ namespace Tizen.NUI
                 return ret;
             }
         }
-
-        /// <summary>
-        /// Gets/Sets the Layer's name.
-        /// </summary>
-        public string Name
-        {
-            get
-            {
-                return GetName();
-            }
-            set
-            {
-                SetName(value);
-            }
-        }
-
-        internal string GetName()
-        {
-            string ret = NDalicPINVOKE.Actor_GetName(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal void SetName(string name)
-        {
-            NDalicPINVOKE.Actor_SetName(swigCPtr, name);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
     }
 }