From 13abc687dc3b638132f177201bdb2500f99f882b Mon Sep 17 00:00:00 2001
From: "k.stepaniuk" <k.stepaniuk@samsung.com>
Date: Mon, 8 Jun 2020 13:49:20 +0200
Subject: [PATCH] Upgrading Xamarin

Change-Id: I92ebc38c94f0cafcdfa1512c815bb18ad20dda77
---
 LibCommon.Shared/LibCommon.Shared.csproj           |  4 ++--
 LibCommon.Tizen/LibCommon.Tizen.csproj             |  8 ++++----
 .../Renderer/NinePatchImageRenderer.cs             |  6 +++---
 TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj      | 14 +++++++-------
 TVApps/TVApps.Tizen.TV/TVApps.TizenTV.cs           |  2 +-
 TVApps/TVApps/TVApps.csproj                        |  6 +++---
 TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj      | 12 ++++++------
 TVHome/TVHome.Tizen.TV/TVHome.TizenTV.cs           |  2 +-
 TVHome/TVHome/TVHome.csproj                        |  4 ++--
 9 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/LibCommon.Shared/LibCommon.Shared.csproj b/LibCommon.Shared/LibCommon.Shared.csproj
index 9e56d02..44ebf64 100644
--- a/LibCommon.Shared/LibCommon.Shared.csproj
+++ b/LibCommon.Shared/LibCommon.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>tizen40</TargetFramework>
+    <TargetFramework>tizen60</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.847" />
   </ItemGroup>
 
 </Project>
diff --git a/LibCommon.Tizen/LibCommon.Tizen.csproj b/LibCommon.Tizen/LibCommon.Tizen.csproj
index f155e59..9b2207c 100644
--- a/LibCommon.Tizen/LibCommon.Tizen.csproj
+++ b/LibCommon.Tizen/LibCommon.Tizen.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>tizen40</TargetFramework>
+    <TargetFramework>tizen60</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="5.0.0.14392" />
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
+    <!--<PackageReference Include="Tizen.NET" Version="6.0.0.14995" />-->
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.847" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TVApps/TVApps.Tizen.TV/Renderer/NinePatchImageRenderer.cs b/TVApps/TVApps.Tizen.TV/Renderer/NinePatchImageRenderer.cs
index f490767..0969197 100644
--- a/TVApps/TVApps.Tizen.TV/Renderer/NinePatchImageRenderer.cs
+++ b/TVApps/TVApps.Tizen.TV/Renderer/NinePatchImageRenderer.cs
@@ -20,7 +20,7 @@ using TVApps.Controls;
 using TVApps.TizenTV.Renderer;
 using Xamarin.Forms.Platform.Tizen;
 
-[assembly: ExportRenderer(typeof(NinePatchImage), typeof(NinePatchImageRenderer))]
+[assembly: Xamarin.Forms.ExportRenderer(typeof(NinePatchImage), typeof(NinePatchImageRenderer))]
 namespace TVApps.TizenTV.Renderer
 {
     /// <summary>
@@ -69,9 +69,9 @@ namespace TVApps.TizenTV.Renderer
         /// <summary>
         /// A method updates border of Control(Native Image) after loading
         /// </summary>
-        protected override void UpdateAfterLoading()
+        protected override void UpdateAfterLoading(bool initialize)
         {
-            base.UpdateAfterLoading();
+            base.UpdateAfterLoading(initialize);
             UpdateBorder();
         }
     }
diff --git a/TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj b/TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj
index e9b8c92..667c687 100644
--- a/TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj
+++ b/TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj
@@ -1,6 +1,5 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
+<Project Sdk="Microsoft.NET.Sdk">
+  
   <!-- Setting Tizen Extension Path -->
   <PropertyGroup Label="Globals">
     <TizenProjectExtensionsPath>$(MSBuildExtensionsPath)\Tizen\VisualStudio\</TizenProjectExtensionsPath>
@@ -12,7 +11,8 @@
   <!-- Property Group for .NET Core Project -->
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen40</TargetFramework>
+    <TargetFramework>tizen60</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,9 +37,9 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="5.0.0.14392" />
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
+    <PackageReference Include="Tizen.NET" Version="6.0.0.14995" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.9" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.847" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LibCommon.Shared\LibCommon.Shared.csproj" />
diff --git a/TVApps/TVApps.Tizen.TV/TVApps.TizenTV.cs b/TVApps/TVApps.Tizen.TV/TVApps.TizenTV.cs
index e415160..3af28a2 100644
--- a/TVApps/TVApps.Tizen.TV/TVApps.TizenTV.cs
+++ b/TVApps/TVApps.Tizen.TV/TVApps.TizenTV.cs
@@ -135,7 +135,7 @@ namespace TVApps.TizenTV
             Xamarin.Forms.DependencyService.Register<FileSystemPort>();
             Xamarin.Forms.DependencyService.Register<SystemSettingsPort>();
             RenderersInitializer.Initialize();
-            Xamarin.Forms.Platform.Tizen.Forms.Init(instance);
+            Xamarin.Forms.Forms.Init(instance);
 
             instance.Run(args);
         }
diff --git a/TVApps/TVApps/TVApps.csproj b/TVApps/TVApps/TVApps.csproj
index 5ac5f77..91247f6 100755
--- a/TVApps/TVApps/TVApps.csproj
+++ b/TVApps/TVApps/TVApps.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>tizen40</TargetFramework>
+    <TargetFramework>tizen60</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.847" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj b/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
index 7c0ef9d..124a74c 100644
--- a/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
+++ b/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
@@ -1,5 +1,4 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <!-- Setting Tizen Extension Path -->
   <PropertyGroup Label="Globals">
@@ -12,7 +11,8 @@
   <!-- Property Group for .NET Core Project -->
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen40</TargetFramework>
+    <TargetFramework>tizen60</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,9 +37,9 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="5.0.0.14392" />
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
+    <PackageReference Include="Tizen.NET" Version="6.0.0.14995" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.9" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.847" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LibCommon.Shared\LibCommon.Shared.csproj" />
diff --git a/TVHome/TVHome.Tizen.TV/TVHome.TizenTV.cs b/TVHome/TVHome.Tizen.TV/TVHome.TizenTV.cs
index 385c0e9..a3009c5 100755
--- a/TVHome/TVHome.Tizen.TV/TVHome.TizenTV.cs
+++ b/TVHome/TVHome.Tizen.TV/TVHome.TizenTV.cs
@@ -150,7 +150,7 @@ namespace TVHome.TizenTV
             global::Xamarin.Forms.DependencyService.Register<SystemSettingsPort>();
 
             RenderersInitializer.Initialize();
-            global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
+            global::Xamarin.Forms.Forms.Init(app);
             app.Run(args);
         }
     }
diff --git a/TVHome/TVHome/TVHome.csproj b/TVHome/TVHome/TVHome.csproj
index 5ac5f77..6417e67 100755
--- a/TVHome/TVHome/TVHome.csproj
+++ b/TVHome/TVHome/TVHome.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>tizen40</TargetFramework>
+    <TargetFramework>tizen60</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.847" />
   </ItemGroup>
 
   <ItemGroup>
-- 
2.34.1