-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Update SkiaSharp to the latest stable version (2.88.6) #17558
Conversation
Thanks @mattleibow! Any estimation for when this PR will be released? As I'm sure you're aware, a security vulnerability was reported on There's many libraries that use The biggest headache I've discovered so far is that The good news is that we've patched it in tl;dr There's security vulnerability in SkiaSharp, patched in |
/azp run |
Azure Pipelines successfully started running 3 pipeline(s). |
c37907a
to
2226056
Compare
/backport to net7.0 |
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/6302042011 |
@mattleibow backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update SkiaSharp to 2.88.6
.git/rebase-apply/patch:225: trailing whitespace.
// native library loading logic for the .NET Framework (Visual Studio).
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M eng/Microsoft.Extensions.targets
M eng/Versions.props
M src/Graphics/samples/GraphicsTester.Skia.Mac/GraphicsTester.Skia.Mac.csproj
M src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems
M src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
CONFLICT (content): Merge conflict in src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
Auto-merging src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems
CONFLICT (content): Merge conflict in src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems
Auto-merging src/Graphics/samples/GraphicsTester.Skia.Mac/GraphicsTester.Skia.Mac.csproj
Auto-merging eng/Versions.props
Auto-merging eng/Microsoft.Extensions.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update SkiaSharp to 2.88.6
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@mattleibow an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Backport in #17663 |
Description of Change
Time to get new things!