Migrate to WinUI 3 (#38)

* WinUI - part 1 * More namespace changes * NEEDS BETTER FIX IF POSSIBLE * Name changes * temp * Fixed file names * remove Windows Mobile SDK Reference * Fix more errors * make it virtual * Get rid of OnActivated * Update deps --------- Co-authored-by: Reza Talebi <[email protected]>
Geeksltd · Sep 22, 2024 · 2d5fbc0 · 2d5fbc0
1 parent ec0db6c
commit 2d5fbc0
Show file tree

Hide file tree

Showing 59 changed files with 263 additions and 314 deletions.
diff --git a/Core/Device/Screen.cs b/Core/Device/Screen.cs
@@ -148,7 +148,7 @@ public static void ConfigureSize(Func<float> widthProvider, Func<float> heightPr
             WidthProvider = widthProvider;
             HeightProvider = heightProvider;
 
-#if UWP
+#if WINUI
             if (UIRuntime.IsDevMode && UIRuntime.Inspector.IsRotating)
             {
                 Width = widthProvider();
@@ -172,7 +172,7 @@ internal static void UpdateLayout()
             Width = newWidth;
             Height = newHeight;
 
-#if UWP
+#if WINUI
             var extra = UIRuntime.IsDevMode ? UIRuntime.Inspector.CurrentWidth : 0;
             UIRuntime.RenderRoot.Size(Width + extra, Height);
 #endif

diff --git a/Core/Native/NativeRenderer.cs b/Core/Native/NativeRenderer.cs
@@ -8,8 +8,8 @@ namespace Zebble
     using Android.Runtime;
     using BaseNativeType = Android.Views.View;
     [Preserve]
-#elif UWP
-    using BaseNativeType = Windows.UI.Xaml.FrameworkElement;
+#elif WINUI
+    using BaseNativeType = Microsoft.UI.Xaml.FrameworkElement;
 #else
     using BaseNativeType = object;
 #endif

diff --git a/Core/Native/Renderer.cs b/Core/Native/Renderer.cs
@@ -9,8 +9,8 @@ namespace Zebble
     using BaseNativeType = UIKit.UIView;
 #elif ANDROID
     using BaseNativeType = Android.Views.View;
-#elif UWP
-    using BaseNativeType = Windows.UI.Xaml.FrameworkElement;
+#elif WINUI
+    using BaseNativeType = Microsoft.UI.Xaml.FrameworkElement;
 #elif MAUI_Windows
 using BaseNativeType = object;
 #endif

diff --git a/Core/Services/Css/BatchUIChangeContext.cs b/Core/Services/Css/BatchUIChangeContext.cs
@@ -53,7 +53,7 @@ internal void TrackCascade(Length length)
                 Log.For(this).Debug("");
             }
 
-#if UWP
+#if WINUI
             Device.App.ExitWithError("Detected cyclic dependency in layout settings. See the output log.");
 #endif
         }

diff --git a/Core/Services/Css/CssEngine.cs b/Core/Services/Css/CssEngine.cs
@@ -150,7 +150,7 @@ static CssRule[] FindMatchedRules(View view)
         static CssRule[] FindRules(View view)
         {
             var result = FindPossibleRules(view);
-#if UWP
+#if WINUI
             if (UIRuntime.IsDevMode)
             {
                 result = result.Where(x => x.Platform == null || x.Platform == Platform).ToList();

diff --git a/Core/Services/Css/InheritanceDepth.cs b/Core/Services/Css/InheritanceDepth.cs
@@ -46,8 +46,8 @@ static void Reload()
             {
                 var asses = AppDomain.CurrentDomain.GetAssemblies();
                 var assemblies = asses
-#if UWP
-                       //  .NET Native (UWP) and other forms of Native AOT compilers don't support GetReferencedAssemblies
+#if WINUI
+                       //  .NET Native (WinUI) and other forms of Native AOT compilers don't support GetReferencedAssemblies
                        .Where(c => c.GetName().Name.Contains("Zebble"))
 #else
                        .Where(c => c.References(ZebbleAssembly) || c.GetName().Name.Contains("Zebble"))

diff --git a/Core/Services/LayoutTracker.cs b/Core/Services/LayoutTracker.cs
@@ -28,7 +28,7 @@ public class LayoutTracker
 
             public static void Track(ITrackable trackable, object value, [CallerMemberName] string caller = null)
             {
-#if UWP
+#if WINUI
                 if (!UIRuntime.IsDevMode) return;
                 if (Tracking.None()) return;
                 if (Tracking.Lacks(GetTrackingRef(trackable))) return;

diff --git a/Core/UI.Core/TextInput.cs b/Core/UI.Core/TextInput.cs
@@ -94,7 +94,7 @@ public SpellCheckingType SpellChecking
         }
 
         /// <summary>
-        /// Only needed for iOS. In Android and UWP this can achived by setting SpellChecking.
+        /// Only needed for iOS. In Android and WinUI this can achived by setting SpellChecking.
         /// </summary>
         public AutoCorrectionType AutoCorrection
         {

diff --git a/Core/UI.Core/View.Hierarchy.cs b/Core/UI.Core/View.Hierarchy.cs
@@ -218,7 +218,7 @@ public Task RemoveAt(int childIndex, bool awaitNative = false)
 
         public virtual async Task Remove(View view, bool awaitNative = false)
         {
-#if UWP
+#if WINUI
             if (UIRuntime.IsDevMode) UIRuntime.Inspector.DomUpdated(view).RunInParallel();
 #endif
 
@@ -307,7 +307,7 @@ async Task DoAddToNativeParent()
 
             UIWorkBatch.Publish(this, "[ADD]", null);
 
-#if UWP
+#if WINUI
             if (UIRuntime.IsDevMode) await UIRuntime.Inspector.DomUpdated(this);
 #endif
         }

diff --git a/Core/UI.Core/View.Positioning.cs b/Core/UI.Core/View.Positioning.cs
@@ -84,8 +84,8 @@ public float NativeX
 
                 return Thread.UI.Run(() =>
                 {
-#if UWP
-                    return (float)Windows.UI.Xaml.Controls.Canvas.GetLeft((Windows.UI.Xaml.UIElement)native);
+#if WINUI
+                    return (float)Microsoft.UI.Xaml.Controls.Canvas.GetLeft((Microsoft.UI.Xaml.UIElement)native);
 #elif IOS
 
                     var nativeLayer = (native as UIKit.UIView).Layer.PresentationLayer;
@@ -110,8 +110,8 @@ public float NativeY
                 var native = Native; if (native is null) return -1;
                 return Thread.UI.Run(() =>
                 {
-#if UWP
-                    return (float)Windows.UI.Xaml.Controls.Canvas.GetTop((Windows.UI.Xaml.UIElement)native);
+#if WINUI
+                    return (float)Microsoft.UI.Xaml.Controls.Canvas.GetTop((Microsoft.UI.Xaml.UIElement)native);
 #elif IOS
                     var nativeLayer = (native as UIKit.UIView).Layer.PresentationLayer;
                     if (nativeLayer is null) return -1f;

diff --git a/Core/UI.Core/ViewExtensions.cs b/Core/UI.Core/ViewExtensions.cs
@@ -69,8 +69,8 @@ public static async Task<TView> MoveTo<TView>(this TView @this, View newParent,
             return @this;
         }
 
-#if UWP
-        public static Windows.UI.Xaml.FrameworkElement Native(this View view) => (Windows.UI.Xaml.FrameworkElement)view.Native;
+#if WINUI
+        public static Microsoft.UI.Xaml.FrameworkElement Native(this View view) => (Microsoft.UI.Xaml.FrameworkElement)view.Native;
 
 #elif ANDROID
         public static Android.Views.View Native(this View view) => (Android.Views.View)view.Native;

diff --git a/Framework/Async/AsyncEvent.cs b/Framework/Async/AsyncEvent.cs
@@ -29,7 +29,7 @@ public Task RaiseOn(BaseThread thread)
 
             var runner = thread.Run(() => Raise());
 
-#if IOS || ANDROID || UWP
+#if IOS || ANDROID || WINUI
             if (Thread.UI.IsRunning() && thread == Thread.Pool)
                 return Task.CompletedTask;
 #endif

diff --git a/Framework/Common/AssemblyInfo.cs b/Framework/Common/AssemblyInfo.cs
@@ -11,7 +11,7 @@ public class AssemblyInfo
     {
         public static Assembly[] GetAssemblies()
         {
-#if UWP
+#if WINUI
             var assemblies = new List<Assembly>();
             var files = Windows.ApplicationModel.Package.Current.InstalledLocation.GetFilesAsync().AsTask().AwaitResultWithoutContext();
             if (files is null) return assemblies.ToArray();

diff --git a/Framework/Common/ZebbleConfiguration.cs b/Framework/Common/ZebbleConfiguration.cs
@@ -24,7 +24,7 @@ static IDictionary<string, string> LoadValues()
             {
                 try
                 {
-#if UWP || ANDROID || IOS
+#if WINUI || ANDROID || IOS
                     var text = UIRuntime.GetEmbeddedResources()
                         .FirstOrDefault(x => x.Key.EndsWith("config.xml", StringComparison.OrdinalIgnoreCase))
                         .Value?.Invoke()?.ToString(Encoding.UTF8);

diff --git a/Framework/Common/ZebbleLogging.cs b/Framework/Common/ZebbleLogging.cs
@@ -37,7 +37,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                 var message = formatter(state, exception);
                 if (message.IsEmpty()) return;
 
-#if UWP || IOS
+#if WINUI || IOS
                 System.Diagnostics.Debug.WriteLine(logLevel + ": " + Category + "> " + message);
 #elif ANDROID
                 Android.Util.Log.Info("app", message);

diff --git a/Framework/Device/IO.cs b/Framework/Device/IO.cs
@@ -18,7 +18,7 @@ public static string DocumentsFolder
         {
             get
             {
-#if UWP
+#if WINUI
                 return Windows.Storage.KnownFolders.DocumentsLibrary.Path;
 #else
                 return Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
@@ -34,7 +34,7 @@ public static string PersonalFolder
         {
             get
             {
-#if UWP
+#if WINUI
                 return Windows.Storage.ApplicationData.Current.LocalFolder.Path;
 #else
                 return Environment.GetFolderPath(Environment.SpecialFolder.Personal);
@@ -92,7 +92,7 @@ public static string AbsolutePath(string relative)
             else
             {
                 relative = NormalizePath(relative);
-#if UWP
+#if WINUI
                 relative = relative.Replace("/", "\\");
 #endif
             }

diff --git a/Framework/Services/System/SuspendGC.cs b/Framework/Services/System/SuspendGC.cs
@@ -11,7 +11,7 @@ public class SuspendGC : IDisposable
         SuspendGC()
         {
             Original = GCSettings.LatencyMode;
-#if UWP
+#if WINUI
             GCSettings.LatencyMode = GCLatencyMode.LowLatency;
 #else
             GCSettings.LatencyMode = GCLatencyMode.NoGCRegion;

diff --git a/Framework/UIRuntime.cs b/Framework/UIRuntime.cs
@@ -62,7 +62,7 @@ public static void Initialize<TAnyAppType>(string appName, Action<IHostBuilder>
         }
         static IHostBuilder CreateHostBuilder<T>() where T : class
         {
-#if !UWP
+#if !WINUI
             return XamarinHost.CreateDefaultBuilder<T>();
 #else
 return Host.CreateDefaultBuilder();

diff --git a/Mvvm/RenderAbstractions/Template.cs b/Mvvm/RenderAbstractions/Template.cs
@@ -18,7 +18,7 @@ internal View GetOrCreate(ViewModel model)
             if (View == null || View.IsDisposing)
             {
                 View = (View)TemplateType.CreateInstance();
-#if UWP || ANDROID || IOS
+#if WINUI || ANDROID || IOS
                 View.SetViewModelValue(model);
                 View.RefreshBindings();
 #endif

diff --git a/SharedApp/ThreadPool.cs b/SharedApp/ThreadPool.cs
@@ -88,7 +88,7 @@ public override Task<TResult> Run<TResult>(Func<Task<TResult>> task)
             return task();
         }
 
-#if IOS || ANDROID || UWP
+#if IOS || ANDROID || WINUI
         public override bool IsRunning() => !Thread.UI.IsRunning();
 #else
 public override bool IsRunning() => true;

diff --git a/Zebble.Build/Common/SolutionFixer.cs b/Zebble.Build/Common/SolutionFixer.cs
@@ -117,8 +117,8 @@ void RenameSpecificPlatformsProjects(FileInfo solutionFile)
             foreach (var token in new[] { "", $"{solutionFile.NameWithoutExtension()}\\" })
             {
                 solutionText = solutionText.Replace(
-                    oldValue: $"Project(\"{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}\") = \"UWP\", \"{token}Run\\UWP\\UWP.csproj\"",
-                    newValue: $"Project(\"{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}\") = \"~UWP\", \"{token}Run\\UWP\\~UWP.csproj\""
+                    oldValue: $"Project(\"{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}\") = \"WinUI\", \"{token}Run\\WinUI\\WinUI.csproj\"",
+                    newValue: $"Project(\"{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}\") = \"~WinUI\", \"{token}Run\\WinUI\\~WinUI.csproj\""
                 );
 
                 solutionText = solutionText.Replace(
@@ -175,11 +175,11 @@ static void FixSolutionSettings(FileInfo solution)
 
             var buildSettings = new List<string>();
 
-            var uwpGUID = "{51AEAFB7-E02B-4F51-8AB0-AA90E034E684}";
+            var winuiGUID = "{51AEAFB7-E02B-4F51-8AB0-AA90E034E684}";
             foreach (var platform in new[] { "Any CPU", "iPhone", "iPhoneSimulator" })
             {
-                buildSettings.Add($"{uwpGUID}.Debug|{platform}.Build.0 = Debug|x86");
-                buildSettings.Add($"{uwpGUID}.Debug|{platform}.Deploy.0 = Debug|x86");
+                buildSettings.Add($"{winuiGUID}.Debug|{platform}.Build.0 = Debug|x86");
+                buildSettings.Add($"{winuiGUID}.Debug|{platform}.Deploy.0 = Debug|x86");
             }
 
             var iosGUID = "{3B21A769-F17C-4219-A595-27A34955228F}";

diff --git a/Zebble.Build/ConvertPlugin/PluginConverter.cs b/Zebble.Build/ConvertPlugin/PluginConverter.cs
@@ -108,7 +108,7 @@ void MoveTo(string name)
             MoveTo("Shared");
             MoveTo("iOS");
             MoveTo("Android");
-            MoveTo("UWP");
+            MoveTo("WinUI");
         }
 
         void RemoveOldFilesAndFolders()

diff --git a/Zebble.Build/NavigationXml/NavXmlGenerator.cs b/Zebble.Build/NavigationXml/NavXmlGenerator.cs
@@ -14,7 +14,7 @@ class NavXmlGenerator : Builder
 
         public NavXmlGenerator()
         {
-            _navXmlFile = Path.Combine(DirectoryContext.UWPObjFolder.FullName, "zebble-nav.xml").AsFile();
+            _navXmlFile = Path.Combine(DirectoryContext.WinUIObjFolder.FullName, "zebble-nav.xml").AsFile();
             Log($"Updated navigation info will be written into: {_navXmlFile.FullName}");
         }
 

diff --git a/Zebble.Build/Zebble.Build.csproj b/Zebble.Build/Zebble.Build.csproj
@@ -39,7 +39,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Olive" Version="2.1.361" />
+    <PackageReference Include="Olive" Version="2.1.380" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\icon.png" Pack="true" PackagePath="" />

diff --git a/Zebble.CompileZbl/Properties/launchSettings.json b/Zebble.CompileZbl/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Zebble.CompileZbl": {
       "commandName": "Project",
-      "workingDirectory": "D:\\Geeks\\UWP\\fyioNew\\fyio.mobile"
+      "workingDirectory": "D:\\Geeks\\WinUI\\fyioNew\\fyio.mobile"
     }
   }
 }
diff --git a/Zebble.CompileZbl/Zebble.CompileZbl.csproj b/Zebble.CompileZbl/Zebble.CompileZbl.csproj
@@ -39,8 +39,8 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Olive" Version="2.1.361" />
-    <PackageReference Include="SkiaSharp" Version="3.0.0-preview.2.1" />
+    <PackageReference Include="Olive" Version="2.1.380" />
+    <PackageReference Include="SkiaSharp" Version="3.0.0-preview.4.1" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\icon.png" Pack="true" PackagePath="" />

diff --git a/Zebble.Css/Properties/launchSettings.json b/Zebble.Css/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "Zebble.Css": {
       "commandName": "Project",
       "commandLineArgs": "generate",
-      "workingDirectory": "D:\\Geeks\\UWP\\fyioNew\\fyio.mobile"
+      "workingDirectory": "D:\\Geeks\\WinUI\\fyioNew\\fyio.mobile"
     }
   }
 }
diff --git a/Zebble.Css/Zebble.Css.csproj b/Zebble.Css/Zebble.Css.csproj
@@ -39,12 +39,12 @@
     <None Include="Resources\icon.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Olive" Version="2.1.361" />
-    <PackageReference Include="SkiaSharp" Version="3.0.0-preview.2.1" />
+    <PackageReference Include="Olive" Version="2.1.380" />
+    <PackageReference Include="SkiaSharp" Version="3.0.0-preview.4.1" />
     <PackageReference Include="SourceMapToolkit" Version="1.1.4" />
-    <PackageReference Include="LibSassHost" Version="1.4.0" />
-    <PackageReference Include="LibSassHost.Native.osx-x64" Version="1.4.0" />
-    <PackageReference Include="LibSassHost.Native.win-x64" Version="1.4.0" />
+    <PackageReference Include="LibSassHost" Version="1.5.0" />
+    <PackageReference Include="LibSassHost.Native.osx-x64" Version="1.5.0" />
+    <PackageReference Include="LibSassHost.Native.win-x64" Version="1.5.0" />
   </ItemGroup>
   <Import Project="..\Zebble.Tooling\Zebble.Tooling.projitems" Label="Shared" />
   <Import Project="..\Css\Css.projitems" Label="Shared" />

diff --git a/Zebble.FormatZbl/Zebble.FormatZbl.csproj b/Zebble.FormatZbl/Zebble.FormatZbl.csproj
@@ -44,8 +44,8 @@
     <None Remove="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Olive" Version="2.1.361" />
-    <PackageReference Include="SkiaSharp" Version="3.0.0-preview.2.1" />
+    <PackageReference Include="Olive" Version="2.1.380" />
+    <PackageReference Include="SkiaSharp" Version="3.0.0-preview.4.1" />
   </ItemGroup>
   <Import Project="..\Zebble.Tooling\Zebble.Tooling.projitems" Label="Shared" />
   <Import Project="..\Abstractions\Abstractions.projitems" Label="Shared" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ internal void TrackCascade(Length length) @@
                     Log.For(this).Debug("");
                 }
-    #if UWP
+    #if WINUI
                 Device.App.ExitWithError("Detected cyclic dependency in layout settings. See the output log.");
     #endif
             }
@@ Expand Down @@