Skip to content

fix: Add WinUI native helper for GetByteBuffer - #3039

Merged
mattleibow merged 1 commit into
mono:release/2.xfrom
unoplatform:dev/jela/issue2999-2x
Oct 23, 2024
Merged

mattleibow merged 1 commit into
mono:release/2.xfrom
unoplatform:dev/jela/issue2999-2x

Conversation

@jeromelaban

Copy link
Copy Markdown
Contributor

Description of Change

Backports changes from #2920 to the 2x branch.

Bugs Fixed

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

Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines

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

@jeromelaban

jeromelaban commented Oct 15, 2024 •

Copy link
Copy Markdown
Contributor Author

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

@mattleibow

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@jeromelaban

Copy link
Copy Markdown
Contributor Author

/azp run

@azure-pipelines

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

@mattleibow

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@mattleibow

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@mattleibow

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@mattleibow

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@mattleibow

Copy link
Copy Markdown
Contributor

/rebase

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

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@mattleibow

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

Comment thread source/SkiaSharp.Build.props Resolved
@mattleibow

Copy link
Copy Markdown
Contributor

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

Still not green yet, but closer i think?

@mattleibow

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@mattleibow

Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

building now and will see unoplatform#35

@azure-pipelines

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

@mattleibow

Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

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

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

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

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

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

@mattleibow
mattleibow marked this pull request as ready for review October 23, 2024 04:51
@mattleibow
mattleibow merged commit 94a2734 into mono:release/2.x Oct 23, 2024
@jeromelaban
jeromelaban deleted the dev/jela/issue2999-2x branch October 23, 2024 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants