[NUI] NUI Version 505 (#532)

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>

diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec
index 3c1efc3..b31ff51 100644 (file)
--- a/packaging/csapi-tizenfx.spec
+++ b/packaging/csapi-tizenfx.spec
@@ -1,7 +1,7 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 6
-%define TIZEN_NET_RPM_VERSION 6.0.0.999+nui504
+%define TIZEN_NET_RPM_VERSION 6.0.0.999+nui505
 %define TIZEN_NET_NUGET_VERSION 6.0.0.99999
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework

diff --git a/packaging/version.txt b/packaging/version.txt
index 829b7c9..f7703f5 100755 (executable)
--- a/packaging/version.txt
+++ b/packaging/version.txt
@@ -6,4 +6,4 @@ RPM_VERSION=6.0.0.999
 NUGET_VERSION=6.0.0.99999
 
 # RPM Version Suffix
-RPM_VERSION_SUFFIX=nui504
+RPM_VERSION_SUFFIX=nui505

diff --git a/src/Tizen.NUI/src/internal/VersionCheck.cs b/src/Tizen.NUI/src/internal/VersionCheck.cs
index 33981fd..cc597b5 100755 (executable)
--- a/src/Tizen.NUI/src/internal/VersionCheck.cs
+++ b/src/Tizen.NUI/src/internal/VersionCheck.cs
@@ -27,7 +27,7 @@ namespace Tizen.NUI
         //from dali_1.3.28 : NUI internal API version 502
         //from dali_1.3.34 : NUI internal API version 503
         //from dali_1.3.41 : NUI internal API version 504
-        //from dali_1.3.43 : NUI internal API version 505
+        //from dali_1.3.48 : NUI internal API version 505
         public const int nuiAPIVer = 505;
         public const int reservedVer1 = 0;
         public const int reservedVer2 = 0;
@@ -42,8 +42,7 @@ namespace Tizen.NUI
             {
                 if (NDalicManualPINVOKE.InternalAPIVersionCheck(ref ver1, ref ver2, ref ver3) == true)
                 {
-                    //temporary permit 504 version. the 504 will be removed.
-                    if (ver1 != nuiAPIVer && ver1 != 504)
+                    if (ver1 != nuiAPIVer)
                     {
                         NUILog.Error($"NUI API version mismatch error! NUI API Version: ({nuiAPIVer}) but read version from native: ({ver1}.{ver2}.{ver3})");
                         throw new System.InvalidOperationException($"NUI API version mismatch error! NUI API version should be ({nuiAPIVer}) but read version from native: ({ver1}.{ver2}.{ver3})");