Update maui to Preview 12 (#1932)

mono · Jan 26, 2022 · 9eec965 · 9eec965
1 parent d4dbf39
commit 9eec965
Show file tree

Hide file tree

Showing 54 changed files with 70 additions and 62 deletions.
diff --git a/VERSIONS.txt b/VERSIONS.txt
@@ -11,7 +11,7 @@ Tizen.NET                                       release     4.0.0
 Tizen.NET.Sdk                                   release     1.0.9
 OpenTK                                          release     3.1.0
 OpenTK.GLControl                                release     3.1.0
-MSBuild.Sdk.Extras                              release     3.0.23
+MSBuild.Sdk.Extras                              release     3.0.44
 Cake                                            release     0.38.4
 GtkSharp                                        release     3.22.24.37
 GdkSharp                                        release     3.22.24.37
@@ -23,8 +23,8 @@ System.Drawing.Common                           release     4.5.1
 SharpVk                                         release     0.4.2
 Uno.UI                                          release     4.0.8
 Microsoft.WindowsAppSDK                         release     1.0.0
-Microsoft.Maui.Graphics                         release     6.0.101-preview.9.512
-Microsoft.Windows.SDK.NET.Ref                   release     10.0.18362.18
+Microsoft.Maui.Graphics                         release     6.0.200-preview.12.852
+Microsoft.Windows.SDK.NET.Ref                   release     10.0.18362.22
 Microsoft.AspNetCore.Components.Web             release     6.0.0
 
 # additional references used by the tooling

diff --git a/binding/Binding/GRContext.cs b/binding/Binding/GRContext.cs
@@ -115,10 +115,10 @@ public static GRContext CreateMetal (GRMtlBackendContext backendContext, GRConte
 			var queue = backendContext.Queue;
 
 			if (options == null) {
-				return GetObject (SkiaApi.gr_direct_context_make_metal ((void*)device.Handle, (void*)queue.Handle));
+				return GetObject (SkiaApi.gr_direct_context_make_metal ((void*)(IntPtr)device.Handle, (void*)(IntPtr)queue.Handle));
 			} else {
 				var opts = options.ToNative ();
-				return GetObject (SkiaApi.gr_direct_context_make_metal_with_options ((void*)device.Handle, (void*)queue.Handle, &opts));
+				return GetObject (SkiaApi.gr_direct_context_make_metal_with_options ((void*)(IntPtr)device.Handle, (void*)(IntPtr)queue.Handle, &opts));
 			}
 		}
 

diff --git a/binding/Binding/GRDefinitions.cs b/binding/Binding/GRDefinitions.cs
@@ -123,7 +123,7 @@ public GRMtlTextureInfo (Metal.IMTLTexture texture)
 
 		internal GRMtlTextureInfoNative ToNative () =>
 			new GRMtlTextureInfoNative {
-				fTexture = (void*)Texture.Handle
+				fTexture = (void*)(IntPtr)Texture.Handle
 			};
 
 		public readonly bool Equals (GRMtlTextureInfo obj) =>

diff --git a/binding/Binding/SKSurface.cs b/binding/Binding/SKSurface.cs
@@ -373,7 +373,7 @@ public static SKSurface Create (GRRecordingContext context, CoreAnimation.CAMeta
 		public static SKSurface Create (GRRecordingContext context, CoreAnimation.CAMetalLayer layer, GRSurfaceOrigin origin, int sampleCount, SKColorType colorType, SKColorSpace colorspace, SKSurfaceProperties props, out CoreAnimation.ICAMetalDrawable drawable)
 		{
 			void* drawablePtr;
-			var surface = GetObject (SkiaApi.sk_surface_new_metal_layer (context.Handle, (void*)layer.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero, &drawablePtr));
+			var surface = GetObject (SkiaApi.sk_surface_new_metal_layer (context.Handle, (void*)(IntPtr)layer.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero, &drawablePtr));
 			drawable = ObjCRuntime.Runtime.GetINativeObject<CoreAnimation.ICAMetalDrawable> ((IntPtr)drawablePtr, true);
 			return surface;
 		}
@@ -385,7 +385,7 @@ public static SKSurface Create (GRRecordingContext context, MetalKit.MTKView vie
 			Create (context, view, origin, sampleCount, colorType, colorspace, null);
 
 		public static SKSurface Create (GRRecordingContext context, MetalKit.MTKView view, GRSurfaceOrigin origin, int sampleCount, SKColorType colorType, SKColorSpace colorspace, SKSurfaceProperties props) =>
-			GetObject (SkiaApi.sk_surface_new_metal_view (context.Handle, (void*)view.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero));
+			GetObject (SkiaApi.sk_surface_new_metal_view (context.Handle, (void*)(IntPtr)view.Handle, origin, sampleCount, colorType.ToNative (), colorspace?.Handle ?? IntPtr.Zero, props?.Handle ?? IntPtr.Zero));
 
 #endif
 

diff --git a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>monoandroid9.0</TargetFramework>
     <RootNamespace>HarfBuzzSharp</RootNamespace>

diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarinmac2.0</TargetFramework>
     <RootNamespace>HarfBuzzSharp</RootNamespace>

diff --git a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFrameworks>uap10.0.10240;uap10.0.16299</TargetFrameworks>
     <RootNamespace>HarfBuzzSharp</RootNamespace>

diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarinios1.0</TargetFramework>
     <RootNamespace>HarfBuzzSharp</RootNamespace>

diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarintvos1.0</TargetFramework>
     <RootNamespace>HarfBuzzSharp</RootNamespace>

diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarinwatchos1.0</TargetFramework>
     <RootNamespace>HarfBuzzSharp</RootNamespace>

diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>monoandroid9.0</TargetFramework>
     <RootNamespace>SkiaSharp</RootNamespace>

diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarinmac2.0</TargetFramework>
     <RootNamespace>SkiaSharp</RootNamespace>

diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFrameworks>uap10.0.10240;uap10.0.16299</TargetFrameworks>
     <RootNamespace>SkiaSharp</RootNamespace>

diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarinios1.0</TargetFramework>
     <RootNamespace>SkiaSharp</RootNamespace>

diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarintvos1.0</TargetFramework>
     <RootNamespace>SkiaSharp</RootNamespace>

diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarinwatchos1.0</TargetFramework>
     <RootNamespace>SkiaSharp</RootNamespace>

diff --git a/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj
@@ -4,7 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj
@@ -4,7 +4,6 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/Info.plist b/samples/Basic/Maui/SkiaSharpSample/Platforms/MacCatalyst/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.15</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>

diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/Info.plist b/samples/Basic/Maui/SkiaSharpSample/Platforms/iOS/Info.plist
@@ -4,8 +4,6 @@
 <dict>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>MinimumOSVersion</key>
-	<string>10.3.4</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>

diff --git a/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj
@@ -4,7 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj
@@ -6,7 +6,6 @@
     <UseWPF>true</UseWPF>
     <LangVersion>8.0</LangVersion>
     <ApplicationIcon>icon.ico</ApplicationIcon>
-    <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
@@ -8,11 +8,9 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.18" TargetingPackVersion="10.0.19041.18" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>

diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
@@ -8,11 +8,9 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.18" TargetingPackVersion="10.0.19041.18" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>

diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj
@@ -13,7 +13,6 @@
     <UseWindowsForms>true</UseWindowsForms>
     <EnableDefaultXamlItems>false</EnableDefaultXamlItems>
     <EnableDefaultCssItems>false</EnableDefaultCssItems>
-    <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets
@@ -1,3 +1,10 @@
 <Project>
 
+  <!-- HACK: the new IDE seems to not like Analyzers in AdditionalFiles -->
+  <Target Name="After_InjectAdditionalFiles" AfterTargets="_InjectAdditionalFiles">
+    <ItemGroup>
+      <AdditionalFiles Remove="@(AdditionalFiles)" Condition="'%(Extension)' == '.dll'" />
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj b/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj
@@ -3,7 +3,6 @@
     <OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
     <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-    <RuntimeFrameworkVersion>5.0.11</RuntimeFrameworkVersion>
   </PropertyGroup>
   <ItemGroup Condition="exists('..\SkiaSharpSample.UWP')">
     <EmbeddedResource Include="..\SkiaSharpSample.UWP\Package.appxmanifest" LogicalName="Package.appxmanifest" />

diff --git a/samples/Gallery/Uno/SkiaSharpSample.WPF.Host/SkiaSharpSample.WPF.Host.csproj b/samples/Gallery/Uno/SkiaSharpSample.WPF.Host/SkiaSharpSample.WPF.Host.csproj
@@ -4,7 +4,6 @@
     <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
-    <RuntimeFrameworkVersion>3.1.19</RuntimeFrameworkVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.0.8" />

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
@@ -31,9 +31,9 @@ variables:
   XCODE_VERSION: 12.4
   DOTNET_VERSION_PREVIOUS: 3.1.413
   DOTNET_VERSION: 5.0.401
-  DOTNET_VERSION_PREVIEW: 6.0.100
-  DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.101/preview.11.json'
-  VS_VERSION_PREVIEW: 17/release
+  DOTNET_VERSION_PREVIEW: 6.0.200-preview.22055.15
+  DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.12.json'
+  VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
   VM_IMAGE_WINDOWS: windows-2022
   VM_IMAGE_WINDOWS_PREVIOUS: windows-2019
@@ -384,6 +384,7 @@ stages:
           vmImage: $(VM_IMAGE_WINDOWS)
           target: libs
           additionalArgs: --skipExternals="all"
+          installPreviewVs: true
           requiredArtifacts:
             - native
           artifactName: managed
@@ -473,7 +474,6 @@ stages:
           vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
           target: docs-api-diff
           additionalArgs: --nugetDiffPrerelease=$(NUGET_DIFF_PRERELEASE)
-          installPreviewVs: false
           shouldPublish: false
           requiredArtifacts:
             - package_windows
@@ -518,6 +518,7 @@ stages:
           vmImage: $(VM_IMAGE_WINDOWS)
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
+          installPreviewVs: true
           installWindowsSdk: false
           shouldPublish: false
           requiredArtifacts:
@@ -780,6 +781,7 @@ stages:
           displayName: Windows
           vmImage: $(VM_IMAGE_WINDOWS)
           target: samples
+          installPreviewVs: true
           requiredArtifactsMap:
             - src: nuget
               dst: nugets

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
@@ -32,7 +32,7 @@ parameters:
 jobs:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
-    timeoutInMinutes: 120
+    timeoutInMinutes: 180
     pool:
       vmImage: ${{ parameters.vmImage }}
       demands: ${{ parameters.demands }}
@@ -233,6 +233,12 @@ jobs:
       - ${{ parameters.postBuildSteps }}
 
       # publish artifacts
+      - ${{ if endsWith(parameters.name, '_linux') }}:
+        - bash: |
+            mkdir -p ./output/logs/
+            cp $HOME/.config/NuGet/NuGet.Config ./output/logs/
+          condition: failed()
+          displayName: Copy the sometimes corrupt NuGet.Config to the logs
       - task: PublishBuildArtifacts@1
         displayName: Publish the ${{ parameters.name }} artifacts
         condition: or(${{ parameters.shouldPublish }}, failed())

diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1
@@ -23,6 +23,7 @@ Invoke-WebRequest -UseBasicParsing `
 
 Write-Host "Installing Visual Studio..."
 $exitCode = & "$env:TEMP\dd_vs_community.exe" --quiet --norestart --wait `
+  --includeRecommended `
   --add Microsoft.VisualStudio.Workload.NetCrossPlat `
   --add Microsoft.VisualStudio.Workload.NetCoreTools `
   --add Microsoft.VisualStudio.Workload.ManagedDesktop `

diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets
@@ -255,4 +255,11 @@ internal partial class VersionConstants {
     </ItemGroup>
   </Target>
 
+  <!-- HACK: the new IDE seems to not like Analyzers in AdditionalFiles -->
+  <Target Name="After_InjectAdditionalFiles" AfterTargets="_InjectAdditionalFiles">
+    <ItemGroup>
+      <AdditionalFiles Remove="@(AdditionalFiles)" Condition="'%(Extension)' == '.dll'" />
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/.../SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/.../SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>monoandroid9.0</TargetFramework>
     <RootNamespace>SkiaSharp.Views.Forms</RootNamespace>

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarinmac2.0</TargetFramework>
     <RootNamespace>SkiaSharp.Views.Forms</RootNamespace>

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
@@ -1,4 +1,4 @@
-#if !__GTK__ && !WINDOWS && !NETSTANDARD
+#if !__GTK__ && !WINDOWS && !__MACCATALYST__ && !NETSTANDARD
 using System;
 using System.ComponentModel;
 

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>uap10.0.16299</TargetFramework>
     <RootNamespace>SkiaSharp.Views.Forms</RootNamespace>

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKGLViewRenderer.cs
@@ -1,4 +1,5 @@
-using System;
+#if !__MACCATALYST__
+using System;
 using CoreAnimation;
 using Foundation;
 
@@ -98,3 +99,4 @@ protected override void SetupRenderLoop(bool oneShot)
 		}
 	}
 }
+#endif
diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKTouchHandler.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SKTouchHandler.cs
@@ -103,7 +103,7 @@ private bool FireEvent(SKTouchAction actionType, UITouch touch, bool inContact)
 			if (onTouchAction == null || scalePixels == null)
 				return false;
 
-			var id = touch.Handle.ToInt64();
+			var id = ((IntPtr)touch.Handle).ToInt64();
 
 			var cgPoint = touch.LocationInView(View);
 			var point = scalePixels(cgPoint.X, cgPoint.Y);

diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
     <TargetFramework>xamarinios1.0</TargetFramework>
     <RootNamespace>SkiaSharp.Views.Forms</RootNamespace>

diff --git a/...aSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs b/...aSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs
@@ -31,7 +31,7 @@ public static MauiAppBuilder UseSkiaSharp(this MauiAppBuilder builder, bool regi
 					else
 						handlers.TryAddCompatibilityRenderer(typeof(SKCanvasView), typeof(SKCanvasViewRenderer));
 
-#if !WINDOWS
+#if !WINDOWS && !__MACCATALYST__
 					handlers.AddCompatibilityRenderer(typeof(SKGLView), typeof(SKGLViewRenderer));
 #endif