Skip to content

Update to Maui Preview 11 #1890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattleibow merged 10 commits into from
Dec 15, 2021
Merged

Update to Maui Preview 11 #1890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
42668f7
Update azure-pipelines.yml
mattleibow Dec 14, 2021
a7a7c74
Update iOSExtensions.cs
mattleibow Dec 14, 2021
31d1d54
Update SKCanvasViewHandler.Android.cs
mattleibow Dec 14, 2021
f53a0b6
Update SKCGSurfaceFactory.cs
mattleibow Dec 14, 2021
2967d5e
Update SKCanvasViewRendererBase.cs
mattleibow Dec 14, 2021
b3d0423
Update iOSExtensions.cs
mattleibow Dec 14, 2021
1163fa0
Update MacExtensions.cs
mattleibow Dec 14, 2021
d50de59
Update MacExtensions.cs
mattleibow Dec 14, 2021
bdb9634
Update the windows packages
mattleibow Dec 15, 2021
dc85216
Merge branch 'main' into dev/maui-p11
mattleibow Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))">
Expand All @@ -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')" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
7 changes: 0 additions & 7 deletions samples/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion scripts/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKCanvasViewRendererBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions ...Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.Maui;
using Microsoft.Maui.Handlers;
using Microsoft.Maui.Platform;
using SkiaSharp.Views.Android;
using SkiaSharp.Views.Maui.Platform;

Expand Down
2 changes: 1 addition & 1 deletion source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions source/SkiaSharp.Views/SkiaSharp.Views.Apple/SKCGSurfaceFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Runtime.InteropServices;
using CoreGraphics;
using Foundation;
using ObjCRuntime;

#if __TVOS__
namespace SkiaSharp.Views.tvOS
Expand Down
5 changes: 3 additions & 2 deletions source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/iOSExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using UIKit;
using ObjCRuntime;

#if __TVOS__
namespace SkiaSharp.Views.tvOS
Expand All @@ -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);
}
Expand Down
8 changes: 5 additions & 3 deletions source/SkiaSharp.Views/SkiaSharp.Views.Mac/MacExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using AppKit;
using System;
using AppKit;
using CoreGraphics;
using ObjCRuntime;

namespace SkiaSharp.Views.Mac
{
Expand All @@ -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);
}
Expand Down