Crash fix

TFDF-1724 TFDF-2068

Dereferencing xamarin.forms.extension,
Moving its functionality directly to project

Change-Id: Iee9baac960c4b515de5e910aa3228b00b4902ed7

7 files changed, 11 insertions, 17 deletions

diff --git a/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj b/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
index 0c784c2..7c0ef9d 100644
--- a/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
+++ b/TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj
@@ -24,6 +24,7 @@
 
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1605</NoWarn>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,11 +37,9 @@
 
   <!-- Include Nuget Package for Tizen Project building -->
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="4.0.0-preview1-00224" />
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.0-pre2" />
-    <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00013" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
-    <PackageReference Include="Xamarin.Forms.Platform.Tizen" Version="2.4.0-r269-002" />
+    <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" />
   </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 2b1184a..385c0e9 100755
--- a/TVHome/TVHome.Tizen.TV/TVHome.TizenTV.cs
+++ b/TVHome/TVHome.Tizen.TV/TVHome.TizenTV.cs
@@ -17,9 +17,8 @@
 using Tizen.Applications;
 using LibTVRefCommonPortable.Utils;
 using LibTVRefCommonTizen.Ports;
-using Tizen.Xamarin.Forms.Extension.Renderer;
 using ElmSharp;
-using System;
+using LibTVRefCommonTizen.Tizen.Renderers;
 
 namespace TVHome.TizenTV
 {
@@ -149,7 +148,8 @@ namespace TVHome.TizenTV
             global::Xamarin.Forms.DependencyService.Register<FileSystemPort>();
             global::Xamarin.Forms.DependencyService.Register<WindowPort>();
             global::Xamarin.Forms.DependencyService.Register<SystemSettingsPort>();
-            TizenFormsExtension.Init();
+
+            RenderersInitializer.Initialize();
             global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);
             app.Run(args);
         }
diff --git a/TVHome/TVHome.Tizen.TV/bin/Debug/netcoreapp2.0/org.tizen.xahome-1.0.0.tpi b/TVHome/TVHome.Tizen.TV/bin/Debug/netcoreapp2.0/org.tizen.xahome-1.0.0.tpi
deleted file mode 100644
index e69de29..0000000
--- a/TVHome/TVHome.Tizen.TV/bin/Debug/netcoreapp2.0/org.tizen.xahome-1.0.0.tpi
+++ /dev/null
diff --git a/TVHome/TVHome.Tizen.TV/tizen-manifest.xml b/TVHome/TVHome.Tizen.TV/tizen-manifest.xml
index 589923e..11491f2 100644
--- a/TVHome/TVHome.Tizen.TV/tizen-manifest.xml
+++ b/TVHome/TVHome.Tizen.TV/tizen-manifest.xml
@@ -5,10 +5,6 @@
     <icon>xahome.png</icon>
     <label>Home</label>
   </ui-application>
-  <ui-application appid="org.tizen.xaapps" exec="TVApps.Tizen.TV.dll" multiple="false" nodisplay="true" taskmanage="false" splash-screen-display="false" type="dotnet" launch_mode="single">
-    <icon>xaapps.png</icon>
-    <label>Apps</label>
-  </ui-application>
   <shortcut-list />
   <privileges>
     <privilege>http://tizen.org/privilege/bluetooth</privilege>
diff --git a/TVHome/TVHome/Controls/PanelButton.cs b/TVHome/TVHome/Controls/PanelButton.cs
index 21a697f..4ac8a75 100755
--- a/TVHome/TVHome/Controls/PanelButton.cs
+++ b/TVHome/TVHome/Controls/PanelButton.cs
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+using LibTVRefCommonPortable.Controls.ContextPopup;
 using LibTVRefCommonPortable.Utils;
 using System;
 using System.ComponentModel;
 using System.Windows.Input;
-using Tizen.Xamarin.Forms.Extension;
 using Xamarin.Forms;
 
 namespace TVHome.Controls
diff --git a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
index 7eca2fc..23447c1 100755
--- a/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
+++ b/TVHome/TVHome/Controls/SubPanelButton.xaml.cs
@@ -15,9 +15,9 @@
  */
 
 using System;
+using LibTVRefCommonPortable.Controls.ContextPopup;
 using LibTVRefCommonPortable.Utils;
 using Xamarin.Forms;
-using Tizen.Xamarin.Forms.Extension;
 using Xamarin.Forms.PlatformConfiguration.TizenSpecific;
 
 namespace TVHome.Controls
diff --git a/TVHome/TVHome/TVHome.csproj b/TVHome/TVHome/TVHome.csproj
index 3a5ad0f..5ac5f77 100755
--- a/TVHome/TVHome/TVHome.csproj
+++ b/TVHome/TVHome/TVHome.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>tizen40</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -9,8 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Tizen.Xamarin.Forms.Extension" Version="2.4.0-v00013" />
-    <PackageReference Include="Xamarin.Forms" Version="2.4.0-r266-006" />
+    <PackageReference Include="Xamarin.Forms" Version="3.1.0.583944" />
   </ItemGroup>
 
   <ItemGroup>