fix(skia): Add default implementation for AnalyticsInfo

unoplatform · Sep 12, 2020 · a21ed13 · a21ed13
1 parent 9782346
commit a21ed13
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/src/Uno.UWP/Generated/3.0.0.0/Windows.System.Profile/AnalyticsInfo.cs b/src/Uno.UWP/Generated/3.0.0.0/Windows.System.Profile/AnalyticsInfo.cs
@@ -7,7 +7,7 @@ namespace Windows.System.Profile
 	#endif
 	public  partial class AnalyticsInfo 
 	{
-		#if false || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || false
+		#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("NET461", "__SKIA__", "__NETSTD_REFERENCE__")]
 		public static string DeviceForm
 		{
@@ -17,7 +17,7 @@ public static string DeviceForm
 			}
 		}
 		#endif
-		#if false || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || false
+		#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("NET461", "__SKIA__", "__NETSTD_REFERENCE__")]
 		public static global::Windows.System.Profile.AnalyticsVersionInfo VersionInfo
 		{

diff --git a/src/Uno.UWP/Generated/3.0.0.0/Windows.System.Profile/AnalyticsVersionInfo.cs b/src/Uno.UWP/Generated/3.0.0.0/Windows.System.Profile/AnalyticsVersionInfo.cs
@@ -2,12 +2,12 @@
 #pragma warning disable 114 // new keyword hiding
 namespace Windows.System.Profile
 {
-	#if false || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || false
+	#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
 	[global::Uno.NotImplemented]
 	#endif
 	public  partial class AnalyticsVersionInfo 
 	{
-		#if false || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || false
+		#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("NET461", "__SKIA__", "__NETSTD_REFERENCE__")]
 		public  string DeviceFamily
 		{
@@ -17,7 +17,7 @@ public  string DeviceFamily
 			}
 		}
 		#endif
-		#if false || false || NET461 || false || __SKIA__ || __NETSTD_REFERENCE__ || false
+		#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("NET461", "__SKIA__", "__NETSTD_REFERENCE__")]
 		public  string DeviceFamilyVersion
 		{

diff --git a/src/Uno.UWP/System/Profile/AnalyticsInfo.cs b/src/Uno.UWP/System/Profile/AnalyticsInfo.cs
@@ -2,7 +2,7 @@ namespace Windows.System.Profile
 {
 	public static partial class AnalyticsInfo
 	{
-#if __ANDROID__ || __IOS__ || __WASM__ || __MACOS__
+#if __ANDROID__ || __IOS__ || __WASM__ || __MACOS__ || __SKIA__
 		public static string DeviceForm => GetDeviceForm().ToString();
 
 		public static AnalyticsVersionInfo VersionInfo { get; } = new AnalyticsVersionInfo();

diff --git a/src/Uno.UWP/System/Profile/AnalyticsInfo.skia.cs b/src/Uno.UWP/System/Profile/AnalyticsInfo.skia.cs
@@ -0,0 +1,10 @@
+#if __SKIA__
+
+namespace Windows.System.Profile
+{
+	public static partial class AnalyticsInfo
+	{
+		private static UnoDeviceForm GetDeviceForm() => UnoDeviceForm.Unknown;
+	}
+}
+#endif
diff --git a/src/Uno.UWP/System/Profile/AnalyticsVersionInfo.skia.cs b/src/Uno.UWP/System/Profile/AnalyticsVersionInfo.skia.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Windows.System.Profile
+{
+    public partial class AnalyticsVersionInfo
+    {
+        internal AnalyticsVersionInfo()
+        {
+        }
+
+        public string DeviceFamily => Environment.OSVersion.Platform.ToString();
+
+        public string DeviceFamilyVersion => Environment.OSVersion.VersionString;
+    }
+}