From e233620d5bb08a5a648323e775cc3bd6725c74d6 Mon Sep 17 00:00:00 2001
From: Kangho Hur <kangho.hur@samsung.com>
Date: Wed, 23 Jun 2021 18:11:58 +0900
Subject: [PATCH] Rebase to upstream latest main

---
 src/Compatibility/Core/src/RendererToHandlerShim.cs | 5 +++++
 src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs  | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Compatibility/Core/src/RendererToHandlerShim.cs b/src/Compatibility/Core/src/RendererToHandlerShim.cs
index 39cd804c61d5..5cf384df9992 100644
--- a/src/Compatibility/Core/src/RendererToHandlerShim.cs
+++ b/src/Compatibility/Core/src/RendererToHandlerShim.cs
@@ -18,6 +18,11 @@
 using PlatformView = UIKit.UIView;
 using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
 using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, UIKit.UIView>;
+#elif TIZEN
+using static Microsoft.Maui.Controls.Compatibility.Platform.Tizen.Platform;
+using NativeView = ElmSharp.EvasObject;
+using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
+using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, ElmSharp.EvasObject>;
 #elif NETSTANDARD
 using PlatformView = System.Object;
 using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, System.Object>;
diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs
index c19103e55c08..60d1b47b272c 100644
--- a/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs
+++ b/src/Core/src/Handlers/View/ViewHandlerOfT.Tizen.cs
@@ -183,7 +183,6 @@ protected override void RemoveContainer()
 
 		protected override void OnNativeViewDeleted()
 		{
-			NativeView = null;
 			Dispose();
 		}