Add support for WinUI for Desktop

VERSIONS.txt

@@ -1,5 +1,5 @@
 # dependencies
-mdoc                                            release     5.7.4.10
+mdoc                                            release     5.8.2
 harfbuzz                                        release     2.6.1
 skia                                            release     m80
 xunit                                           release     2.4.1
@@ -18,10 +18,15 @@ GdkSharp                                        release     3.22.24.37
 GLibSharp                                       release     3.22.24.37
 AtkSharp                                        release     3.22.24.37
 System.Memory                                   release     4.5.3
+System.Drawing.Common                           release     4.5.1
 System.IO.UnmanagedMemoryStream                 release     4.3.0
 System.Drawing.Common                           release     4.5.1
 SharpVk                                         release     0.4.2
 Uno.UI                                          release     2.4.4
+Microsoft.ProjectReunion                        release     0.5.0
+Microsoft.ProjectReunion.Foundation             release     0.5.0
+Microsoft.ProjectReunion.WinUI                  release     0.5.0
+Microsoft.Windows.SDK.NET.Ref                   release     10.0.18362.15
 
 # additional references used by the tooling
 OpenTK.GLControl                                reference   1.1.2349.61993
@@ -44,7 +49,7 @@ SkiaSharp               file        2.80.3.0
 
 # HarfBuzzSharp.dll
 HarfBuzzSharp           assembly    1.0.0.0
-HarfBuzzSharp           file        2.6.1.7
+HarfBuzzSharp           file        2.6.1.8
 
 # nuget versions
 SkiaSharp                                       nuget       2.80.3
@@ -62,11 +67,12 @@ SkiaSharp.Views.Forms                           nuget       2.80.3
 SkiaSharp.Views.Forms.WPF                       nuget       2.80.3
 SkiaSharp.Views.Forms.GTK                       nuget       2.80.3
 SkiaSharp.Views.Uno                             nuget       2.80.3
+SkiaSharp.Views.WinUI                           nuget       2.80.3
 SkiaSharp.HarfBuzz                              nuget       2.80.3
 SkiaSharp.Vulkan.SharpVk                        nuget       2.80.3
-HarfBuzzSharp                                   nuget       2.6.1.7
-HarfBuzzSharp.NativeAssets.Linux                nuget       2.6.1.7
-HarfBuzzSharp.NativeAssets.WebAssembly          nuget       2.6.1.7
+HarfBuzzSharp                                   nuget       2.6.1.8
+HarfBuzzSharp.NativeAssets.Linux                nuget       2.6.1.8
+HarfBuzzSharp.NativeAssets.WebAssembly          nuget       2.6.1.8
 
 # nuget replacement versions
 Xamarin.Forms                                   nuget       4.6.0.772

binding/HarfBuzzSharp.Shared/HarfBuzzApi.generated.cs

@@ -5494,8 +5494,6 @@ public enum OpenTypeLayoutBaselineTag {
 		IdeoEmboxTopOrRight = 1768191088,
 		// HB_OT_LAYOUT_BASELINE_TAG_MATH = 1835103336
 		Math = 1835103336,
-		// _HB_OT_LAYOUT_BASELINE_TAG_MAX_VALUE = 2147483647
-		HbOtLayoutBaselineTagMaxValue = 2147483647,
 	}
 
 	// hb_ot_layout_glyph_class_t

build.cake

@@ -6,7 +6,7 @@
 #addin nuget:?package=Mono.ApiTools.NuGetDiff&version=1.3.2&loaddependencies=true
 #addin nuget:?package=Xamarin.Nuget.Validator&version=1.1.1
 
-#tool nuget:?package=mdoc&version=5.7.4.10
+#tool nuget:?package=mdoc&version=5.8.2
 #tool nuget:?package=xunit.runner.console&version=2.4.1
 #tool nuget:?package=vswhere&version=2.7.1
 
@@ -72,6 +72,7 @@ var TRACKED_NUGETS = new Dictionary<string, Version> {
     { "SkiaSharp.Views.Forms.WPF",                     new Version (1, 57, 0) },
     { "SkiaSharp.Views.Forms.GTK",                     new Version (1, 57, 0) },
     { "SkiaSharp.Views.Uno",                           new Version (1, 57, 0) },
+    { "SkiaSharp.Views.WinUI",                         new Version (1, 57, 0) },
     { "HarfBuzzSharp",                                 new Version (1, 0, 0) },
     { "HarfBuzzSharp.NativeAssets.Linux",              new Version (1, 0, 0) },
     { "HarfBuzzSharp.NativeAssets.WebAssembly",        new Version (1, 0, 0) },
@@ -385,6 +386,7 @@ Task ("samples")
         { "macos", isMac },
         { "tvos", isMac },
         { "uwp", isWin },
+        { "winui", isWin },
         { "watchos", isMac },
         { "wpf", isWin },
     };
