fix: Add WinUI native helper for GetByteBuffer #3039

jeromelaban · 2024-10-15T21:00:51Z

Description of Change

Backports changes from #2920 to the 2x branch.

Bugs Fixed

Fixes Managed vtable types (ie. containing any reference types) are not supported. (With WindowsSdkPackageVersion 10.0.19041.38) #2999

API Changes

None.

Behavioral Changes

None.

Required skia PR

None.

PR Checklist

Has tests (if omitted, state reason in description)
Rebased on top of main at time of PR
Merged related skia PRs
Changes adhere to coding standard
Updated documentation

jeromelaban · 2024-10-15T21:05:44Z

/azp run

azure-pipelines · 2024-10-15T21:05:50Z

Commenter does not have sufficient privileges for PR 3039 in repo mono/SkiaSharp

jeromelaban · 2024-10-15T21:08:29Z

Hi @mattleibow, @Redth! Could you update the azure devops branch triggers for PRs on the release/2x? Thanks!

mattleibow · 2024-10-16T17:47:14Z

/azp run

azure-pipelines · 2024-10-16T17:47:21Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

jeromelaban · 2024-10-17T14:12:03Z

/azp run

azure-pipelines · 2024-10-17T14:12:10Z

Commenter does not have sufficient privileges for PR 3039 in repo mono/SkiaSharp

mattleibow · 2024-10-17T15:28:39Z

/azp run

azure-pipelines · 2024-10-17T15:28:46Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-18T00:05:34Z

/azp run

azure-pipelines · 2024-10-18T00:05:42Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-18T01:05:50Z

/azp run

azure-pipelines · 2024-10-18T01:05:56Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-18T01:07:29Z

/azp run

azure-pipelines · 2024-10-18T01:07:36Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-19T05:13:45Z

/rebase

mattleibow · 2024-10-19T16:23:46Z

/azp run

azure-pipelines · 2024-10-19T16:23:54Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-20T05:30:31Z

/azp run

azure-pipelines · 2024-10-20T05:30:38Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

source/SkiaSharp.Build.props

...ative/SkiaSharp.Views.WinUI.Native.Projection/SkiaSharp.Views.WinUI.Native.Projection.csproj

binding/SkiaSharp.NativeAssets.WinUI/SkiaSharp.NativeAssets.WinUI.csproj

mattleibow · 2024-10-20T10:34:55Z

Some more of my changes to get CI: unoplatform#33

Still not green yet, but closer i think?

mattleibow · 2024-10-21T09:28:30Z

/azp run

azure-pipelines · 2024-10-21T09:28:39Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-21T09:29:35Z

Closer!

"D:\a\1\s\source\SkiaSharpSource.Windows-netfx.slnf" (Build target) (1:2) ->
       "D:\a\1\s\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.UWP\SkiaSharp.Views.Forms.UWP.csproj" (default target) (2:6) ->
       "D:\a\1\s\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj" (default target) (6:8) ->
       (CoreCompile target) -> 
         D:\a\1\s\source\SkiaSharp.Views\SkiaSharp.Views.UWP\UWPExtensions.cs(6,23): error CS0234: The type or namespace name 'WinUI' does not exist in the namespace 'SkiaSharp.Views' (are you missing an assembly reference?) [D:\a\1\s\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj]


       "D:\a\1\s\source\SkiaSharpSource.Windows-netfx.slnf" (Build target) (1:2) ->
       "D:\a\1\s\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI.csproj" (default target) (22:14) ->
       "D:\a\1\s\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI.csproj" (Build target) (22:16) ->
         D:\a\1\s\source\SkiaSharp.Views\SkiaSharp.Views.UWP\UWPExtensions.cs(177,23): error CS0121: The call is ambiguous between the following methods or properties: 'Utils.GetByteBuffer(IBuffer)' and 'WindowsExtensions.GetByteBuffer(IBuffer)' [D:\a\1\s\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI.csproj::TargetFramework=net6.0-windows10.0.19041.0]


       "D:\a\1\s\source\SkiaSharpSource.Windows-netfx.slnf" (Build target) (1:2) ->
       "D:\a\1\s\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI.csproj" (default target) (22:14) ->
       "D:\a\1\s\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI.csproj" (Build target) (22:15) ->
         D:\a\1\s\source\SkiaSharp.Views\SkiaSharp.Views.UWP\UWPExtensions.cs(177,23): error CS0121: The call is ambiguous between the following methods or properties: 'Utils.GetByteBuffer(IBuffer)' and 'WindowsExtensions.GetByteBuffer(IBuffer)' [D:\a\1\s\source\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI.csproj::TargetFramework=net6.0-windows10.0.18362.0]

