Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
"type": "git",
"git": {
"repositoryUrl": "https://github.com/mono/skia.git",
"commitHash": "b16789ec352c37e02ad38dbac55e6f47d22ff87f"
"commitHash": "5209f4a49b55104de2c521fc6f605aee530e4cd8"
}
}
},
Expand All @@ -226,12 +226,12 @@
"type": "other",
"other": {
"name": "skia",
"version": "chrome/m150",
"version": "chrome/m151",
"downloadUrl": "https://github.com/google/skia"
}
},
"chrome_milestone": 150,
"upstream_merge_commit": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0"
"chrome_milestone": 151,
"upstream_merge_commit": "79e2e1538e94bb1d6b5bbbc56279036aa7574b10"
}
]
}
2 changes: 1 addition & 1 deletion externals/skia
Submodule skia updated 2701 files
1 change: 1 addition & 0 deletions native/android/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Task("libSkiaSharp")
$"target_os='android' " +
$"skia_use_harfbuzz=false " +
$"skia_use_icu=false " +
$"skia_use_partition_alloc=false " +
$"skia_use_piex=true " +
$"skia_use_system_expat=false " +
$"skia_use_system_freetype2=false " +
Expand Down
1 change: 1 addition & 0 deletions native/ios/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Task("libSkiaSharp")
$"skia_use_harfbuzz=false " +
$"skia_use_icu=false " +
$"skia_use_metal=true " +
$"skia_use_partition_alloc=false " +
$"skia_use_piex=true " +
$"skia_use_system_expat=false " +
$"skia_use_system_libjpeg_turbo=false " +
Expand Down
2 changes: 2 additions & 0 deletions native/linux/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ Task("libSkiaSharp")
$"skia_enable_ganesh={(SUPPORT_GPU ? "true" : "false")} " +
$"skia_use_harfbuzz=false " +
$"skia_use_icu=false " +
$"skia_use_partition_alloc=false " +
$"skia_use_piex=true " +
$"skia_use_system_expat=false " +
$"skia_use_system_freetype2=false " +
Expand Down Expand Up @@ -153,6 +154,7 @@ Task("libHarfBuzzSharp")
$"target_os='linux' " +
$"target_cpu='{skiaArch}' " +
$"visibility_hidden=false " +
$"skia_use_partition_alloc=false " +
$"extra_asmflags=[] " +
$"extra_cflags=[ '-stdlib=libc++'{bionicDefineHB} ] " +
$"extra_ldflags=[ '-stdlib=libc++', '-static-libgcc'{staticLibcxxHB}, '-Wl,--version-script={map}' ] " +
Expand Down
1 change: 1 addition & 0 deletions native/macos/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Task("libSkiaSharp")
$"skia_use_harfbuzz=false " +
$"skia_use_icu=false " +
$"skia_use_metal=true " +
$"skia_use_partition_alloc=false " +
$"skia_use_piex=true " +
$"skia_use_system_expat=false " +
$"skia_use_system_libjpeg_turbo=false " +
Expand Down
1 change: 1 addition & 0 deletions native/tizen/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Task("libSkiaSharp")
$"skia_enable_ganesh=true " +
$"skia_use_harfbuzz=false " +
$"skia_use_icu=false " +
$"skia_use_partition_alloc=false " +
$"skia_use_piex=true " +
$"skia_use_system_expat=false " +
$"skia_use_system_freetype2=true " +
Expand Down
1 change: 1 addition & 0 deletions native/tvos/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Task("libSkiaSharp")
$"skia_use_harfbuzz=false " +
$"skia_use_icu=false " +
$"skia_use_metal=true " +
$"skia_use_partition_alloc=false " +
$"skia_use_piex=true " +
$"skia_use_system_expat=false " +
$"skia_use_system_libjpeg_turbo=false " +
Expand Down
2 changes: 2 additions & 0 deletions native/wasm/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Task("libSkiaSharp")
$"skia_use_freetype=true " +
$"skia_use_harfbuzz=false " +
$"skia_use_icu=false " +
$"skia_use_partition_alloc=false " +
$"skia_use_piex=false " +
$"skia_use_expat=true " +
$"skia_use_libwebp_encode=true " +
Expand Down Expand Up @@ -125,6 +126,7 @@ Task("libHarfBuzzSharp")
$"target_os='linux' " +
$"target_cpu='wasm' " +
$"is_static_skiasharp=true " +
$"skia_use_partition_alloc=false " +
$"extra_cflags=[ '-s', 'WARN_UNALIGNED=1' { (hasSimdEnabled ? ", '-msimd128'" : "") } { (hasThreadingEnabled ? ", '-pthread'" : "") } { (hasWasmEH ? ", '-fwasm-exceptions'" : "") } ] " +
$"extra_cflags_cc=[ '-frtti' { (hasSimdEnabled ? ", '-msimd128'" : "") } { (hasThreadingEnabled ? ", '-pthread'" : "") } { (hasWasmEH ? ", '-fwasm-exceptions'" : "") } ] " +
$"skia_emsdk_dir='{EMSCRIPTEN_ROOT}'" +
Expand Down
1 change: 1 addition & 0 deletions native/windows/build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Task("libSkiaSharp")
$"skia_use_dng_sdk=true " +
$"skia_use_harfbuzz=false " +
$"skia_use_icu=false " +
$"skia_use_partition_alloc=false " +
$"skia_use_piex=true " +
$"skia_use_system_expat=false " +
$"skia_use_system_libjpeg_turbo=false " +
Expand Down
70 changes: 35 additions & 35 deletions scripts/VERSIONS.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# native sources
harfbuzz release 14.2.1
skia release m150
skia release m151
ANGLE release chromium/6275