@@ -393,6 +395,7 @@ Task ("samples")
         { "ios", "iPhone" },
         { "tvos", "iPhoneSimulator" },
         { "uwp", "x86" },
+        { "winui", "x64" },
         { "watchos", "iPhoneSimulator" },
         { "xamarin.forms.mac", "iPhone" },
         { "xamarin.forms.windows", "x86" },

cake/UtilsManaged.cake

@@ -147,22 +147,26 @@ IEnumerable<(DirectoryPath path, string platform)> GetPlatformDirectories(Direct
     // there were no cross-platform libraries, so process each platform
     foreach (var dir in platformDirs) {
         var d = dir.GetDirectoryName().ToLower();
-        if (d.StartsWith("monoandroid"))
+        if (d.StartsWith("monoandroid") || (d.StartsWith("net") && d.Contains("-android")))
             yield return (dir, "android");
         else if (d.StartsWith("net4"))
             yield return (dir, "net");
         else if (d.StartsWith("uap"))
             yield return (dir, "uwp");
-        else if (d.StartsWith("xamarinios") || d.StartsWith("xamarin.ios"))
+        else if (d.StartsWith("xamarinios") || d.StartsWith("xamarin.ios") || (d.StartsWith("net") && d.Contains("-ios")))
             yield return (dir, "ios");
-        else if (d.StartsWith("xamarinmac") || d.StartsWith("xamarin.mac"))
+        else if (d.StartsWith("xamarinmac") || d.StartsWith("xamarin.mac") || (d.StartsWith("net") && d.Contains("-macos")))
             yield return (dir, "macos");
-        else if (d.StartsWith("xamarintvos") || d.StartsWith("xamarin.tvos"))
+        else if (d.StartsWith("xamarintvos") || d.StartsWith("xamarin.tvos") || (d.StartsWith("net") && d.Contains("-tvos")))
             yield return (dir, "tvos");
-        else if (d.StartsWith("xamarinwatchos") || d.StartsWith("xamarin.watchos"))
+        else if (d.StartsWith("xamarinwatchos") || d.StartsWith("xamarin.watchos") || (d.StartsWith("net") && d.Contains("-watchos")))
             yield return (dir, "watchos");
-        else if (d.StartsWith("tizen"))
+        else if (d.StartsWith("tizen") || (d.StartsWith("net") && d.Contains("-tizen")))
             yield return (dir, "tizen");
+        else if (d.StartsWith("net") && d.Contains("-windows"))
+            yield return (dir, "windows");
+        else if (d.StartsWith("net") && d.Contains("-maccatalyst"))
+            yield return (dir, "maccatalyst");
         else if (d.StartsWith("netcoreapp"))
             ; // skip this one for now
         else
@@ -225,6 +229,9 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
     await AddDep("Uno.UI", "xamarinios10");
     await AddDep("Uno.UI", "xamarinmac20");
     await AddDep("Uno.UI", "UAP");
+    await AddDep("Microsoft.ProjectReunion.Foundation", "net5.0-windows");
+    await AddDep("Microsoft.ProjectReunion.WinUI", "net5.0-windows10.0.18362.0");
+    await AddDep("Microsoft.Windows.SDK.NET.Ref", "");
 
     await AddDep("OpenTK.GLControl", "NET40", "reference");
     await AddDep("Xamarin.Forms", "Xamarin.iOS10", "reference");
@@ -271,7 +278,7 @@ async Task DownloadPackageAsync(string id, DirectoryPath outputDirectory)
     {
         currentId = currentId.ToLower();
 
-        Information($"Downloading: {currentId}...");
+        Information($"Downloading '{currentId}' version '{currentVersion}'...");
 
         var root = await comparer.ExtractCachedPackageAsync(currentId, currentVersion);
         var toolsDir = $"{root}/tools/";

changelogs/HarfBuzzSharp/2.6.1.8/HarfBuzzSharp.breaking.md

@@ -0,0 +1,23 @@
+# API diff: HarfBuzzSharp.dll
+
+## HarfBuzzSharp.dll
+
+### Namespace HarfBuzzSharp
+
+#### Type Changed: HarfBuzzSharp.OpenTypeMetrics
+
+Modified base type:
+
+```diff
+-System.ValueType
++System.Object
+```
+
+Removed constructor:
+
+```csharp
+public OpenTypeMetrics (IntPtr font);
+```
+
+
+