Skip to content

Commit cbc9f13

Browse files
committed
fix: Remove GTK references
1 parent b317d07 commit cbc9f13

File tree

7 files changed

+15
-25
lines changed

7 files changed

+15
-25
lines changed

src/Uno.Sdk/UnoTarget.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ internal static class UnoTarget
1717

1818
// Legacy
1919
public const string SkiaWpf = "skia-wpf";
20-
public const string SkiaGtk = "skia-gtk";
2120
public const string SkiaLinuxFramebuffer = "skia-linux-fb";
2221
}

src/Uno.UI.RuntimeTests/Helpers/ConditionalTestHelper.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ private static bool IsCurrentTarget(RuntimeTestPlatforms singlePlatform)
5454
RuntimeTestPlatforms.NativeIOS => IsNativeIOS(),
5555
RuntimeTestPlatforms.NativeMacCatalyst => IsNativeMacCatalyst(),
5656
RuntimeTestPlatforms.NativeTvOS => IsNativetvOS(),
57-
RuntimeTestPlatforms.SkiaGtk => IsSkia() && IsSkiaGtk(),
5857
RuntimeTestPlatforms.SkiaWpf => IsSkia() && IsSkiaWpf(),
5958
RuntimeTestPlatforms.SkiaWin32 => IsSkia() && IsSkiaWin32(),
6059
RuntimeTestPlatforms.SkiaX11 => IsSkia() && IsSkiaX11(),
@@ -90,9 +89,6 @@ private static bool IsWinUI() =>
9089
false;
9190
#endif
9291

93-
private static bool IsSkiaGtk()
94-
=> IsSkiaHostAssembly("Uno.UI.Runtime.Skia.Gtk");
95-
9692
private static bool IsSkiaWpf()
9793
=> IsSkiaHostAssembly("Uno.UI.Runtime.Skia.Wpf");
9894

src/Uno.UI.RuntimeTests/Helpers/RuntimeTestPlatforms.cs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,22 @@ public enum RuntimeTestPlatforms
1313
NativeTvOS = 1 << 5,
1414

1515
// Skia platforms
16-
SkiaGtk = 1 << 6,
17-
SkiaWpf = 1 << 7,
18-
SkiaWin32 = 1 << 8,
19-
SkiaX11 = 1 << 9,
20-
SkiaMacOS = 1 << 10,
21-
SkiaIslands = 1 << 11,
22-
SkiaWasm = 1 << 12,
23-
SkiaAndroid = 1 << 13,
24-
SkiaIOS = 1 << 14,
25-
SkiaMacCatalyst = 1 << 15,
26-
SkiaTvOS = 1 << 16,
16+
SkiaWpf = 1 << 6,
17+
SkiaWin32 = 1 << 7,
18+
SkiaX11 = 1 << 8,
19+
SkiaMacOS = 1 << 9,
20+
SkiaIslands = 1 << 10,
21+
SkiaWasm = 1 << 11,
22+
SkiaAndroid = 1 << 12,
23+
SkiaIOS = 1 << 13,
24+
SkiaMacCatalyst = 1 << 14,
25+
SkiaTvOS = 1 << 15,
2726

2827
// Combined platforms
2928
NativeUIKit = NativeIOS | NativeTvOS | NativeMacCatalyst,
3029
SkiaUIKit = SkiaIOS | SkiaTvOS | SkiaMacCatalyst,
3130
SkiaMobile = SkiaAndroid | SkiaUIKit,
32-
SkiaDesktop = SkiaGtk | SkiaWpf | SkiaWin32 | SkiaX11 | SkiaMacOS | SkiaIslands,
31+
SkiaDesktop = SkiaWpf | SkiaWin32 | SkiaX11 | SkiaMacOS | SkiaIslands,
3332
Skia = SkiaDesktop | SkiaWasm | SkiaMobile,
3433
Native = NativeWasm | NativeAndroid | NativeIOS | NativeMacCatalyst | NativeTvOS | NativeWinUI,
3534
}

