Add the net6.0-tizen TFM (#2099)

* Add the net6.0-tizen TFM * [Tizen] Add SKCanvasViewHander and SKImageSourceService (#2101) Co-authored-by: Kangho Hur <[email protected]>
mono · Jun 7, 2022 · 95c0ea5 · 95c0ea5
1 parent a09a9ad
commit 95c0ea5
Show file tree

Hide file tree

Showing 25 changed files with 366 additions and 34 deletions.
diff --git a/binding/SkiaSharp/SkiaSharp.csproj b/binding/SkiaSharp/SkiaSharp.csproj
@@ -84,6 +84,13 @@
     <None Include="nuget\build\macos\SkiaSharp.targets" Link="nuget\build\net6.0-macos\SkiaSharp.targets" />
     <None Include="nuget\build\macos\SkiaSharp.Local.targets" Link="nuget\build\net6.0-macos\SkiaSharp.Local.targets" />
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
+    <!-- Tizen -->
+    <None Include="..\..\output\native\tizen\armel\libSkiaSharp.*" Link="nuget\build\net6.0-tizen\arm\%(Filename)%(Extension)" />
+    <None Include="..\..\output\native\tizen\i386\libSkiaSharp.*" Link="nuget\build\net6.0-tizen\x86\%(Filename)%(Extension)" />
+    <None Include="nuget\build\tizen40\SkiaSharp.targets" Link="nuget\build\net6.0-tizen\SkiaSharp.targets" />
+    <None Include="nuget\build\tizen40\SkiaSharp.targets" Link="nuget\build\net6.0-tizen\SkiaSharp.Local.targets" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
     <Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />

diff --git a/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec b/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec
@@ -42,6 +42,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="net6.0-windows10.0.18362.0">
         <dependency id="SkiaSharp.Views.Maui.Controls" version="1.0.0" />
       </group>
+      <group targetFramework="net6.0-tizen7.0">
+        <dependency id="SkiaSharp.Views.Maui.Controls" version="1.0.0" />
+      </group>
     </dependencies>
 
   </metadata>
@@ -58,6 +61,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
     <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
     <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.Compatibility.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.Compatibility.pdb" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/SkiaSharp.Views.Maui.Controls.nuspec b/nuget/SkiaSharp.Views.Maui.Controls.nuspec
@@ -42,6 +42,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="net6.0-windows10.0.18362.0">
         <dependency id="SkiaSharp.Views.Maui.Core" version="1.0.0" />
       </group>
+      <group targetFramework="net6.0-tizen7.0">
+        <dependency id="SkiaSharp.Views.Maui.Core" version="1.0.0" />
+      </group>
     </dependencies>
 
   </metadata>
@@ -58,6 +61,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Controls.pdb" />
     <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.dll" />
     <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Controls.pdb" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.dll" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Controls.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Controls.pdb" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/SkiaSharp.Views.Maui.Core.nuspec b/nuget/SkiaSharp.Views.Maui.Core.nuspec
@@ -46,6 +46,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views.WinUI" version="1.0.0" />
       </group>
+      <group targetFramework="net6.0-tizen7.0">
+        <dependency id="SkiaSharp" version="1.0.0" />
+        <dependency id="SkiaSharp.Views" version="1.0.0" />
+      </group>
     </dependencies>
 
   </metadata>
@@ -62,6 +66,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file platform="windows" src="lib/net6.0-maccatalyst/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Views.Maui.Core.pdb" />
     <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Core.dll" />
     <file platform="windows" src="lib/net6.0-windows/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-windows10.0.18362.0/SkiaSharp.Views.Maui.Core.pdb" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Core.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Core.dll" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Maui.Core.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Maui.Core.pdb" />
 
     <!-- legal -->
     <file src="LICENSE.txt" />

diff --git a/nuget/SkiaSharp.Views.nuspec b/nuget/SkiaSharp.Views.nuspec
@@ -70,6 +70,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="net6.0-android30.0">
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
+      <group targetFramework="net6.0-tizen7.0">
+        <dependency id="SkiaSharp" version="1.0.0" />
+      </group>
     </dependencies>
 
   </metadata>
@@ -115,6 +118,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Mac.dll" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.dll" />
     <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Mac.pdb" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.pdb" />
     <file platform="windows" src="lib/net6.0-macos/SkiaSharp.Views.Mac.xml" target="lib/net6.0-macos10.15/SkiaSharp.Views.Mac.xml" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.dll" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.pdb" />
+    <file platform="windows" src="lib/net6.0-tizen/SkiaSharp.Views.Tizen.xml" target="lib/net6.0-tizen7.0/SkiaSharp.Views.Tizen.xml" />
 
     <!-- SkiaSharp.Views.Interop.UWP.dll -->
     <file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/SkiaSharp.Views.Interop.UWP.dll" />

diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec
@@ -86,6 +86,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="net6.0-android30.0">
         <dependency id="SkiaSharp.NativeAssets.Android" version="1.0.0" />
       </group>
+      <group targetFramework="net6.0-tizen7.0">
+        <dependency id="SkiaSharp.NativeAssets.Tizen" version="1.0.0" />
+      </group>
     </dependencies>
 
   </metadata>
@@ -140,6 +143,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file platform="macos" src="lib/net6.0-macos/SkiaSharp.dll" target="lib/net6.0-macos10.15/SkiaSharp.dll" />
     <file platform="macos" src="lib/net6.0-macos/SkiaSharp.pdb" target="lib/net6.0-macos10.15/SkiaSharp.pdb" />
     <file platform="macos" src="lib/net6.0-macos/SkiaSharp.xml" target="lib/net6.0-macos10.15/SkiaSharp.xml" />
+    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.dll" target="lib/net6.0-tizen7.0/SkiaSharp.dll" />
+    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.pdb" />
+    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.xml" target="lib/net6.0-tizen7.0/SkiaSharp.xml" />
 
     <!-- .NET interactive -->
     <file src="interactive-extensions/dotnet/SkiaSharp.DotNet.Interactive.dll" />

diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/Tizen/Main.cs b/samples/Basic/Maui/SkiaSharpSample/Platforms/Tizen/Main.cs
@@ -0,0 +1,17 @@
+using System;
+using Microsoft.Maui;
+using Microsoft.Maui.Hosting;
+
+namespace SkiaSharpSample
+{
+	class Program : MauiApplication
+	{
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+
+		static void Main(string[] args)
+		{
+			var app = new Program();
+			app.Run(args);
+		}
+	}
+}
diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/Tizen/tizen-manifest.xml b/samples/Basic/Maui/SkiaSharpSample/Platforms/Tizen/tizen-manifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.companyname.SkiaSharpSample" version="1.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
+  <profile name="common" />
+  <ui-application appid="com.companyname.SkiaSharpSample" exec="SkiaSharpSample.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
+    <label>SkiaSharpSample</label>
+    <icon>appicon.xhigh.png</icon>
+    <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
+  </ui-application>
+  <shortcut-list />
+  <privileges>
+    <privilege>http://tizen.org/privilege/internet</privilege>
+  </privileges> 
+  <dependencies />
+  <provides-appdefined-privileges />
+</manifest>
diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0-ios;net6.0-maccatalyst;net6.0-android</TargetFrameworks>
+    <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <UseMaui>true</UseMaui>
@@ -15,10 +16,11 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <LangVersion>10.0</LangVersion>
     <UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>
-    <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-ios'))">14.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-maccatalyst'))">14.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-android'))">21.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-tizen'))">6.5</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props
@@ -14,6 +14,8 @@
     <IsLinux>$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))</IsLinux>
     <IsCI Condition="'$(IsCI)' == '' and ('$(CI)' == 'true' or '$(TF_BUILD)' == 'true')">true</IsCI>
     <IsCI Condition="'$(IsCI)' == ''">false</IsCI>
