Update to Maui Preview 11 (#1890)

mattleibow · web-flow · commit 8f9781da15ba · 2021-12-15T05:56:17.000+02:00
diff --git a/VERSIONS.txt b/VERSIONS.txt
@@ -22,7 +22,7 @@ System.IO.UnmanagedMemoryStream                 release     4.3.0
 System.Drawing.Common                           release     4.5.1
 SharpVk                                         release     0.4.2
 Uno.UI                                          release     3.7.6
-Microsoft.WindowsAppSDK                         release     1.0.0-preview3
+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.AspNetCore.Components.Web             release     6.0.0
diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
@@ -26,14 +26,19 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!--<Reference Include="..\..\..\..\binding\SkiaSharp\bin\Debug\netstandard2.0\SkiaSharp.dll" />
+    <Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls.Compatibility\bin\Debug\net6.0-windows10.0.19041\SkiaSharp.Views.Maui.Controls.Compatibility.dll" />
+    <Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls\bin\Debug\net6.0-windows10.0.19041\SkiaSharp.Views.Maui.Controls.dll" />
+    <Reference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Core\bin\Debug\net6.0-windows10.0.19041\SkiaSharp.Views.Maui.Core.dll" />
+    <Reference Include="..\..\..\..\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\bin\Debug\net5.0-windows10.0.18362\SkiaSharp.Views.Windows.dll" />-->
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls.Compatibility\SkiaSharp.Views.Maui.Controls.Compatibility.csproj" />
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls\SkiaSharp.Views.Maui.Controls.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview3" />
-    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.29-preview3" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
@@ -45,7 +50,7 @@
 
   <PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
     <OutputType>WinExe</OutputType>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\$(TargetFramework)\SkiaSharp.Local.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\$(TargetFramework)\SkiaSharp.Local.targets')" />
diff --git a/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
@@ -13,7 +13,7 @@
 
   <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-preview3" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
@@ -64,7 +64,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0-preview3]">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0]">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
   </ItemGroup>
diff --git a/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
@@ -13,7 +13,7 @@
 
   <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-preview3" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets
@@ -1,10 +1,3 @@
 <Project>
 
-  <!-- HACK: Do not copy the native bootstrap files -->
-  <Target Name="_RemoveWasdkBootstrapDll" BeforeTargets="ResolveReferences">
-    <ItemGroup>
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(Filename)%(Extension)' == 'Microsoft.WindowsAppRuntime.Bootstrap.dll'" />
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
@@ -32,7 +32,7 @@ variables:
   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.10.json'
+  DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.101/preview.11.json'
   VS_VERSION_PREVIEW: 17/release
   CONFIGURATION: 'Release'
   VM_IMAGE_WINDOWS: windows-2022
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
@@ -6,6 +6,7 @@
 
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Platform;
 using SkiaSharp.Views.Maui.Platform;
 
 using SKFormsView = SkiaSharp.Views.Maui.Controls.SKCanvasView;
diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Android.cs b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Android.cs
@@ -1,5 +1,6 @@
 ﻿using Microsoft.Maui;
 using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
 using SkiaSharp.Views.Android;
 using SkiaSharp.Views.Maui.Platform;
 
diff --git a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
@@ -7,7 +7,7 @@
     <PackagingGroup>SkiaSharp.Views.WinUI</PackagingGroup>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview3" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Apple/SKCGSurfaceFactory.cs b/source/SkiaSharp.Views/SkiaSharp.Views.Apple/SKCGSurfaceFactory.cs
@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using CoreGraphics;
 using Foundation;
+using ObjCRuntime;
 
 #if __TVOS__
 namespace SkiaSharp.Views.tvOS
diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/iOSExtensions.cs b/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/iOSExtensions.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using UIKit;
+using ObjCRuntime;
 
 #if __TVOS__
 namespace SkiaSharp.Views.tvOS