src/Uno.UI.RuntimeTests/Helpers/RuntimeTestsPlatformHelper.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ private static bool IsCurrentTarget(RuntimeTestPlatforms singlePlatform)
5757
RuntimeTestPlatforms.NativeIOS => IsNativeIOS(),
5858
RuntimeTestPlatforms.NativeMacCatalyst => IsNativeMacCatalyst(),
5959
RuntimeTestPlatforms.NativeTvOS => IsNativetvOS(),
60-
RuntimeTestPlatforms.SkiaGtk => IsSkia() && IsSkiaGtk(),
6160
RuntimeTestPlatforms.SkiaWpf => IsSkia() && IsSkiaWpf(),
6261
RuntimeTestPlatforms.SkiaWin32 => IsSkia() && IsSkiaWin32(),
6362
RuntimeTestPlatforms.SkiaX11 => IsSkia() && IsSkiaX11(),
@@ -93,9 +92,6 @@ private static bool IsWinUI() =>
9392
false;
9493
#endif
9594

96-
private static bool IsSkiaGtk()
97-
=> IsSkiaHostAssembly("Uno.UI.Runtime.Skia.Gtk");
98-
9995
private static bool IsSkiaWpf()
10096
=> IsSkiaHostAssembly("Uno.UI.Runtime.Skia.Wpf");
10197

src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Uno.UI.RuntimeTests.Tests.Microsoft_UI_Xaml_Controls;
2727

2828
#if !HAS_UNO || __ANDROID__ || __IOS__ || __SKIA__
2929
[RunsOnUIThread]
30-
[ConditionalTestClass(IgnoredPlatforms = RuntimeTestPlatforms.SkiaGtk | RuntimeTestPlatforms.SkiaWpf | RuntimeTestPlatforms.SkiaWin32 | RuntimeTestPlatforms.SkiaWasm | RuntimeTestPlatforms.SkiaIslands)]
30+
[ConditionalTestClass(IgnoredPlatforms = RuntimeTestPlatforms.SkiaWpf | RuntimeTestPlatforms.SkiaWin32 | RuntimeTestPlatforms.SkiaWasm | RuntimeTestPlatforms.SkiaIslands)]
3131
public class Given_WebView2
3232
{
3333
[ConditionalTest(IgnoredPlatforms = RuntimeTestPlatforms.NativeUIKit | RuntimeTestPlatforms.SkiaUIKit)]

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ContentControl.NativeElement.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls
1010
{
1111
public partial class Given_ContentControl
1212
{
13-
[ConditionalTest(IgnoredPlatforms = ~(RuntimeTestPlatforms.SkiaGtk | RuntimeTestPlatforms.SkiaWpf))]
13+
[ConditionalTest(IgnoredPlatforms = ~(RuntimeTestPlatforms.SkiaWpf))]
1414
public async Task When_Native_Element()
1515
{
1616
var checkButtonType =
@@ -34,7 +34,7 @@ RuntimeTestsPlatformHelper.CurrentPlatform is RuntimeTestPlatforms.SkiaWpf
3434
Assert.IsTrue(SUT.IsNativeHost);
3535
}
3636

37-
[ConditionalTest(IgnoredPlatforms = (RuntimeTestPlatforms.Skia | RuntimeTestPlatforms.Native) & ~(RuntimeTestPlatforms.SkiaGtk | RuntimeTestPlatforms.SkiaWpf))]
37+
[ConditionalTest(IgnoredPlatforms = (RuntimeTestPlatforms.Skia | RuntimeTestPlatforms.Native) & ~(RuntimeTestPlatforms.SkiaWpf))]
3838
public async Task When_Native_Element_Detached()
3939
{
4040
var checkButtonType =

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_WebView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls;
2323
#if (!HAS_UNO || __ANDROID__ || __IOS__ || __SKIA__) && !WINAPPSDK
2424
[RunsOnUIThread]
2525
// only SkiaMacOS right now
26-
[ConditionalTestClass(IgnoredPlatforms = RuntimeTestPlatforms.SkiaGtk | RuntimeTestPlatforms.SkiaWin32 | RuntimeTestPlatforms.SkiaWpf | RuntimeTestPlatforms.SkiaX11 | RuntimeTestPlatforms.SkiaWasm | RuntimeTestPlatforms.SkiaIslands)]
26+
[ConditionalTestClass(IgnoredPlatforms = RuntimeTestPlatforms.SkiaWin32 | RuntimeTestPlatforms.SkiaWpf | RuntimeTestPlatforms.SkiaX11 | RuntimeTestPlatforms.SkiaWasm | RuntimeTestPlatforms.SkiaIslands)]
2727
public class Given_WebView
2828
{
2929
[TestMethod]

0 commit comments

Comments
 (0)