+    <IsNet6TizenSupported Condition="'$(IsNet6TizenSupported)' == ''">true</IsNet6TizenSupported>
+    <IsNet6TizenSupported Condition="'$(IsNet6TizenSupported)' == ''">false</IsNet6TizenSupported>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -47,6 +49,7 @@
   <PropertyGroup>
     <BasicTargetFrameworks>netstandard1.3;netstandard2.0;net462</BasicTargetFrameworks>
     <Net6PlatformTargetFrameworks>net6.0-ios;net6.0-maccatalyst;net6.0-tvos;net6.0-macos;net6.0-android</Net6PlatformTargetFrameworks>
+    <Net6PlatformTargetFrameworks Condition="$(IsNet6TizenSupported)">$(Net6PlatformTargetFrameworks);net6.0-tizen</Net6PlatformTargetFrameworks>
     <Net6TargetFrameworks>net6.0;$(Net6PlatformTargetFrameworks)</Net6TargetFrameworks>
   </PropertyGroup>
 
@@ -59,6 +62,7 @@
   <!-- .NET MAUI -->
   <PropertyGroup>
     <MauiTargetFrameworks>net6.0;net6.0-ios;net6.0-maccatalyst;net6.0-android</MauiTargetFrameworks>
+    <MauiTargetFrameworks Condition="$(IsNet6TizenSupported)">$(MauiTargetFrameworks);net6.0-tizen</MauiTargetFrameworks>
     <MauiTargetFrameworks Condition="$(IsWindows)">$(MauiTargetFrameworks);net6.0-windows10.0.19041.0</MauiTargetFrameworks>
   </PropertyGroup>
 
