Update X.Forms version to 4.4.0.991537

Samsung · Jan 30, 2020 · 4dffb31 · 4dffb31
1 parent f6c2fa3
commit 4dffb31
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 33 deletions.
diff --git a/Tizen.Wearable.CircularUI.Test.sln b/Tizen.Wearable.CircularUI.Test.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29509.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WearableUIGallery", "test\WearableUIGallery\WearableUIGallery\WearableUIGallery.csproj", "{4B3ADEDC-D646-4C8A-B6AD-F2A07F2A0ACC}"
 EndProject
@@ -19,6 +19,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9F1AB8B9-0
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWidgetApp", "test\SimpleWidgetApp\SimpleWidgetApp.csproj", "{2627189B-7F81-4878-8762-49B12E7E3C85}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shell", "Shell", "{36C35271-6B8F-412E-B87F-5C7F41D60A60}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xaminals", "Xaminals", "{318DE803-3D8C-44F9-8C27-4DED4504DC94}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlyoutExample", "sample\ShellExamples\FlyoutExample\FlyoutExample.csproj", "{722622E8-4FA6-4511-BDD8-EEC2E18AA3E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellNavigation", "sample\ShellExamples\ShellNavigation\ShellNavigation.csproj", "{C65D5BE2-4E42-44B9-B0F7-3F736F2EF1D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xaminals", "sample\ShellExamples\Xaminals\Xaminals\Xaminals.csproj", "{BC74C370-A520-4116-B57E-18B44BE04F1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xaminals.Tizen", "sample\ShellExamples\Xaminals\Xaminals.Tizen\Xaminals.Tizen.csproj", "{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,6 +61,22 @@ Global
 		{2627189B-7F81-4878-8762-49B12E7E3C85}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2627189B-7F81-4878-8762-49B12E7E3C85}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2627189B-7F81-4878-8762-49B12E7E3C85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{722622E8-4FA6-4511-BDD8-EEC2E18AA3E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{722622E8-4FA6-4511-BDD8-EEC2E18AA3E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{722622E8-4FA6-4511-BDD8-EEC2E18AA3E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{722622E8-4FA6-4511-BDD8-EEC2E18AA3E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C65D5BE2-4E42-44B9-B0F7-3F736F2EF1D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C65D5BE2-4E42-44B9-B0F7-3F736F2EF1D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C65D5BE2-4E42-44B9-B0F7-3F736F2EF1D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C65D5BE2-4E42-44B9-B0F7-3F736F2EF1D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC74C370-A520-4116-B57E-18B44BE04F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC74C370-A520-4116-B57E-18B44BE04F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC74C370-A520-4116-B57E-18B44BE04F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC74C370-A520-4116-B57E-18B44BE04F1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -58,6 +86,12 @@ Global
 		{BACCF137-6E0F-4A33-AEC9-5EAF95C0E892} = {9F1AB8B9-03B0-40A7-AB49-522B741F570A}
 		{1998035F-ECAF-493E-8226-E7EB33D0C982} = {E00DD78A-32EC-4AFA-BC81-EEFF9A80E7E8}
 		{2627189B-7F81-4878-8762-49B12E7E3C85} = {E00DD78A-32EC-4AFA-BC81-EEFF9A80E7E8}
+		{36C35271-6B8F-412E-B87F-5C7F41D60A60} = {E00DD78A-32EC-4AFA-BC81-EEFF9A80E7E8}
+		{318DE803-3D8C-44F9-8C27-4DED4504DC94} = {36C35271-6B8F-412E-B87F-5C7F41D60A60}
+		{722622E8-4FA6-4511-BDD8-EEC2E18AA3E8} = {36C35271-6B8F-412E-B87F-5C7F41D60A60}
+		{C65D5BE2-4E42-44B9-B0F7-3F736F2EF1D7} = {36C35271-6B8F-412E-B87F-5C7F41D60A60}
+		{BC74C370-A520-4116-B57E-18B44BE04F1E} = {318DE803-3D8C-44F9-8C27-4DED4504DC94}
+		{4FE516ED-8A4C-4AA4-AC7F-D7F48FFE4BAD} = {318DE803-3D8C-44F9-8C27-4DED4504DC94}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3736C77A-08ED-442D-ADE1-5779254463ED}

diff --git a/Tizen.Wearable.CircularUI.nuspec b/Tizen.Wearable.CircularUI.nuspec
@@ -14,10 +14,10 @@
     <copyright>© Samsung Electronics Co., Ltd All Rights Reserved</copyright>
     <dependencies>
       <group targetFramework="netstandard2.0">
-        <dependency id="Xamarin.Forms" version="4.2.0.709249" />
+        <dependency id="Xamarin.Forms" version="4.4.0.991537" />
       </group>
       <group targetFramework="tizen40">
-        <dependency id="Xamarin.Forms" version="4.2.0.709249" />
+        <dependency id="Xamarin.Forms" version="4.4.0.991537" />
         <dependency id="Tizen.NET" version="4.0.0" />
       </group>
     </dependencies>

diff --git a/sample/ShellExamples/FlyoutExample/FlyoutExample.csproj b/sample/ShellExamples/FlyoutExample/FlyoutExample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Tizen.NET.Sdk/1.0.8">
+<Project Sdk="Tizen.NET.Sdk/1.0.9">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -15,7 +15,7 @@
     <Folder Include="lib\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991537" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/ShellExamples/ShellNavigation/ShellNavigation.csproj b/sample/ShellExamples/ShellNavigation/ShellNavigation.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Tizen.NET.Sdk/1.0.3">
+<Project Sdk="Tizen.NET.Sdk/1.0.9">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991537" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/ShellExamples/Xaminals/Xaminals.Tizen/Xaminals.Tizen.csproj b/sample/ShellExamples/Xaminals/Xaminals.Tizen/Xaminals.Tizen.csproj
@@ -1,22 +1,10 @@
-<Project Sdk="Tizen.NET.Sdk/1.0.3">
+<Project Sdk="Tizen.NET.Sdk/1.0.9">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>tizen40</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>None</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Folder Include="lib\" />
-    <Folder Include="res\" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\src\Tizen.Wearable.CircularUI.Forms.Renderer\Tizen.Wearable.CircularUI.Forms.Renderer.csproj" />
     <ProjectReference Include="..\..\..\..\src\Tizen.Wearable.CircularUI.Forms\Tizen.Wearable.CircularUI.Forms.csproj" />

diff --git a/sample/ShellExamples/Xaminals/Xaminals/Xaminals.csproj b/sample/ShellExamples/Xaminals/Xaminals/Xaminals.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991537" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Views\" />

diff --git a/src/Tizen.Wearable.CircularUI.Forms.Renderer/CircleImageRenderer.cs b/src/Tizen.Wearable.CircularUI.Forms.Renderer/CircleImageRenderer.cs
@@ -130,7 +130,7 @@ protected virtual void UpdateAfterLoading()
 
         void UpdateAspect()
         {
-            Control.Aspect = Element.Aspect;
+            Control.ApplyAspect(Element.Aspect);
         }
 
         void UpdateIsOpaque()

diff --git a/src/Tizen.Wearable.CircularUI.Forms.Renderer/Shell/NavigationDrawer.cs b/src/Tizen.Wearable.CircularUI.Forms.Renderer/Shell/NavigationDrawer.cs
@@ -2,11 +2,12 @@
 using System.Threading.Tasks;
 using System.Threading;
 using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
 using ElmSharp;
 using ElmSharp.Wearable;
 using EWidget = ElmSharp.Widget;
 using ELayout = ElmSharp.Layout;
-using NImage = Xamarin.Forms.Platform.Tizen.Native.Image;
+using EImage = ElmSharp.Image;
 
 namespace Tizen.Wearable.CircularUI.Forms.Renderer
 {
@@ -25,7 +26,7 @@ public class NavigationDrawer : ELayout, IAnimatable
 
         EvasObject _content;
         EvasObject _drawerContent;
-        NImage _drawerIcon;
+        EImage _drawerIcon;
 
         GestureLayer _contentGesture;
         GestureLayer _drawerGesture;
@@ -127,7 +128,7 @@ public void UpdateDrawerIcon(ImageSource source)
                 _drawerIconBox.UnPack(_drawerIcon);
                 _drawerIcon.Unrealize();
 
-                _drawerIcon = new NImage(this)
+                _drawerIcon = new EImage(this)
                 {
                     AlignmentY = -1,
                     AlignmentX = -1,
@@ -211,7 +212,7 @@ void Initialize()
             _drawerIconBox = new Box(_drawerBox);
             _drawerBox.PackEnd(_drawerIconBox);
 
-            _drawerIcon = new NImage(this)
+            _drawerIcon = new EImage(this)
             {
                 AlignmentY = -1,
                 AlignmentX = -1,

diff --git a/src/Tizen.Wearable.CircularUI.Forms/Tizen.Wearable.CircularUI.Forms.csproj b/src/Tizen.Wearable.CircularUI.Forms/Tizen.Wearable.CircularUI.Forms.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991537" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/SimpleTextWatchface/SimpleTextWatchface.csproj b/test/SimpleTextWatchface/SimpleTextWatchface.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Tizen.NET.Sdk/1.0.8">
+<Project Sdk="Tizen.NET.Sdk/1.0.9">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -19,7 +19,7 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991537" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Tizen.Wearable.CircularUI.Forms.Renderer\Tizen.Wearable.CircularUI.Forms.Renderer.csproj" />

diff --git a/test/SimpleWidgetApp/SimpleWidgetApp.csproj b/test/SimpleWidgetApp/SimpleWidgetApp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Tizen.NET.Sdk/1.0.8">
+<Project Sdk="Tizen.NET.Sdk/1.0.9">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -7,7 +7,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991537" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/WearableUIGallery/WearableUIGallery/WearableUIGallery.csproj b/test/WearableUIGallery/WearableUIGallery/WearableUIGallery.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="Tizen.NET" Version="4.0.0" />
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991537" />
   </ItemGroup>
 
   <!-- Include Nuget Package for Xamarin building -->