Merge remote-tracking branch 'origin/master' into tizen

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index 0d502c9..9fb7847 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -1,8 +1,8 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 8
-%define TIZEN_NET_RPM_VERSION 8.0.0.999+nui550
-%define TIZEN_NET_NUGET_VERSION 8.0.0.99999
+%define TIZEN_NET_RPM_VERSION 8.0.0.15092+nui550
+%define TIZEN_NET_NUGET_VERSION 8.0.0.15092
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref

diff --git a/src/Tizen.NUI/src/public/Timer.cs b/src/Tizen.NUI/src/public/Timer.cs
index 134d71a..3338616 100755 (executable)
--- a/src/Tizen.NUI/src/public/Timer.cs
+++ b/src/Tizen.NUI/src/public/Timer.cs
@@ -49,6 +49,18 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         public Timer(uint milliSec) : this(Interop.Timer.Timer_New(milliSec), true)
         {
+            if (Thread.CurrentThread.ManagedThreadId != 1)
+            {
+                Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId);
+
+                StackTrace st = new StackTrace(true);
+                for (int i = 0; i < st.FrameCount; i++)
+                {
+                    StackFrame sf = st.GetFrame(i);
+                    Tizen.Log.Error("NUI", " Method " + sf.GetMethod());
+                }
+            }
+
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
             NUILog.Debug($"(0x{swigCPtr.Handle:X})  Timer({milliSec}) Constructor!");
@@ -87,6 +99,19 @@ namespace Tizen.NUI
         {
             add
             {
+                if (Thread.CurrentThread.ManagedThreadId != 1)
+                {
+                    Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId);
+
+                    StackTrace st = new StackTrace(true);
+                    for (int i = 0; i < st.FrameCount; i++)
+                    {
+                        StackFrame sf = st.GetFrame(i);
+                        Tizen.Log.Error("NUI", " Method " + sf.GetMethod());
+                    }
+                }
+
+
                 if (_timerTickEventHandler == null && disposed == false)
                 {
                     TickSignal().Connect(_timerTickCallbackOfNative);
@@ -95,6 +120,18 @@ namespace Tizen.NUI
             }
             remove
             {
+                if (Thread.CurrentThread.ManagedThreadId != 1)
+                {
+                    Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId);
+
+                    StackTrace st = new StackTrace(true);
+                    for (int i = 0; i < st.FrameCount; i++)
+                    {
+                        StackFrame sf = st.GetFrame(i);
+                        Tizen.Log.Error("NUI", " Method " + sf.GetMethod());
+                    }
+                }
+
                 _timerTickEventHandler -= value;
                 if (_timerTickEventHandler == null && TickSignal().Empty() == false)
                 {
@@ -114,10 +151,34 @@ namespace Tizen.NUI
         {
             get
             {
+                if (Thread.CurrentThread.ManagedThreadId != 1)
+                {
+                    Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId);
+
+                    StackTrace st = new StackTrace(true);
+                    for (int i = 0; i < st.FrameCount; i++)
+                    {
+                        StackFrame sf = st.GetFrame(i);
+                        Tizen.Log.Error("NUI", " Method " + sf.GetMethod());
+                    }
+                }
+
                 return GetInterval();
             }
             set
             {
+                if (Thread.CurrentThread.ManagedThreadId != 1)
+                {
+                    Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId);
+
+                    StackTrace st = new StackTrace(true);
+                    for (int i = 0; i < st.FrameCount; i++)
+                    {
+                        StackFrame sf = st.GetFrame(i);
+                        Tizen.Log.Error("NUI", " Method " + sf.GetMethod());
+                    }
+                }
+
                 SetInterval(value);
             }
         }
@@ -266,6 +327,18 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         protected override void Dispose(DisposeTypes type)
         {
+            if (Thread.CurrentThread.ManagedThreadId != 1)
+            {
+                Tizen.Log.Error("NUI", "current threadID : " + Thread.CurrentThread.ManagedThreadId);
+
+                StackTrace st = new StackTrace(true);
+                for (int i = 0; i < st.FrameCount; i++)
+                {
+                    StackFrame sf = st.GetFrame(i);
+                    Tizen.Log.Error("NUI", " Method " + sf.GetMethod());
+                }
+            }
+
             NUILog.Debug($"(0x{swigCPtr.Handle:X}) Timer.Dispose(type={type}, disposed={disposed})");
 
             if (this != null && _timerTickCallbackDelegate != null)