mattleibow · 2024-10-21T12:34:25Z

building now and will see unoplatform#35

jeromelaban · 2024-10-21T13:29:42Z

Indeed, I used it incorrectly, it should be the source path, not the target

mattleibow · 2024-10-21T13:31:28Z

I think my magic copies the src into the target. Sort of my way to type less. You can either sepcify the full path in the src, or try add the target attribute.

But the full path is better as the pack will fail if we forget a file or if there is a missing file. Sort of a verification check.

mattleibow · 2024-10-21T13:37:08Z

This is how I had it in the 3.x series:

I think the only difference is this would now be net6.0?

I did duplicate the projection dll in each because it was super easy vs some complicated logic or something.

mattleibow · 2024-10-21T14:32:48Z

/azp run

azure-pipelines · 2024-10-21T14:32:57Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-21T17:13:32Z

/azp run

azure-pipelines · 2024-10-21T17:13:39Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-22T09:22:47Z

i think this fixes everything: unoplatform#36

but now the agent runs out of storage. I saw it happen a few times, now it is failing on random extractions. I am going to check and then try extract in a separate step. I have to extract all the nugets so the security/secret/compliance/other scanners can read the dlls.

mattleibow · 2024-10-22T13:27:14Z

this is the money i think unoplatform#37

Green on my internal pipelines

mattleibow · 2024-10-22T13:28:50Z

/azp run

azure-pipelines · 2024-10-22T13:28:57Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

charlesroddie · 2024-10-22T20:38:38Z

Interesting. This PR could make SkiaSharp 2.88.9 work with UWP + dotnet9/NativeAOT? Should be able to test that once there is a nuget published.

jeromelaban · 2024-10-22T21:01:31Z

Interesting. This PR could make SkiaSharp 2.88.9 work with UWP + dotnet9/NativeAOT? Should be able to test that once there is a nuget published.

This is not the original intent of the change. I'm not too sure either if the CI will happily accept this kind of net9 inclusions either, as most of the CI is running net6 or 7 and it does not play well with the installed versions of VS.

jeromelaban · 2024-10-23T00:30:37Z

Ok, so I can confirm the 2.x binaries are working with 8.0.402/9.0.100 and WinAppSDK 1.6!

Two small updates left to adjust the RIDs and to make the right nuget dependencies. Getting there!

mattleibow · 2024-10-23T01:15:59Z

/azp run

azure-pipelines · 2024-10-23T01:16:07Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-23T01:17:54Z

Ok, so I can confirm the 2.x binaries are working with 8.0.402/9.0.100 and WinAppSDK 1.6!

What about older wasdk?

mattleibow · 2024-10-23T01:54:50Z

/azp run

azure-pipelines · 2024-10-23T01:54:57Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-23T02:00:23Z

/azp run

azure-pipelines · 2024-10-23T02:00:29Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

mattleibow · 2024-10-23T02:05:56Z

/azp run

azure-pipelines · 2024-10-23T02:06:03Z

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

dotnet-policy-service bot added the community ✨ label Oct 15, 2024

jeromelaban force-pushed the dev/jela/issue2999-2x branch from d410c88 to 3144478 Compare October 19, 2024 13:39

mattleibow reviewed Oct 20, 2024

View reviewed changes

source/SkiaSharp.Build.props Outdated Show resolved Hide resolved