@@ -120,6 +124,10 @@
     <SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.Contains('-tizen'))">
+    <SupportedOSPlatformVersion>6.5</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion>6.5</TargetPlatformMinVersion>
+  </PropertyGroup>
 
   <Target Name="PrintRID"
           BeforeTargets="BeforeBuild">

diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets
@@ -17,14 +17,6 @@
     <AssemblyVersionGitSha Condition=" '$(AssemblyVersionGitSha)' == '' ">$(GIT_SHA)</AssemblyVersionGitSha>
     <AssemblyVersionGitSha Condition=" '$(AssemblyVersionGitSha)' == '' ">$(GIT_COMMIT)</AssemblyVersionGitSha>
 
-    <!-- Set the minimum versions of the platforms -->
-    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-ios'))">10.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-tvos'))">10.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-macos'))">10.14</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-maccatalyst'))">13.1</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-android'))">21.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
-
     <!--
       Suppress version attribute generation in Microsoft.NET.Sdk projects to avoid build failures
       when two sets of attributes are emitted.

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKCanvasViewRendererBase.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKCanvasViewRendererBase.cs
@@ -26,6 +26,11 @@
 using SKNativeView = SkiaSharp.Views.Windows.SKXamlCanvas;
 using SKNativePaintSurfaceEventArgs = SkiaSharp.Views.Windows.SKPaintSurfaceEventArgs;
 using WVisibility = Microsoft.UI.Xaml.Visibility;
+#elif __TIZEN__
+using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
+using TForms = Microsoft.Maui.Controls.Compatibility.Forms;
+using SKNativeView = SkiaSharp.Views.Tizen.SKCanvasView;
+using SKNativePaintSurfaceEventArgs = SkiaSharp.Views.Tizen.SKPaintSurfaceEventArgs;
 #endif
 
 #else