# product dependencies
Expand Down Expand Up @@ -65,56 +65,56 @@ xunit.runner.console release 2.4.2
# this is related to the API versions, not the library versions
# - milestone: the skia milestone determined by Google/Chromium
# - increment: the C API version increment caused by new APIs (externals\skia\include\c\sk_types.h)
libSkiaSharp milestone 150
libSkiaSharp milestone 151
libSkiaSharp increment 0

# native sonames
# <milestone>.<increment>.0
libSkiaSharp soname 150.0.0
libSkiaSharp soname 151.0.0
# 0.<60000 + major*100 + minor*10 + micro>.0
HarfBuzz soname 0.61421.0

# SkiaSharp.dll
# SkiaSharp.dll
SkiaSharp assembly 4.150.0.0
SkiaSharp file 4.150.0.0
SkiaSharp assembly 4.151.0.0
SkiaSharp file 4.151.0.0

# HarfBuzzSharp.dll
HarfBuzzSharp assembly 1.0.0.0
HarfBuzzSharp file 14.2.1

# nuget versions
# SkiaSharp
SkiaSharp nuget 4.150.0
SkiaSharp.NativeAssets.Linux nuget 4.150.0
SkiaSharp.NativeAssets.Linux.NoDependencies nuget 4.150.0
SkiaSharp.NativeAssets.NanoServer nuget 4.150.0
SkiaSharp.NativeAssets.WebAssembly nuget 4.150.0
SkiaSharp.NativeAssets.Android nuget 4.150.0
SkiaSharp.NativeAssets.iOS nuget 4.150.0
SkiaSharp.NativeAssets.MacCatalyst nuget 4.150.0
SkiaSharp.NativeAssets.macOS nuget 4.150.0
SkiaSharp.NativeAssets.Tizen nuget 4.150.0
SkiaSharp.NativeAssets.tvOS nuget 4.150.0
SkiaSharp.NativeAssets.Win32 nuget 4.150.0
SkiaSharp.NativeAssets.WinUI nuget 4.150.0
SkiaSharp.Views nuget 4.150.0
SkiaSharp.Views.Desktop.Common nuget 4.150.0
SkiaSharp.Views.Gtk3 nuget 4.150.0
SkiaSharp.Views.Gtk4 nuget 4.150.0
SkiaSharp.Views.WindowsForms nuget 4.150.0
SkiaSharp.Views.WPF nuget 4.150.0
SkiaSharp.Views.Uno.WinUI nuget 4.150.0
SkiaSharp.Views.WinUI nuget 4.150.0
SkiaSharp.Views.Maui.Core nuget 4.150.0
SkiaSharp.Views.Maui.Controls nuget 4.150.0
SkiaSharp.Views.Blazor nuget 4.150.0
SkiaSharp.HarfBuzz nuget 4.150.0
SkiaSharp.Skottie nuget 4.150.0
SkiaSharp.SceneGraph nuget 4.150.0
SkiaSharp.Resources nuget 4.150.0
SkiaSharp.Vulkan.SharpVk nuget 4.150.0
SkiaSharp.Direct3D.Vortice nuget 4.150.0
SkiaSharp nuget 4.151.0
SkiaSharp.NativeAssets.Linux nuget 4.151.0
SkiaSharp.NativeAssets.Linux.NoDependencies nuget 4.151.0
SkiaSharp.NativeAssets.NanoServer nuget 4.151.0
SkiaSharp.NativeAssets.WebAssembly nuget 4.151.0
SkiaSharp.NativeAssets.Android nuget 4.151.0
SkiaSharp.NativeAssets.iOS nuget 4.151.0
SkiaSharp.NativeAssets.MacCatalyst nuget 4.151.0
SkiaSharp.NativeAssets.macOS nuget 4.151.0
SkiaSharp.NativeAssets.Tizen nuget 4.151.0
SkiaSharp.NativeAssets.tvOS nuget 4.151.0
SkiaSharp.NativeAssets.Win32 nuget 4.151.0
SkiaSharp.NativeAssets.WinUI nuget 4.151.0
SkiaSharp.Views nuget 4.151.0
SkiaSharp.Views.Desktop.Common nuget 4.151.0
SkiaSharp.Views.Gtk3 nuget 4.151.0
SkiaSharp.Views.Gtk4 nuget 4.151.0
SkiaSharp.Views.WindowsForms nuget 4.151.0
SkiaSharp.Views.WPF nuget 4.151.0
SkiaSharp.Views.Uno.WinUI nuget 4.151.0
SkiaSharp.Views.WinUI nuget 4.151.0
SkiaSharp.Views.Maui.Core nuget 4.151.0
SkiaSharp.Views.Maui.Controls nuget 4.151.0
SkiaSharp.Views.Blazor nuget 4.151.0
SkiaSharp.HarfBuzz nuget 4.151.0
SkiaSharp.Skottie nuget 4.151.0
SkiaSharp.SceneGraph nuget 4.151.0
SkiaSharp.Resources nuget 4.151.0
SkiaSharp.Vulkan.SharpVk nuget 4.151.0
SkiaSharp.Direct3D.Vortice nuget 4.151.0
# HarfBuzzSharp
HarfBuzzSharp nuget 14.2.1
HarfBuzzSharp.NativeAssets.Android nuget 14.2.1
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-templates-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ variables:
# It must match the SkiaSharp nuget version in scripts/VERSIONS.txt.
# SKIASHARP_VERSION is used in the BUILD_NUMBER counter expression below,
# which requires a compile-time constant (cannot be derived dynamically).
SKIASHARP_VERSION: 4.150.0
SKIASHARP_VERSION: 4.151.0
FEATURE_NAME_PREFIX: 'feature/'
VERBOSITY: normal
GIT_SHA: $(Build.SourceVersion)
Expand Down
5 changes: 3 additions & 2 deletions scripts/infra/docs/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"support": {
"$comment": "SkiaSharp's SUPPORTED release paths, used only by the release-notes TOC/index grouping. SkiaSharp ships NuGet packages on two paths (it is NOT a multi-tier channel product), so this is two lists of 'major.minor' lines (the SkiaSharp MINOR number IS the Chrome/Skia milestone). 'stable' = the supported stable line(s): normally the current Chrome Stable milestone, or the Chrome Extended-stable milestone during the promotion gap (when a preview is about to go stable). 'preview' = the in-flight preview/RC line(s): normally the Chrome Beta milestone, or newer when we are previewing ahead in Dev/Canary. Every other 3.x+ line is OUT OF SUPPORT; 1.x/2.x lines are OBSOLETE. MAINTAINED BY HAND on each release (we do not ship every Chrome milestone, so this must not be auto-derived from Chromium Dash). The security audit's heads-up check (.agents/skills/security-audit/scripts/query-milestone-schedule.py) compares these lists to the live Chrome channels and reports drift; the fix is always a manual edit here. Empty/absent block => every 3.x+ line is treated as supported (legacy behavior).",
"stable": [
"4.148"
"4.148",
"4.150"
],
"preview": [
"4.150"
"4.151"
]
},
"skiasharp": {
Expand Down
Loading