Merge pull request #1147 from Youssef1313/cleanup-after-single-project

chore: Cleanup after single project transition
unoplatform · Jul 29, 2024 · 58f5946 · 58f5946
2 parents 5bf87bb + be7b66e
commit 58f5946
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Uno.Gallery.SourceGenerators/SamplesGenerator.cs b/Uno.Gallery.SourceGenerators/SamplesGenerator.cs
@@ -121,9 +121,9 @@ private static SampleConditionals GetSampleConditionalsFromPreprocessorSymbolNam
 			{
 				return SampleConditionals.Wasm;
 			}
-			else if (preprocessorSymbol == "HAS_UNO_SKIA_GTK")
+			else if (preprocessorSymbol == "HAS_UNO_SKIA")
 			{
-				return SampleConditionals.SkiaGtk;
+				return SampleConditionals.SkiaDesktop;
 			}
 		}
 

diff --git a/Uno.Gallery/Entities/SampleConditionals.cs b/Uno.Gallery/Entities/SampleConditionals.cs
@@ -9,15 +9,15 @@ public enum SampleConditionals : uint
 	{
 		Windows = 1 << 0,
 		Wasm = 1 << 1,
-		SkiaGtk = 1 << 2,
+		SkiaDesktop = 1 << 2,
 		Droid = 1 << 3,
 		iOS = 1 << 4,
 		macOS = 1 << 5,
 
-		Desktop = Windows | Wasm | SkiaGtk | macOS,
+		Desktop = Windows | Wasm | SkiaDesktop | macOS,
 		Mobile = Droid | iOS,
-		SkiaBased = Wasm | SkiaGtk,
-		
+		SkiaBased = Wasm | SkiaDesktop,
+
 		Disabled = 1U << 31,
 		Always = uint.MaxValue ^ Disabled,
 	}

diff --git a/Uno.Gallery/Views/SamplePages/GyrometerSamplePage.xaml.cs b/Uno.Gallery/Views/SamplePages/GyrometerSamplePage.xaml.cs
@@ -12,7 +12,7 @@ namespace Uno.Gallery.Views.Samples
 		Description = "Represents a Gyrometer sensor that provides angular velocity values with respect to the x, y, and z axes.",
 		DocumentationLink = "https://platform.uno/docs/articles/features/gyrometer.html",
 		DataType = typeof(GyrometerSamplePageViewModel))]
-	[SampleConditional(SampleConditionals.Always ^ SampleConditionals.SkiaGtk, Reason = "Not supported")]
+	[SampleConditional(SampleConditionals.Always ^ SampleConditionals.SkiaDesktop, Reason = "Not supported")]
 	public sealed partial class GyrometerSamplePage : Page
 	{
 		public GyrometerSamplePage()

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -43,7 +43,7 @@ variables:
   IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
 
   XCODE_ROOT: '/Applications/Xcode_15.4.app'
-  
+
 jobs:
 - job: Windows_Android_Mobile
   strategy:
@@ -85,15 +85,15 @@ jobs:
   steps:
   - template: build/stage-build-windows.yml
 
-- job: Windows_SkiaGtk
+- job: Windows_Desktop
   pool:
     vmImage: windows-2022
 
   variables:
   - group: 'UADO Keystore' # Import all variables for the signing from the library in azure devops
 
   steps:
-  - template: build/stage-build-skia-gtk.yml
+  - template: build/stage-build-skia-desktop.yml
 
 - job: macOS_netcore
   strategy:

diff --git a/build/stage-build-skia-gtk.yml → build/stage-build-skia-desktop.yml b/build/stage-build-skia-gtk.yml → build/stage-build-skia-desktop.yml