@@ -15,14 +16,14 @@ public static class iOSExtensions
 
 		public static SKColor ToSKColor(this UIColor color)
 		{
-			System.nfloat r, g, b, a;
+			nfloat r, g, b, a;
 			color.GetRGBA(out r, out g, out b, out a);
 			return new SKColor((byte)(r * 255), (byte)(g * 255), (byte)(b * 255), (byte)(a * 255));
 		}
 
 		public static SKColorF ToSKColorF(this UIColor color)
 		{
-			System.nfloat r, g, b, a;
+			nfloat r, g, b, a;
 			color.GetRGBA(out r, out g, out b, out a);
 			return new SKColorF((float)r, (float)g, (float)b, (float)a);
 		}
diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/MacExtensions.cs b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/MacExtensions.cs
@@ -1,5 +1,7 @@
-﻿using AppKit;
+﻿using System;
+using AppKit;
 using CoreGraphics;
+using ObjCRuntime;
 
 namespace SkiaSharp.Views.Mac
 {
@@ -9,14 +11,14 @@ public static class MacExtensions
 
 		public static SKColor ToSKColor(this NSColor color)
 		{
-			System.nfloat r, g, b, a;
+			nfloat r, g, b, a;
 			color.GetRgba(out r, out g, out b, out a);
 			return new SKColor((byte)(r * 255), (byte)(g * 255), (byte)(b * 255), (byte)(a * 255));
 		}
 
 		public static SKColorF ToSKColorF(this NSColor color)
 		{
-			System.nfloat r, g, b, a;
+			nfloat r, g, b, a;
 			color.GetRgba(out r, out g, out b, out a);
 			return new SKColorF((float)r, (float)g, (float)b, (float)a);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using UIKit;`
	`3`	`+using ObjCRuntime;`
`3`	`4`
`4`	`5`	`#if __TVOS__`
`5`	`6`	`namespace SkiaSharp.Views.tvOS`
`@@ -15,14 +16,14 @@ public static class iOSExtensions`
`15`	`16`
`16`	`17`	`public static SKColor ToSKColor(this UIColor color)`
`17`	`18`	`{`
`18`		`- System.nfloat r, g, b, a;`
	`19`	`+ nfloat r, g, b, a;`
`19`	`20`	`color.GetRGBA(out r, out g, out b, out a);`
`20`	`21`	`return new SKColor((byte)(r * 255), (byte)(g * 255), (byte)(b * 255), (byte)(a * 255));`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`public static SKColorF ToSKColorF(this UIColor color)`
`24`	`25`	`{`
`25`		`- System.nfloat r, g, b, a;`
	`26`	`+ nfloat r, g, b, a;`
`26`	`27`	`color.GetRGBA(out r, out g, out b, out a);`
`27`	`28`	`return new SKColorF((float)r, (float)g, (float)b, (float)a);`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`		`-using AppKit;`
	`1`	`+using System;`
	`2`	`+using AppKit;`
`2`	`3`	`using CoreGraphics;`
	`4`	`+using ObjCRuntime;`
`3`	`5`
`4`	`6`	`namespace SkiaSharp.Views.Mac`
`5`	`7`	`{`
`@@ -9,14 +11,14 @@ public static class MacExtensions`
`9`	`11`
`10`	`12`	`public static SKColor ToSKColor(this NSColor color)`
`11`	`13`	`{`
`12`		`- System.nfloat r, g, b, a;`
	`14`	`+ nfloat r, g, b, a;`
`13`	`15`	`color.GetRgba(out r, out g, out b, out a);`
`14`	`16`	`return new SKColor((byte)(r * 255), (byte)(g * 255), (byte)(b * 255), (byte)(a * 255));`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`public static SKColorF ToSKColorF(this NSColor color)`
`18`	`20`	`{`
`19`		`- System.nfloat r, g, b, a;`
	`21`	`+ nfloat r, g, b, a;`
`20`	`22`	`color.GetRgba(out r, out g, out b, out a);`
`21`	`23`	`return new SKColorF((float)r, (float)g, (float)b, (float)a);`
`22`	`24`	`}`