File tree 7 files changed +15
-25
lines changed
Microsoft_UI_Xaml_Controls 7 files changed +15
-25
lines changed Original file line number Diff line number Diff line change @@ -17,6 +17,5 @@ internal static class UnoTarget
17
17
18
18
// Legacy
19
19
public const string SkiaWpf = "skia-wpf" ;
20
- public const string SkiaGtk = "skia-gtk" ;
21
20
public const string SkiaLinuxFramebuffer = "skia-linux-fb" ;
22
21
}
Original file line number Diff line number Diff line change @@ -54,7 +54,6 @@ private static bool IsCurrentTarget(RuntimeTestPlatforms singlePlatform)
54
54
RuntimeTestPlatforms . NativeIOS => IsNativeIOS ( ) ,
55
55
RuntimeTestPlatforms . NativeMacCatalyst => IsNativeMacCatalyst ( ) ,
56
56
RuntimeTestPlatforms . NativeTvOS => IsNativetvOS ( ) ,
57
- RuntimeTestPlatforms . SkiaGtk => IsSkia ( ) && IsSkiaGtk ( ) ,
58
57
RuntimeTestPlatforms . SkiaWpf => IsSkia ( ) && IsSkiaWpf ( ) ,
59
58
RuntimeTestPlatforms . SkiaWin32 => IsSkia ( ) && IsSkiaWin32 ( ) ,
60
59
RuntimeTestPlatforms . SkiaX11 => IsSkia ( ) && IsSkiaX11 ( ) ,
@@ -90,9 +89,6 @@ private static bool IsWinUI() =>
90
89
false ;
91
90
#endif
92
91
93
- private static bool IsSkiaGtk ( )
94
- => IsSkiaHostAssembly ( "Uno.UI.Runtime.Skia.Gtk" ) ;
95
-
96
92
private static bool IsSkiaWpf ( )
97
93
=> IsSkiaHostAssembly ( "Uno.UI.Runtime.Skia.Wpf" ) ;
98
94
Original file line number Diff line number Diff line change @@ -13,23 +13,22 @@ public enum RuntimeTestPlatforms
13
13
NativeTvOS = 1 << 5 ,
14
14
15
15
// 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 ,
27
26
28
27
// Combined platforms
29
28
NativeUIKit = NativeIOS | NativeTvOS | NativeMacCatalyst ,
30
29
SkiaUIKit = SkiaIOS | SkiaTvOS | SkiaMacCatalyst ,
31
30
SkiaMobile = SkiaAndroid | SkiaUIKit ,
32
- SkiaDesktop = SkiaGtk | SkiaWpf | SkiaWin32 | SkiaX11 | SkiaMacOS | SkiaIslands ,
31
+ SkiaDesktop = SkiaWpf | SkiaWin32 | SkiaX11 | SkiaMacOS | SkiaIslands ,
33
32
Skia = SkiaDesktop | SkiaWasm | SkiaMobile ,
34
33
Native = NativeWasm | NativeAndroid | NativeIOS | NativeMacCatalyst | NativeTvOS | NativeWinUI ,
35
34
}
Original file line number Diff line number Diff line change @@ -57,7 +57,6 @@ private static bool IsCurrentTarget(RuntimeTestPlatforms singlePlatform)
57
57
RuntimeTestPlatforms . NativeIOS => IsNativeIOS ( ) ,
58
58
RuntimeTestPlatforms . NativeMacCatalyst => IsNativeMacCatalyst ( ) ,
59
59
RuntimeTestPlatforms . NativeTvOS => IsNativetvOS ( ) ,
60
- RuntimeTestPlatforms . SkiaGtk => IsSkia ( ) && IsSkiaGtk ( ) ,
61
60
RuntimeTestPlatforms . SkiaWpf => IsSkia ( ) && IsSkiaWpf ( ) ,
62
61
RuntimeTestPlatforms . SkiaWin32 => IsSkia ( ) && IsSkiaWin32 ( ) ,
63
62
RuntimeTestPlatforms . SkiaX11 => IsSkia ( ) && IsSkiaX11 ( ) ,
@@ -93,9 +92,6 @@ private static bool IsWinUI() =>
93
92
false ;
94
93
#endif
95
94
96
- private static bool IsSkiaGtk ( )
97
- => IsSkiaHostAssembly ( "Uno.UI.Runtime.Skia.Gtk" ) ;
98
-
99
95
private static bool IsSkiaWpf ( )
100
96
=> IsSkiaHostAssembly ( "Uno.UI.Runtime.Skia.Wpf" ) ;
101
97
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ namespace Uno.UI.RuntimeTests.Tests.Microsoft_UI_Xaml_Controls;
27
27
28
28
#if ! HAS_UNO || __ANDROID__ || __IOS__ || __SKIA__
29
29
[ 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 ) ]
31
31
public class Given_WebView2
32
32
{
33
33
[ ConditionalTest ( IgnoredPlatforms = RuntimeTestPlatforms . NativeUIKit | RuntimeTestPlatforms . SkiaUIKit ) ]
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls
10
10
{
11
11
public partial class Given_ContentControl
12
12
{
13
- [ ConditionalTest ( IgnoredPlatforms = ~ ( RuntimeTestPlatforms . SkiaGtk | RuntimeTestPlatforms . SkiaWpf ) ) ]
13
+ [ ConditionalTest ( IgnoredPlatforms = ~ ( RuntimeTestPlatforms . SkiaWpf ) ) ]
14
14
public async Task When_Native_Element ( )
15
15
{
16
16
var checkButtonType =
@@ -34,7 +34,7 @@ RuntimeTestsPlatformHelper.CurrentPlatform is RuntimeTestPlatforms.SkiaWpf
34
34
Assert . IsTrue ( SUT . IsNativeHost ) ;
35
35
}
36
36
37
- [ ConditionalTest ( IgnoredPlatforms = ( RuntimeTestPlatforms . Skia | RuntimeTestPlatforms . Native ) & ~ ( RuntimeTestPlatforms . SkiaGtk | RuntimeTestPlatforms . SkiaWpf ) ) ]
37
+ [ ConditionalTest ( IgnoredPlatforms = ( RuntimeTestPlatforms . Skia | RuntimeTestPlatforms . Native ) & ~ ( RuntimeTestPlatforms . SkiaWpf ) ) ]
38
38
public async Task When_Native_Element_Detached ( )
39
39
{
40
40
var checkButtonType =
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls;
23
23
#if ( ! HAS_UNO || __ANDROID__ || __IOS__ || __SKIA__ ) && ! WINAPPSDK
24
24
[ RunsOnUIThread ]
25
25
// 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 ) ]
27
27
public class Given_WebView
28
28
{
29
29
[ TestMethod ]
You can’t perform that action at this time.
0 commit comments