fix build error of GBS and VS

Change-Id: I21d39ad39b214d7ebfdd3e8fd8d082e0119ee70f
Signed-off-by: Feng Jin <feng16.jin@samsung.com>

diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec
index 7698b8ee234985a2bf57c35c8f957350216de53a..8264288fb48e2930be1db99a0f38a580f9b600cd 100755 (executable)
--- a/packaging/csapi-nui.spec
+++ b/packaging/csapi-nui.spec
@@ -1,6 +1,6 @@
 Name:       csapi-nui
 Summary:    dali-NUI
-Version:    0.2.34
+Version:    0.2.35
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT

diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj
index 2a5ec2985f40b69739f66ed4d42d6448e9a6f9fa..d6ed4c12e754fb35f26a6e416475d7e6897c6f40 100755 (executable)
--- a/src/Tizen.NUI/Tizen.NUI.csproj
+++ b/src/Tizen.NUI/Tizen.NUI.csproj
@@ -298,9 +298,7 @@
     <Compile Include="src\public\Actor.cs" />\r
     <Compile Include="src\public\AlphaFunction.cs" />\r
     <Compile Include="src\public\Animation.cs" />\r
-    <Compile Include="src\public\Button.cs" />\r
     <Compile Include="src\public\CameraActor.cs" />\r
-    <Compile Include="src\public\CheckBoxButton.cs" />\r
     <Compile Include="src\public\Color.cs" />\r
     <Compile Include="src\public\CustomView.cs" />\r
     <Compile Include="src\public\CustomView\Spin.cs" />\r
@@ -310,7 +308,6 @@
     <Compile Include="src\public\FocusManager.cs" />\r
     <Compile Include="src\public\Gesture.cs" />\r
     <Compile Include="src\public\Hover.cs" />\r
-    <Compile Include="src\public\ImageView.cs" />\r
     <Compile Include="src\public\Key.cs" />\r
     <Compile Include="src\public\KeyFrames.cs" />\r
     <Compile Include="src\public\Layer.cs" />\r
@@ -319,33 +316,36 @@
     <Compile Include="src\public\PanGesture.cs" />\r
     <Compile Include="src\public\Path.cs" />\r
     <Compile Include="src\public\PinchGesture.cs" />\r
-    <Compile Include="src\public\Popup.cs" />\r
     <Compile Include="src\public\Position.cs" />\r
     <Compile Include="src\public\Position2D.cs" />\r
-    <Compile Include="src\public\ProgressBar.cs" />\r
     <Compile Include="src\public\Property.cs" />\r
-    <Compile Include="src\public\PushButton.cs" />\r
     <Compile Include="src\public\Radian.cs" />\r
-    <Compile Include="src\public\RadioButton.cs" />\r
     <Compile Include="src\public\Rectangle.cs" />\r
     <Compile Include="src\public\RelativeVector2.cs" />\r
     <Compile Include="src\public\RelativeVector3.cs" />\r
     <Compile Include="src\public\RelativeVector4.cs" />\r
     <Compile Include="src\public\RelayoutContainer.cs" />\r
     <Compile Include="src\public\Rotation.cs" />\r
-    <Compile Include="src\public\ScrollBar.cs" />\r
     <Compile Include="src\public\Size.cs" />\r
     <Compile Include="src\public\Size2D.cs" />\r
-    <Compile Include="src\public\Slider.cs" />\r
     <Compile Include="src\public\Stage.cs" />\r
     <Compile Include="src\public\StyleManager.cs" />\r
     <Compile Include="src\public\TableView.cs" />\r
     <Compile Include="src\public\TapGesture.cs" />\r
-    <Compile Include="src\public\TextEditor.cs" />\r
-    <Compile Include="src\public\TextField.cs" />\r
-    <Compile Include="src\public\TextLabel.cs" />\r
     <Compile Include="src\public\Timer.cs" />\r
     <Compile Include="src\public\Touch.cs" />\r
+    <Compile Include="src\public\UIComponents\Button.cs" />\r
+    <Compile Include="src\public\UIComponents\CheckBoxButton.cs" />\r
+    <Compile Include="src\public\UIComponents\ImageView.cs" />\r
+    <Compile Include="src\public\UIComponents\Popup.cs" />\r
+    <Compile Include="src\public\UIComponents\ProgressBar.cs" />\r
+    <Compile Include="src\public\UIComponents\PushButton.cs" />\r
+    <Compile Include="src\public\UIComponents\RadioButton.cs" />\r
+    <Compile Include="src\public\UIComponents\ScrollBar.cs" />\r
+    <Compile Include="src\public\UIComponents\Slider.cs" />\r
+    <Compile Include="src\public\UIComponents\TextEditor.cs" />\r
+    <Compile Include="src\public\UIComponents\TextField.cs" />\r
+    <Compile Include="src\public\UIComponents\TextLabel.cs" />\r
     <Compile Include="src\public\Vector2.cs" />\r
     <Compile Include="src\public\Vector3.cs" />\r
     <Compile Include="src\public\Vector4.cs" />\r

diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs
index 259cbddbfba428c0436028115ac4b9b1ec19e4d2..f8d6c00f9ce532ba549eb88b065c5755aa2cea27 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Application.cs
+++ b/src/Tizen.NUI/src/internal/Application.cs
@@ -19,10 +19,10 @@ namespace Tizen.NUI
     {
         public const int ver1 = 1;
         public const int ver2 = 2;
-        public const int ver3 = 34;
+        public const int ver3 = 35;
         public const int nuiVer1 = 0;
         public const int nuiVer2 = 2;
-        public const int nuiVer3 = 34;
+        public const int nuiVer3 = 35;
         public const string nuiRelease = "";
     }