Merge "Add LayoutOptions properties to Dialog" into tizen

diff --git a/Tizen.Xamarin.Forms.Extension.Renderer/Tizen.Xamarin.Forms.Extension.Renderer.project.json b/Tizen.Xamarin.Forms.Extension.Renderer/Tizen.Xamarin.Forms.Extension.Renderer.project.json
old mode 100755 (executable)
new mode 100644 (file)
index e962798..eae3ef2
--- a/Tizen.Xamarin.Forms.Extension.Renderer/Tizen.Xamarin.Forms.Extension.Renderer.project.json
+++ b/Tizen.Xamarin.Forms.Extension.Renderer/Tizen.Xamarin.Forms.Extension.Renderer.project.json
@@ -1,17 +1,17 @@
-{
-  "dependencies": {
-    "ElmSharp": "1.2.0-beta-001",
-    "NETStandard.Library": "1.6.0",
-    "Tizen": "1.0.5",
-    "Tizen.Applications.Common": "1.5.5",
-    "Tizen.Applications.UI": "1.5.5",
-    "Tizen.Multimedia": "1.0.43",
-    "Xamarin.Forms": "2.3.5.233-pre1",
-    "Xamarin.Forms.Platform.Tizen": "2.3.5-r233-004"
-  },
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": "portable-net45+win8+wpa81+wp8"
-    }
-  }
-}
+{\r
+  "dependencies": {\r
+    "ElmSharp": "1.2.0-beta-001",\r
+    "NETStandard.Library": "1.6.0",\r
+    "Tizen": "1.0.5",\r
+    "Tizen.Applications.Common": "1.5.8",\r
+    "Tizen.Applications.UI": "1.5.8",\r
+    "Tizen.Multimedia": "1.2.0",\r
+    "Xamarin.Forms": "2.3.5.233-pre1",\r
+    "Xamarin.Forms.Platform.Tizen": "2.3.5-r233-008"\r
+  },\r
+  "frameworks": {\r
+    "netstandard1.6": {\r
+      "imports": "portable-net45+win8+wpa81+wp8"\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/packaging/xamarin-forms-extension.spec b/packaging/xamarin-forms-extension.spec
index 675a07e..bb630e7 100644 (file)
--- a/packaging/xamarin-forms-extension.spec
+++ b/packaging/xamarin-forms-extension.spec
@@ -2,7 +2,7 @@
 %define XF_RELEASE 233
 
 # Increase this XF_TIZEN_VERSION when any public APIs are changed.
-%define XF_DEV_VERSION 003
+%define XF_DEV_VERSION 004
 
 Name: xamarin-forms-extension
 Summary: Tizen Extensions for Xamarin.Forms