fix: AnalyticsInfo and AnalyticsVersionInfo compatibility adjustments

src/Uno.UWP/Generated/3.0.0.0/Windows.System.Profile/AnalyticsInfo.cs

@@ -7,8 +7,8 @@ namespace Windows.System.Profile
 	#endif
 	public static partial class AnalyticsInfo 
 	{
-		#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
-		[global::Uno.NotImplemented("NET461", "__NETSTD_REFERENCE__")]
+		#if false || false || false || false || false || false || false
+		[global::Uno.NotImplemented]
 		public static string DeviceForm
 		{
 			get
@@ -17,8 +17,8 @@ public static string DeviceForm
 			}
 		}
 		#endif
-		#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
-		[global::Uno.NotImplemented("NET461", "__NETSTD_REFERENCE__")]
+		#if false || false || false || false || false || false || false
+		[global::Uno.NotImplemented]
 		public static global::Windows.System.Profile.AnalyticsVersionInfo VersionInfo
 		{
 			get

src/Uno.UWP/Generated/3.0.0.0/Windows.System.Profile/AnalyticsVersionInfo.cs

@@ -2,13 +2,13 @@
 #pragma warning disable 114 // new keyword hiding
 namespace Windows.System.Profile
 {
-	#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
+	#if false || false || false || false || false || false || false
 	[global::Uno.NotImplemented]
 	#endif
 	public  partial class AnalyticsVersionInfo 
 	{
-		#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
-		[global::Uno.NotImplemented("NET461", "__NETSTD_REFERENCE__")]
+		#if false || false || false || false || false || false || false
+		[global::Uno.NotImplemented]
 		public  string DeviceFamily
 		{
 			get
@@ -17,8 +17,8 @@ public  string DeviceFamily
 			}
 		}
 		#endif
-		#if false || false || NET461 || false || false || __NETSTD_REFERENCE__ || false
-		[global::Uno.NotImplemented("NET461", "__NETSTD_REFERENCE__")]
+		#if false || false || false || false || false || false || false
+		[global::Uno.NotImplemented]
 		public  string DeviceFamilyVersion
 		{
 			get

src/Uno.UWP/System/Profile/AnalyticsInfo.Android.cs

@@ -10,6 +10,7 @@
 using Android.Util;
 
 using Uno.Extensions;
+using Uno.System.Profile;
 using Uno.Foundation.Logging;
 
 namespace Windows.System.Profile

src/Uno.UWP/System/Profile/AnalyticsInfo.cs

@@ -1,11 +1,19 @@
 namespace Windows.System.Profile
 {
+	/// <summary>
+	/// Provides version information about the device family.
+	/// </summary>
 	public static partial class AnalyticsInfo
 	{
-#if __ANDROID__ || __IOS__ || __WASM__ || __MACOS__ || __SKIA__
+		/// <summary>
+		/// Gets the device form factor running the OS. For example,
+		/// the app could be running on a phone, tablet, desktop, and so on.
+		/// </summary>
 		public static string DeviceForm => GetDeviceForm().ToString();
 
+		/// <summary>
+		/// Gets version info about the device family.
+		/// </summary>
 		public static AnalyticsVersionInfo VersionInfo { get; } = new AnalyticsVersionInfo();
-#endif
 	}
 }

src/Uno.UWP/System/Profile/AnalyticsInfo.iOS.cs

@@ -1,4 +1,5 @@
 using UIKit;
+using Uno.System.Profile;
 
 namespace Windows.System.Profile
 {

src/Uno.UWP/System/Profile/AnalyticsInfo.macOS.cs

@@ -3,6 +3,7 @@
 using System.Runtime.InteropServices;
 using Foundation;
 using ObjCRuntime;
+using Uno.System.Profile;
 
 namespace Windows.System.Profile
 {

src/Uno.UWP/System/Profile/AnalyticsInfo.others.cs

@@ -0,0 +1,11 @@
+#if NET461 || __NETSTD_REFERENCE__
+using Uno.System.Profile;
+
+namespace Windows.System.Profile
+{
+	public partial class AnalyticsInfo
+    {
+		private static UnoDeviceForm GetDeviceForm() => UnoDeviceForm.Desktop;
+	}
+}
+#endif

src/Uno.UWP/System/Profile/AnalyticsInfo.skia.cs

@@ -2,6 +2,7 @@
 
 using System;
 using Uno.Foundation.Extensibility;
+using Uno.System.Profile;
 
 namespace Windows.System.Profile
 {
@@ -21,9 +22,4 @@ public static partial class AnalyticsInfo
 
 		private static UnoDeviceForm GetDeviceForm() => _analyticsInfoExtension.Value?.GetDeviceForm() ?? UnoDeviceForm.Unknown;
 	}
-
-	internal interface IAnalyticsInfoExtension
-	{
-		UnoDeviceForm GetDeviceForm();
-	}
 }

src/Uno.UWP/System/Profile/AnalyticsInfo.wasm.cs

@@ -1,5 +1,6 @@
 using System;
 using Uno.Foundation;
+using Uno.System.Profile;
 
 namespace Windows.System.Profile
 {

src/Uno.UWP/System/Profile/AnalyticsVersionInfo.Android.cs

@@ -1,4 +1,3 @@
-#if __ANDROID__
 using Android.OS;
 
 namespace Windows.System.Profile
@@ -7,13 +6,10 @@ public partial class AnalyticsVersionInfo
 	{
 		private const string OsName = "Android";
 
-		internal AnalyticsVersionInfo()
+		partial void Initialize()
 		{
+			DeviceFamily = $"{OsName}.{AnalyticsInfo.DeviceForm}";
+			DeviceFamilyVersion = Build.VERSION.Release;
 		}
-
-		public string DeviceFamily => OsName + '.' + AnalyticsInfo.DeviceForm;
-
-		public string DeviceFamilyVersion => Build.VERSION.Release;
 	}
 }
-#endif

src/Uno.UWP/System/Profile/AnalyticsVersionInfo.cs

@@ -0,0 +1,29 @@
+using System;
+using Uno;
+
+namespace Windows.System.Profile
+{
+	/// <summary>
+	/// Provides version information about the device family.
+	/// </summary>
+	public partial class AnalyticsVersionInfo
+	{
+		public AnalyticsVersionInfo() => Initialize();
+
+		partial void Initialize();
+
+		/// <summary>
+		/// Gets a string that represents the type of device the application is running on.
+		/// </summary>
+		public string DeviceFamily { get; private set; } = $"{Environment.OSVersion.Platform}.Desktop";
+
+		/// <summary>
+		/// Gets the version within the device family.
+		/// </summary>
+		/// <remarks>
+		/// Needs to be parsable long number.
+		/// </remarks>
+		[NotImplemented("__WASM__")]
+		public string DeviceFamilyVersion { get; private set; } = "0";
+	}
+}

src/Uno.UWP/System/Profile/AnalyticsVersionInfo.iOS.cs

@@ -1,19 +1,13 @@
-#if __IOS__
-using UIKit;
-
 namespace Windows.System.Profile
 {
 	public partial class AnalyticsVersionInfo
 	{
 		private const string OsName = "iOS";
 
-		internal AnalyticsVersionInfo()
+		partial void Initialize()
 		{
+			DeviceFamily = $"{OsName}.{AnalyticsInfo.DeviceForm}";
+			DeviceFamilyVersion = UIDevice.CurrentDevice.SystemVersion;
 		}
-
-		public string DeviceFamily => OsName + '.' + AnalyticsInfo.DeviceForm;
-
-		public string DeviceFamilyVersion => UIDevice.CurrentDevice.SystemVersion;
 	}
 }
-#endif

src/Uno.UWP/System/Profile/AnalyticsVersionInfo.macOS.cs

@@ -1,4 +1,3 @@
-#if __MACOS__
 using AppKit;
 using Foundation;
 
@@ -8,13 +7,14 @@ public partial class AnalyticsVersionInfo
 	{
 		private const string OsName = "macOS";
 
-		internal AnalyticsVersionInfo()
+		partial void Initialize()
 		{
+			DeviceFamily = $"{OsName}.{AnalyticsInfo.DeviceForm}";
+			DeviceFamilyVersion = UIDevice.CurrentDevice.SystemVersion;
 		}
 
 		public string DeviceFamily => OsName + '.' + AnalyticsInfo.DeviceForm;
 
 		public string DeviceFamilyVersion => NSProcessInfo.ProcessInfo.OperatingSystemVersionString;
 	}
 }
-#endif

src/Uno.UWP/System/Profile/AnalyticsVersionInfo.skia.cs

@@ -7,12 +7,11 @@ namespace Windows.System.Profile
 {
     public partial class AnalyticsVersionInfo
     {
-        internal AnalyticsVersionInfo()
-        {
-        }
 
-        public string DeviceFamily => Environment.OSVersion.Platform.ToString();
 
-        public string DeviceFamilyVersion => Environment.OSVersion.VersionString;
+		partial void Initialize()
+		{
+			DeviceFamily = $"{Environment.OSVersion.Platform.ToString()}.{AnalyticsInfo.DeviceForm}";
+		}
     }
 }

src/Uno.UWP/System/Profile/AnalyticsVersionInfo.wasm.cs

@@ -1,32 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Uno;
 using static Uno.Foundation.WebAssemblyRuntime;
 
 namespace Windows.System.Profile
 {
     public partial class AnalyticsVersionInfo
     {
         private const string OsName = "Browser";
-        private const string BrowserVersionFallback = "Unknown";
-        private const string JsType = "Windows.System.Profile.AnalyticsVersionInfo";
 
-        internal AnalyticsVersionInfo()
-        {
-        }
-
-        public string DeviceFamily => OsName + '.' + AnalyticsInfo.DeviceForm;
-
-        public string DeviceFamilyVersion => GetUserAgent();
-
-        private string GetUserAgent()
-        {
-            var userAgent = InvokeJS(JsType + ".getUserAgent()");
-            if (!string.IsNullOrEmpty(userAgent))
-            {
-                return userAgent;
-            }
-            return BrowserVersionFallback;
-        }
+		partial void Initialize()
+		{
+			DeviceFamily = $"{OsName}.{AnalyticsInfo.DeviceForm}";
+		}
     }
 }

src/Uno.UWP/System/Profile/Internal/IAnalyticsInfoExtension.skia.cs

@@ -0,0 +1,11 @@
+#nullable enable
+
+using Uno.System.Profile;
+
+namespace Windows.System.Profile.Internal
+{
+	internal interface IAnalyticsInfoExtension
+	{
+		UnoDeviceForm GetDeviceForm();
+	}
+}

src/Uno.UWP/System/Profile/Internal/IAnalyticsVersionInfoExtension.skia.cs

@@ -0,0 +1,9 @@
+#nullable enable
+
+namespace Uno.System.Profile
+{
+	internal interface IAnalyticsVersionInfoExtension
+    {
+
+    }
+}

src/Uno.UWP/System/Profile/Internal/UnoDeviceForm.cs

@@ -1,4 +1,6 @@
-namespace Windows.System.Profile
+#nullable enable
+
+namespace Uno.System.Profile
 {
 	internal enum UnoDeviceForm
 	{