Update .NET 6 (#1740)

* Update .NET 6 to Preview 6
mono · Jul 12, 2021 · 73ac5d0 · 73ac5d0
1 parent 2403baa
commit 73ac5d0
Show file tree

Hide file tree

Showing 73 changed files with 1,594 additions and 237 deletions.
diff --git a/VERSIONS.txt b/VERSIONS.txt
@@ -25,10 +25,7 @@ Uno.UI                                          release     3.7.6
 Microsoft.ProjectReunion                        release     0.8.0
 Microsoft.ProjectReunion.Foundation             release     0.8.0
 Microsoft.ProjectReunion.WinUI                  release     0.8.0
-Microsoft.Maui.Core                             release     6.0.100-preview.5.794
-Microsoft.Maui.Controls                         release     6.0.100-preview.5.794
-Microsoft.Maui.Controls.Compatibility           release     6.0.100-preview.5.794
-Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup   release     6.0.100-preview.5.794
+Microsoft.Maui.Graphics                         release     6.0.100-preview.5.246
 Microsoft.Windows.SDK.NET.Ref                   release     10.0.18362.15
 
 # additional references used by the tooling

diff --git a/binding/HarfBuzzSharp/nuget/build/android/HarfBuzzSharp.targets b/binding/HarfBuzzSharp/nuget/build/android/HarfBuzzSharp.targets
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <!-- temporarily work around https://github.com/xamarin/xamarin-android/issues/5432 -->
-    <Target Name="_HarfBuzzSharpIncludeNativeSystemLibrariesFixes" BeforeTargets="_IncludeNativeSystemLibraries">
-        <ItemGroup>
-            <_FixedResolvedFileToPublish
-                Include="@(ResolvedFileToPublish)"
-                Condition="
-                    '%(ResolvedFileToPublish.AssetType)' == 'native' and
-                    '%(ResolvedFileToPublish.Filename)' == 'libHarfBuzzSharp' and
-                    '%(ResolvedFileToPublish.Extension)' == '.so' and
-                    '%(ResolvedFileToPublish.NuGetPackageId)' != '' and
-                    '%(ResolvedFileToPublish.RuntimeIdentifier)' == '' and
-                    '%(ResolvedFileToPublish.PathInPackage)' != '' " />
-            <ResolvedFileToPublish Update="@(_FixedResolvedFileToPublish)">
-                <RuntimeIdentifier>$([System.Text.RegularExpressions.Regex]::Match('%(_FixedResolvedFileToPublish.PathInPackage)', 'runtimes/([^/]+)/native/.*').Groups[1].Value)</RuntimeIdentifier>
-            </ResolvedFileToPublish>
-            <_FixedResolvedFileToPublish Remove="@(_FixedResolvedFileToPublish)" />
-        </ItemGroup>
-    </Target>
-
 </Project>
diff --git a/binding/SkiaSharp/nuget/build/android/SkiaSharp.targets b/binding/SkiaSharp/nuget/build/android/SkiaSharp.targets
@@ -1,23 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-    <!-- temporarily work around https://github.com/xamarin/xamarin-android/issues/5432 -->
-    <Target Name="_SkiaSharpIncludeNativeSystemLibrariesFixes" BeforeTargets="_IncludeNativeSystemLibraries">
-        <ItemGroup>
-            <_FixedResolvedFileToPublish
-                Include="@(ResolvedFileToPublish)"
-                Condition="
-                    '%(ResolvedFileToPublish.AssetType)' == 'native' and
-                    '%(ResolvedFileToPublish.Filename)' == 'libSkiaSharp' and
-                    '%(ResolvedFileToPublish.Extension)' == '.so' and
-                    '%(ResolvedFileToPublish.NuGetPackageId)' != '' and
-                    '%(ResolvedFileToPublish.RuntimeIdentifier)' == '' and
-                    '%(ResolvedFileToPublish.PathInPackage)' != '' " />
-            <ResolvedFileToPublish Update="@(_FixedResolvedFileToPublish)">
-                <RuntimeIdentifier>$([System.Text.RegularExpressions.Regex]::Match('%(_FixedResolvedFileToPublish.PathInPackage)', 'runtimes/([^/]+)/native/.*').Groups[1].Value)</RuntimeIdentifier>
-            </ResolvedFileToPublish>
-            <_FixedResolvedFileToPublish Remove="@(_FixedResolvedFileToPublish)" />
-        </ItemGroup>
-    </Target>
-
 </Project>
diff --git a/build.cake b/build.cake
@@ -58,7 +58,7 @@ var PREVIEW_NUGET_SUFFIX = string.IsNullOrEmpty (BUILD_NUMBER)
     ? $"{PREVIEW_LABEL}"
     : $"{PREVIEW_LABEL}.{BUILD_NUMBER}";
 
-var PREVIEW_FEED_URL = "https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json";
+var PREVIEW_FEED_URL = Argument ("previewFeed", "https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json");
 
 var TRACKED_NUGETS = new Dictionary<string, Version> {
     { "SkiaSharp",                                     new Version (1, 57, 0) },
@@ -88,7 +88,6 @@ var TRACKED_NUGETS = new Dictionary<string, Version> {
 };
 
 var PREVIEW_ONLY_NUGETS = new List<string> {
-    "SkiaSharp.Views.WinUI",
     "SkiaSharp.Views.Maui.Core",
     "SkiaSharp.Views.Maui.Controls",
     "SkiaSharp.Views.Maui.Controls.Compatibility",
@@ -138,7 +137,17 @@ Task ("libs")
             platform = ".Linux";
         }
     }
-    RunMSBuild ($"./source/SkiaSharpSource{platform}.sln");
+
+    var net6 = $"./source/SkiaSharpSource{platform}-net6.slnf";
+    var netfx = $"./source/SkiaSharpSource{platform}-netfx.slnf";
+    if (FileExists (net6) || FileExists (netfx)) {
+        if (FileExists (net6))
+            RunMSBuild (net6, properties: new Dictionary<string, string> { { "BuildingForNet6", "true" } });
+        if (FileExists (netfx))
+            RunMSBuild (netfx, properties: new Dictionary<string, string> { { "BuildingForNet6", "false" } });
+    } else {
+        RunMSBuild ($"./source/SkiaSharpSource{platform}.sln");
+    }
 
     // assemble the mdoc docs
     EnsureDirectoryExists ("./output/docs/mdoc/");
@@ -730,6 +739,7 @@ Task ("nuget-special")
     }
     if (GetFiles ("./output/nugets/*.nupkg").Count > 0) {
         specials[$"_NuGets"] = $"nugets";
+        specials[$"_NuGetsPreview"] = $"nugets";
     }
 
     foreach (var pair in specials) {

diff --git a/cake/UpdateDocs.cake b/cake/UpdateDocs.cake
@@ -44,10 +44,14 @@ Task ("docs-download-output")
     CleanDirectories ("./output");
 
     await DownloadPackageAsync ("_nugets", OUTPUT_NUGETS_PATH);
+    await DownloadPackageAsync ("_nugetspreview", OUTPUT_NUGETS_PATH);
 
     foreach (var id in TRACKED_NUGETS.Keys) {
         var version = GetVersion (id);
-        var name = $"{id}.{version}.nupkg";
+        var localNugetVersion = PREVIEW_ONLY_NUGETS.Contains(id)
+            ? $"{version}-{PREVIEW_NUGET_SUFFIX}"
+            : version;
+        var name = $"{id}.{localNugetVersion}.nupkg";
         CleanDirectories ($"./output/{id}");
         Unzip ($"{OUTPUT_NUGETS_PATH}/{name}", $"./output/{id}/nuget");
     }
@@ -70,9 +74,10 @@ Task ("docs-api-diff")
     comparer.SaveAssemblyApiInfo = true;
     comparer.SaveAssemblyMarkdownDiff = true;
 
-    // some libraries depend on SkiaSharp
+    // some parts of SkiaSharp depend on other parts
     comparer.SearchPaths.Add($"./output/SkiaSharp/nuget/lib/netstandard2.0");
-    comparer.SearchPaths.Add($"./output/SkiaSharp.Views.Maui.Core/nuget/lib/netstandard2.0");
+    foreach (var dir in GetDirectories($"./output/SkiaSharp.Views.Maui.Core/nuget/lib/*"))
+        comparer.SearchPaths.Add(dir.FullPath);
 
     var filter = new NuGetVersions.Filter {
         IncludePrerelease = NUGET_DIFF_PRERELEASE

diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake
@@ -214,9 +214,12 @@ string[] GetDotNetPacksSearchPaths()
     var latestSdk = (DirectoryPath)(last.Substring(start, last.Length - start - 1));
     var dotnetRoot = latestSdk.Combine("..");
 
-    var packs = GetDirectories(dotnetRoot.Combine("packs").FullPath + "/*.Ref");
+    foreach(var pack in GetDirectories(dotnetRoot.Combine("packs").FullPath + "/*.Ref.*")) {
+        var latestPath = GetDirectories(pack.FullPath + "/*").Last();
+        refs.AddRange(GetDirectories(latestPath.FullPath + "/ref/net*").Select(d => d.FullPath));
+    }
 
-    foreach(var pack in packs) {
+    foreach(var pack in GetDirectories(dotnetRoot.Combine("packs").FullPath + "/*.Ref")) {
         var latestPath = GetDirectories(pack.FullPath + "/*").Last();
         refs.AddRange(GetDirectories(latestPath.FullPath + "/ref/net*").Select(d => d.FullPath));
     }
@@ -253,22 +256,8 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
     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.Maui.Graphics", "netstandard2.0");
     await AddDep("Microsoft.Windows.SDK.NET.Ref", "");
-    await AddDep("Microsoft.Maui.Core", "net6.0-android30.0");
-    await AddDep("Microsoft.Maui.Core", "net6.0-ios13.6");
-    await AddDep("Microsoft.Maui.Core", "net6.0-maccatalyst13.5");
-    await AddDep("Microsoft.Maui.Core", "net6.0-windows10.0.18362");
-    await AddDep("Microsoft.Maui.Core", "netstandard2.0");
-    await AddDep("Microsoft.Maui.Controls", "net6.0-android30.0");
-    await AddDep("Microsoft.Maui.Controls", "net6.0-ios13.6");
-    await AddDep("Microsoft.Maui.Controls", "net6.0-maccatalyst13.5");
-    await AddDep("Microsoft.Maui.Controls", "net6.0-windows10.0.18362");
-    await AddDep("Microsoft.Maui.Controls", "netstandard2.0");
-    await AddDep("Microsoft.Maui.Controls.Compatibility", "net6.0-android30.0");
-    await AddDep("Microsoft.Maui.Controls.Compatibility", "net6.0-ios13.6");
-    await AddDep("Microsoft.Maui.Controls.Compatibility", "net6.0-maccatalyst13.5");
-    await AddDep("Microsoft.Maui.Controls.Compatibility", "net6.0-windows10.0.18362");
-    await AddDep("Microsoft.Maui.Controls.Compatibility.Android.FormsViewGroup", "net6.0-android30.0");
 
     await AddDep("OpenTK.GLControl", "NET40", "reference");
     await AddDep("Xamarin.Forms", "Xamarin.iOS10", "reference");

diff --git a/cake/msbuild.cake b/cake/msbuild.cake
@@ -5,6 +5,9 @@ DirectoryPath OUTPUT_SPECIAL_NUGETS_PATH = MakeAbsolute(ROOT_PATH.Combine("outpu
 var NUGETS_SOURCES = new [] {
     OUTPUT_NUGETS_PATH.FullPath,
     "https://api.nuget.org/v3/index.json",
+    "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
+    "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json",
+    "https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json",
     "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
 };
 

diff --git a/changelogs/SkiaSharp.HarfBuzz/2.88.0/SkiaSharp.HarfBuzz.md b/changelogs/SkiaSharp.HarfBuzz/2.88.0/SkiaSharp.HarfBuzz.md
@@ -0,0 +1,6 @@
+# API diff: SkiaSharp.HarfBuzz.dll
+
+## SkiaSharp.HarfBuzz.dll
+
+> Assembly Version Changed: 2.88.0.0 vs 2.80.0.0
+
diff --git a/changelogs/SkiaSharp.Views.Desktop.Common/2.88.0/SkiaSharp.Views.Desktop.Common.md b/changelogs/SkiaSharp.Views.Desktop.Common/2.88.0/SkiaSharp.Views.Desktop.Common.md
@@ -0,0 +1,24 @@
+# API diff: SkiaSharp.Views.Desktop.Common.dll
+
+## SkiaSharp.Views.Desktop.Common.dll
+
+> Assembly Version Changed: 2.88.0.0 vs 2.80.0.0
+
+### Namespace SkiaSharp.Views.Desktop
+
+#### Type Changed: SkiaSharp.Views.Desktop.Extensions
+
+Added methods:
+
+```csharp
+public static System.Drawing.Bitmap ToBitmap (this SkiaSharp.SKBitmap skiaBitmap);
+public static System.Drawing.Bitmap ToBitmap (this SkiaSharp.SKImage skiaImage);
+public static System.Drawing.Bitmap ToBitmap (this SkiaSharp.SKPixmap pixmap);
+public static System.Drawing.Bitmap ToBitmap (this SkiaSharp.SKPicture picture, SkiaSharp.SKSizeI dimensions);
+public static SkiaSharp.SKBitmap ToSKBitmap (this System.Drawing.Bitmap bitmap);
+public static SkiaSharp.SKImage ToSKImage (this System.Drawing.Bitmap bitmap);
+public static void ToSKPixmap (this System.Drawing.Bitmap bitmap, SkiaSharp.SKPixmap pixmap);
+```
+
+
+
diff --git a/changelogs/SkiaSharp.Views.Forms.GTK/2.88.0/SkiaSharp.Views.Forms.md b/changelogs/SkiaSharp.Views.Forms.GTK/2.88.0/SkiaSharp.Views.Forms.md
@@ -0,0 +1,6 @@
+# API diff: SkiaSharp.Views.Forms.dll
+
+## SkiaSharp.Views.Forms.dll
+
+> Assembly Version Changed: 2.88.0.0 vs 2.80.0.0
+
diff --git a/changelogs/SkiaSharp.Views.Forms.WPF/2.88.0/SkiaSharp.Views.Forms.md b/changelogs/SkiaSharp.Views.Forms.WPF/2.88.0/SkiaSharp.Views.Forms.md
@@ -0,0 +1,6 @@
+# API diff: SkiaSharp.Views.Forms.dll
+
+## SkiaSharp.Views.Forms.dll
+
+> Assembly Version Changed: 2.88.0.0 vs 2.80.0.0
+
diff --git a/changelogs/SkiaSharp.Views.Forms/2.88.0/SkiaSharp.Views.Forms.md b/changelogs/SkiaSharp.Views.Forms/2.88.0/SkiaSharp.Views.Forms.md
@@ -0,0 +1,6 @@
+# API diff: SkiaSharp.Views.Forms.dll
+
+## SkiaSharp.Views.Forms.dll
+
+> Assembly Version Changed: 2.88.0.0 vs 2.80.0.0
+
diff --git a/changelogs/SkiaSharp.Views.Gtk2/2.88.0/SkiaSharp.Views.Gtk.md b/changelogs/SkiaSharp.Views.Gtk2/2.88.0/SkiaSharp.Views.Gtk.md
@@ -0,0 +1,6 @@
+# API diff: SkiaSharp.Views.Gtk.dll
+
+## SkiaSharp.Views.Gtk.dll
+
+> Assembly Version Changed: 2.88.0.0 vs 2.80.0.0
+
diff --git a/changelogs/SkiaSharp.Views.Gtk3/2.88.0/SkiaSharp.Views.Gtk3.md b/changelogs/SkiaSharp.Views.Gtk3/2.88.0/SkiaSharp.Views.Gtk3.md
@@ -0,0 +1,6 @@
+# API diff: SkiaSharp.Views.Gtk3.dll
+
+## SkiaSharp.Views.Gtk3.dll
+
+> Assembly Version Changed: 2.88.0.0 vs 2.80.0.0
+
diff --git a/...ui.Controls.Compatibility/2.88.0/SkiaSharp.Views.Maui.Controls.Compatibility.md b/...ui.Controls.Compatibility/2.88.0/SkiaSharp.Views.Maui.Controls.Compatibility.md
@@ -0,0 +1,53 @@
+# API diff: SkiaSharp.Views.Maui.Controls.Compatibility.dll
+
+## SkiaSharp.Views.Maui.Controls.Compatibility.dll
+
+> Assembly Version Changed: 2.88.0.0 vs 0.0.0.0
+
+### New Namespace SkiaSharp.Views.Maui.Controls.Compatibility
+
+#### New Type: SkiaSharp.Views.Maui.Controls.Compatibility.AppHostBuilderExtensions
+
+```csharp
+public static class AppHostBuilderExtensions {
+	// methods
+	public static Microsoft.Maui.Hosting.IAppHostBuilder UseSkiaSharpCompatibilityRenderers (this Microsoft.Maui.Hosting.IAppHostBuilder builder);
+}
+```
+
+#### New Type: SkiaSharp.Views.Maui.Controls.Compatibility.SKCanvasViewRenderer
+
+```csharp
+public class SKCanvasViewRenderer : SkiaSharp.Views.Maui.Controls.Compatibility.SKCanvasViewRendererBase`2[SkiaSharp.Views.Maui.Controls.SKCanvasView,SkiaSharp.Views.Windows.SKXamlCanvas] {
+	// constructors
+	public SKCanvasViewRenderer ();
+	// methods
+	protected override SkiaSharp.Views.Windows.SKXamlCanvas CreateNativeControl ();
+}
+```
+
+#### New Type: SkiaSharp.Views.Maui.Controls.Compatibility.SKCanvasViewRendererBase`2
+
+```csharp
+public abstract class SKCanvasViewRendererBase`2 : Microsoft.Maui.Controls.Compatibility.Platform.UWP.ViewRenderer`2[TFormsView,TNativeView] {
+	// constructors
+	protected SKCanvasViewRendererBase`2 ();
+	// methods
+	protected virtual TNativeView CreateNativeControl ();
+	protected override void Dispose (bool disposing);
+	protected override void OnElementChanged (Microsoft.Maui.Controls.Platform.ElementChangedEventArgs<TFormsView> e);
+	protected override void OnElementPropertyChanged (object sender, System.ComponentModel.PropertyChangedEventArgs e);
+}
+```
+
+#### New Type: SkiaSharp.Views.Maui.Controls.Compatibility.SKImageSourceHandler
+
+```csharp
+public sealed class SKImageSourceHandler : Microsoft.Maui.Controls.IRegisterable {
+	// constructors
+	public SKImageSourceHandler ();
+	// methods
+	public virtual System.Threading.Tasks.Task<Microsoft.UI.Xaml.Media.ImageSource> LoadImageAsync (Microsoft.Maui.Controls.ImageSource imagesource, System.Threading.CancellationToken cancelationToken);
+}
+```
+