@@ -77,6 +82,9 @@ namespace SkiaSharp.Views.Maui.Controls.Compatibility
 namespace SkiaSharp.Views.Forms
 #endif
 {
+#if __MAUI__ && __TIZEN__
+	[Obsolete]
+#endif
 	public abstract class SKCanvasViewRendererBase<TFormsView, TNativeView> : ViewRenderer<TFormsView, TNativeView>
 		where TFormsView : SKFormsView
 		where TNativeView : SKNativeView

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs
@@ -18,6 +18,11 @@
 using Microsoft.Maui.Controls.Handlers.Compatibility;
 using SKNativeView = SkiaSharp.Views.iOS.SKGLView;
 using SKNativePaintGLSurfaceEventArgs = SkiaSharp.Views.iOS.SKPaintGLSurfaceEventArgs;
+#elif __TIZEN__
+using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
+using TForms = Microsoft.Maui.Controls.Compatibility.Forms;
+using SKNativeView = SkiaSharp.Views.Tizen.SKGLSurfaceView;
+using SKNativePaintGLSurfaceEventArgs = SkiaSharp.Views.Tizen.SKPaintGLSurfaceEventArgs;
 #endif
 
 #else
@@ -67,6 +72,9 @@ namespace SkiaSharp.Views.Maui.Controls.Compatibility
 namespace SkiaSharp.Views.Forms
 #endif
 {
+#if __MAUI__ && __TIZEN__
+	[Obsolete]
+#endif
 	public abstract class SKGLViewRendererBase<TFormsView, TNativeView> : ViewRenderer<TFormsView, TNativeView>
 		where TFormsView : SKFormsView
 		where TNativeView : SKNativeView

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKCanvasViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKCanvasViewRenderer.cs
@@ -1,14 +1,28 @@
-using Xamarin.Forms;
+#if __MAUI__
+using Microsoft.Maui.Controls;
+using TForms = Microsoft.Maui.Controls.Compatibility.Forms;
+using SKFormsView = SkiaSharp.Views.Maui.Controls.SKCanvasView;
+using SKNativeView = SkiaSharp.Views.Tizen.SKCanvasView;
+#else
+using Xamarin.Forms;
 
 using TForms = Xamarin.Forms.Forms;
 
 using SKFormsView = SkiaSharp.Views.Forms.SKCanvasView;
 using SKNativeView = SkiaSharp.Views.Tizen.SKCanvasView;
 
 [assembly: ExportRenderer(typeof(SKFormsView), typeof(SkiaSharp.Views.Forms.SKCanvasViewRenderer))]
+#endif
 
+#if __MAUI__
+namespace SkiaSharp.Views.Maui.Controls.Compatibility
+#else
 namespace SkiaSharp.Views.Forms
+#endif
 {
+#if __MAUI__ && __TIZEN__
+	[System.Obsolete]
+#endif
 	public class SKCanvasViewRenderer : SKCanvasViewRendererBase<SKFormsView, SKNativeView>, IRegisterable
 	{
 		protected override SKNativeView CreateNativeControl() =>

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKGLViewRenderer.cs
@@ -1,4 +1,11 @@
 using SkiaSharp.Views.Tizen;
+
+#if __MAUI__
+using Microsoft.Maui.Controls;
+using TForms = Microsoft.Maui.Controls.Compatibility.Forms;
+using SKFormsView = SkiaSharp.Views.Maui.Controls.SKGLView;
+using SKNativeView = SkiaSharp.Views.Tizen.SKGLSurfaceView;
+#else
 using Xamarin.Forms;
 
 using TForms = Xamarin.Forms.Forms;
@@ -7,9 +14,17 @@
 using SKNativeView = SkiaSharp.Views.Tizen.SKGLSurfaceView;
 
 [assembly: ExportRenderer(typeof(SKFormsView), typeof(SkiaSharp.Views.Forms.SKGLViewRenderer))]
+#endif
 
+#if __MAUI__
+namespace SkiaSharp.Views.Maui.Controls.Compatibility
+#else
 namespace SkiaSharp.Views.Forms
+#endif
 {
+#if __MAUI__ && __TIZEN__
+	[System.Obsolete]
+#endif
 	public class SKGLViewRenderer : SKGLViewRendererBase<SKFormsView, SKNativeView>
 	{
 		protected override SKNativeView CreateNativeControl() =>

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKImageSourceHandler.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKImageSourceHandler.cs
@@ -1,17 +1,27 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Tizen;
 
 using ElmImage = ElmSharp.Image;
 
+#if __MAUI__
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Compatibility.Platform.Tizen;
+#else
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+
 [assembly: ExportImageSourceHandler(typeof(SkiaSharp.Views.Forms.SKImageImageSource), typeof(SkiaSharp.Views.Forms.SKImageSourceHandler))]
 [assembly: ExportImageSourceHandler(typeof(SkiaSharp.Views.Forms.SKBitmapImageSource), typeof(SkiaSharp.Views.Forms.SKImageSourceHandler))]
 [assembly: ExportImageSourceHandler(typeof(SkiaSharp.Views.Forms.SKPixmapImageSource), typeof(SkiaSharp.Views.Forms.SKImageSourceHandler))]
 [assembly: ExportImageSourceHandler(typeof(SkiaSharp.Views.Forms.SKPictureImageSource), typeof(SkiaSharp.Views.Forms.SKImageSourceHandler))]
+#endif
 
+#if __MAUI__
+namespace SkiaSharp.Views.Maui.Controls.Compatibility
+#else
 namespace SkiaSharp.Views.Forms
+#endif
 {
 	public sealed class SKImageSourceHandler : IImageSourceHandler
 	{