projects / profile / tv / apps / dotnet / home.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 99405f7)
Upgrading Xamarin 63/235663/1
authork.stepaniuk <k.stepaniuk@samsung.com>
Mon, 8 Jun 2020 11:49:20 +0000 (13:49 +0200)
committerk.stepaniuk <k.stepaniuk@samsung.com>
Mon, 8 Jun 2020 11:49:20 +0000 (13:49 +0200)
Change-Id: I92ebc38c94f0cafcdfa1512c815bb18ad20dda77

LibCommon.Shared/LibCommon.Shared.csproj patch | blob | history
LibCommon.Tizen/LibCommon.Tizen.csproj patch | blob | history
TVApps/TVApps.Tizen.TV/Renderer/NinePatchImageRenderer.cs patch | blob | history
TVApps/TVApps.Tizen.TV/TVApps.Tizen.TV.csproj patch | blob | history
TVApps/TVApps.Tizen.TV/TVApps.TizenTV.cs patch | blob | history
TVApps/TVApps/TVApps.csproj patch | blob | history
TVHome/TVHome.Tizen.TV/TVHome.Tizen.TV.csproj patch | blob | history
TVHome/TVHome.Tizen.TV/TVHome.TizenTV.cs patch | blob | history
TVHome/TVHome/TVHome.csproj patch | blob | history

diff --git a/LibCommon.Shared/LibCommon.Shared.csproj b/LibCommon.Shared/LibCommon.Shared.csproj
index 9e56d02666494631b5aeb8bae5f28aebdeeca918..44ebf644422dae3b59d28c5ceccd0eb7e0f2a9cf 100644 (file)
--- 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 f155e5923a59e599fdfd045f9102957bba00c1bf..9b2207cc088725ae41200f2b5a93f322f95cb546 100644 (file)
--- 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 f4907673ebed7db27ab35cc2cc59ec693de2bebd..0969197d3bf3f1e44d5db2194a9ce0829c11f6e8 100644 (file)
--- 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 e9b8c92a597b052757eeb1bf478ae7608802eb8c..667c687dc48617600bde03642cabf044b56404d1 100644 (file)
--- 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 e41516078780a17e1549295162cfd22feb0182d8..3af28a2bfc60b8fa1c53e0e62bcf708942adf3f4 100644 (file)
--- 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 5ac5f7745da4311828a5930b2f29b3a8645b7fba..91247f6ad0f2c8d0329beadeb517ef84c4794c4a 100755 (executable)
--- 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 7c0ef9dd2ec3c1a1efd2075adbacfe015835152b..124a74c6610d884f5916862d56e6c2e21c9676ce 100644 (file)
--- 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 385c0e9bdcdaa7518eed83d82acfcdd0e0a8f82f..a3009c5b66fdf90be4921ba933c7e9ec955d8788 100755 (executable)
--- 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 5ac5f7745da4311828a5930b2f29b3a8645b7fba..6417e6753cc6d5da9eeecdfa47035539b28d340b 100755 (executable)
--- 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>
Domain: Applications;