mattleibow reviewed Oct 20, 2024

View reviewed changes

...ative/SkiaSharp.Views.WinUI.Native.Projection/SkiaSharp.Views.WinUI.Native.Projection.csproj Outdated Show resolved Hide resolved

mattleibow reviewed Oct 20, 2024

View reviewed changes

binding/SkiaSharp.NativeAssets.WinUI/SkiaSharp.NativeAssets.WinUI.csproj Outdated Show resolved Hide resolved

jeromelaban force-pushed the dev/jela/issue2999-2x branch from 9a99ef6 to a72ff59 Compare October 23, 2024 01:58

fix: Add WinUI native helper for GetByteBuffer

0a52a96

jeromelaban force-pushed the dev/jela/issue2999-2x branch from a72ff59 to 0a52a96 Compare October 23, 2024 02:04

mattleibow marked this pull request as ready for review October 23, 2024 04:51

mattleibow approved these changes Oct 23, 2024

View reviewed changes

mattleibow merged commit 94a2734 into mono:release/2.x Oct 23, 2024
84 checks passed

jeromelaban deleted the dev/jela/issue2999-2x branch October 23, 2024 12:57

fix: Add WinUI native helper for GetByteBuffer #3039

fix: Add WinUI native helper for GetByteBuffer #3039

Conversation

jeromelaban commented Oct 15, 2024

jeromelaban commented Oct 15, 2024

azure-pipelines bot commented Oct 15, 2024

jeromelaban commented Oct 15, 2024 • edited Loading

mattleibow commented Oct 16, 2024

azure-pipelines bot commented Oct 16, 2024

jeromelaban commented Oct 17, 2024

azure-pipelines bot commented Oct 17, 2024

mattleibow commented Oct 17, 2024

azure-pipelines bot commented Oct 17, 2024

mattleibow commented Oct 18, 2024

azure-pipelines bot commented Oct 18, 2024

mattleibow commented Oct 18, 2024

azure-pipelines bot commented Oct 18, 2024

mattleibow commented Oct 18, 2024

azure-pipelines bot commented Oct 18, 2024

mattleibow commented Oct 19, 2024

mattleibow commented Oct 19, 2024

azure-pipelines bot commented Oct 19, 2024

mattleibow commented Oct 20, 2024

azure-pipelines bot commented Oct 20, 2024

mattleibow commented Oct 20, 2024

mattleibow commented Oct 21, 2024

azure-pipelines bot commented Oct 21, 2024

mattleibow commented Oct 21, 2024

mattleibow commented Oct 21, 2024

jeromelaban commented Oct 21, 2024

mattleibow commented Oct 21, 2024

mattleibow commented Oct 21, 2024 • edited Loading

mattleibow commented Oct 21, 2024

azure-pipelines bot commented Oct 21, 2024

mattleibow commented Oct 21, 2024

azure-pipelines bot commented Oct 21, 2024

mattleibow commented Oct 22, 2024

mattleibow commented Oct 22, 2024 • edited Loading

mattleibow commented Oct 22, 2024

azure-pipelines bot commented Oct 22, 2024

charlesroddie commented Oct 22, 2024

jeromelaban commented Oct 22, 2024

jeromelaban commented Oct 23, 2024 • edited Loading

mattleibow commented Oct 23, 2024

azure-pipelines bot commented Oct 23, 2024

mattleibow commented Oct 23, 2024

mattleibow commented Oct 23, 2024

azure-pipelines bot commented Oct 23, 2024

mattleibow commented Oct 23, 2024

azure-pipelines bot commented Oct 23, 2024

mattleibow commented Oct 23, 2024

azure-pipelines bot commented Oct 23, 2024

jeromelaban commented Oct 15, 2024 •

edited

Loading

mattleibow commented Oct 21, 2024 •

edited

Loading

mattleibow commented Oct 22, 2024 •

edited

Loading

jeromelaban commented Oct 23, 2024 •

edited

Loading