From 79df8ec44225ac66ae5f5bbefddb3a3bac1910b4 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 26 Jul 2021 19:22:13 +0200 Subject: [PATCH 01/14] Use the new Maui P7 --- VERSIONS.txt | 6 +++--- .../SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../WebApi/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../Gtk/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../Gtk3/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample.WinUI.csproj | 6 +++--- .../SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../WPF/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../Tizen/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../UWP/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample.Android.csproj | 1 - .../SkiaSharpSample.UWP.csproj | 1 - .../SkiaSharpSample.Wasm.csproj | 1 - .../SkiaSharpSample.iOS.csproj | 1 - .../SkiaSharpSample.macOS.csproj | 1 - .../WPF/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample.Package.wapproj | 4 ++-- .../SkiaSharpSample/SkiaSharpSample.csproj | 6 +++--- .../SkiaSharpSample.Android.csproj | 1 - .../SkiaSharpSample.GTK.csproj | 1 - .../SkiaSharpSample.Tizen.csproj | 1 - .../SkiaSharpSample.UWP.csproj | 1 - .../SkiaSharpSample.WPF.csproj | 1 - .../SkiaSharpSample.iOS.csproj | 1 - .../SkiaSharpSample.macOS.csproj | 1 - .../SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../iOS/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../macOS/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../tvOS/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample.OnWatch.csproj | 1 - .../SkiaSharpSample.OnWatchExtension.csproj | 1 - .../SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../UWP/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../SkiaSharpSample.Android.csproj | 1 - .../SkiaSharpSample.UWP.csproj | 1 - .../SkiaSharpSample.WPF.csproj | 1 - .../SkiaSharpSample.Wasm.csproj | 1 - .../SkiaSharpSample.iOS.csproj | 1 - .../SkiaSharpSample.macOS.csproj | 1 - .../WPF/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../Gallery/Xamarin.Forms/Android/Android.csproj | 1 - samples/Gallery/Xamarin.Forms/Core/Core.csproj | 1 - samples/Gallery/Xamarin.Forms/Mac/Mac.csproj | 1 - .../Gallery/Xamarin.Forms/Tizen/TizenOS.csproj | 1 - samples/Gallery/Xamarin.Forms/UWP/UWP.csproj | 1 - samples/Gallery/Xamarin.Forms/WPF/WPF.csproj | 1 - samples/Gallery/Xamarin.Forms/iOS/iOS.csproj | 1 - .../macOS/SkiaSharpSample/SkiaSharpSample.csproj | 1 - .../tvOS/SkiaSharpSample/SkiaSharpSample.csproj | 1 - scripts/install-maui.ps1 | 5 ++--- source/SkiaSharp.Build.props | 7 ++++++- .../SKCanvasView/SKCanvasViewHandler.Android.cs | 2 +- .../SKCanvasView/SKCanvasViewHandler.Ref.cs | 2 +- .../SKCanvasView/SKCanvasViewHandler.Windows.cs | 2 +- .../Handlers/SKCanvasView/SKCanvasViewHandler.cs | 15 ++++++++------- .../SKCanvasView/SKCanvasViewHandler.iOS.cs | 2 +- .../SkiaSharp.Views.WinUI.csproj | 2 +- utils/WasmTestRunner/WasmTestRunner.csproj | 1 - 62 files changed, 32 insertions(+), 77 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 943f869a807..aa7af56286e 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -22,9 +22,9 @@ System.IO.UnmanagedMemoryStream release 4.3.0 System.Drawing.Common release 4.5.1 SharpVk release 0.4.2 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.ProjectReunion release 0.8.1 +Microsoft.ProjectReunion.Foundation release 0.8.1 +Microsoft.ProjectReunion.WinUI release 0.8.1 Microsoft.Maui.Graphics release 6.0.100-preview.5.246 Microsoft.Windows.SDK.NET.Ref release 10.0.18362.15 diff --git a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj index f8b47e76bd1..5ab230be7ed 100644 --- a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj @@ -15,7 +15,6 @@ Resources Assets armeabi-v7a;x86;arm64-v8a;x86_64 - 8.0 true diff --git a/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index eecb870b60a..4ac2a9f46b3 100644 --- a/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -12,7 +12,6 @@ 512 true - 8.0 app.manifest icon.ico diff --git a/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj index 66399a97a2d..cb8c63bfa42 100644 --- a/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj @@ -3,7 +3,6 @@ Exe netcoreapp3.1 - 8.0 diff --git a/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj index 1cc25f8d9fe..a524059da15 100644 --- a/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj @@ -2,7 +2,6 @@ netcoreapp3.1 - 8.0 diff --git a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj index 70c082c0818..601f418009b 100644 --- a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,6 @@ tizen40 Exe $(DefineConstants);__TIZEN__; - 8.0 diff --git a/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj index 7142d377e14..3e8ac0cc09f 100644 --- a/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj @@ -8,7 +8,6 @@ v4.7.2 SkiaSharpSample - 8.0 portable diff --git a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj index a76a3f73075..c946f9eb54c 100644 --- a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj @@ -3,7 +3,6 @@ WinExe netcoreapp3.1 - 8.0 diff --git a/samples/Basic/Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj b/samples/Basic/Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj index 8e8192374d5..1b7f6155ca4 100644 --- a/samples/Basic/Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj +++ b/samples/Basic/Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj @@ -31,9 +31,9 @@ - - - + + + diff --git a/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj index e9f16c2b811..305caab5cd8 100644 --- a/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj @@ -3,7 +3,6 @@ Exe netcoreapp3.1 - 8.0 diff --git a/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj index 44310b7c35b..462ab2f90ab 100644 --- a/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,6 @@ WinExe netcoreapp3.1 true - 8.0 icon.ico diff --git a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj index d477ac5767f..1503cac7af3 100644 --- a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,6 @@ tizen40 Exe $(DefineConstants);__TIZEN__; - 8.0 diff --git a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj index deb92848e2d..16f4655a4ac 100644 --- a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -19,7 +19,6 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 8.0 true diff --git a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index f3ececd991c..324c13c27dc 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -18,7 +18,6 @@ Properties Off ..\SkiaSharpSample.Shared\Strings - 8.0 true diff --git a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 4f0e8a664e1..c7b9190b46e 100644 --- a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -19,7 +19,6 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 8.0 true diff --git a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index 46b66c35b90..7442e0344e2 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -6,7 +6,6 @@ Exe netstandard2.0 $(DefineConstants);__WASM__ - 8.0 true true diff --git a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 9bdb285039b..1df4bccec4c 100644 --- a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -10,7 +10,6 @@ SkiaSharpSample Resources ..\SkiaSharpSample.Shared\Strings - 8.0 true diff --git a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 46efe99bfe2..0eb49cbdb6c 100644 --- a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -11,7 +11,6 @@ v2.0 Xamarin.Mac Resources - 8.0 true diff --git a/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj index 278477e1f9e..1d06c392b6f 100644 --- a/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -14,7 +14,6 @@ 4 true - 8.0 app.manifest icon.ico diff --git a/samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj b/samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj index dc6cb282295..93fa3e33151 100644 --- a/samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj +++ b/samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj @@ -64,10 +64,10 @@ - + build - + build diff --git a/samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index 83d3af861c4..d5fb0e531c3 100644 --- a/samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index f459b4778d4..d6ccf63b306 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -15,7 +15,6 @@ Resources Assets armeabi-v7a;x86;arm64-v8a;x86_64 - 8.0 true diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj index dc2cd8e51c0..6963f11ac76 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj @@ -11,7 +11,6 @@ v4.7.2 SkiaSharpSample - 8.0 portable diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj index 4efff872a7a..721dcfe796b 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj @@ -4,7 +4,6 @@ tizen40 Exe $(DefineConstants);__TIZEN__; - 8.0 diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 7406b57079c..55dd36088a6 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -19,7 +19,6 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 8.0 true diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj index 06733501ed3..29fabba8270 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj @@ -15,7 +15,6 @@ 4 true true - 8.0 icon.ico diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index ad60a24490d..fdd61d2ec98 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -11,7 +11,6 @@ SkiaSharpSample.iOS Resources SkiaSharpSample.iOS - 8.0 true diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 2f3e0cd14a6..4ab1ea08316 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -11,7 +11,6 @@ v2.0 Xamarin.Mac Resources - 8.0 true diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj index ff4ee18d01a..42c0a3ba692 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj @@ -2,7 +2,6 @@ netstandard2.0 - 8.0 diff --git a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj index d6524b6a59b..38fa6e108d0 100644 --- a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,6 @@ SkiaSharpSample SkiaSharpSample Resources - 8.0 true NSUrlSessionHandler PackageReference diff --git a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 89aac012251..bc13d6060c0 100644 --- a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -11,7 +11,6 @@ v2.0 Xamarin.Mac Resources - 8.0 true diff --git a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 82cdf59bdf0..d36aac33846 100644 --- a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,6 @@ SkiaSharpSample SkiaSharpSample Resources - 8.0 true diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj b/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj index 915722d26ab..e9aa07a5a1f 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj @@ -9,7 +9,6 @@ SkiaSharpSample.OnWatch SkiaSharpSampleOnWatch Resources - 8.0 true diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj index da02c4e83ca..75e3d290445 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj @@ -9,7 +9,6 @@ SkiaSharpSample.OnWatchExtension SkiaSharpSampleOnWatchExtension Resources - 8.0 true diff --git a/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj index a0d5c6ef7de..e1ef534f1c2 100644 --- a/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,6 @@ SkiaSharpSample SkiaSharpSample Resources - 8.0 true diff --git a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index 90612c642d0..b9326835fdb 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -13,7 +13,6 @@ 512 app.manifest - 8.0 icon.ico diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index a2a45028d1f..084db3acff7 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -19,7 +19,6 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 8.0 true diff --git a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index d7e1dd3dc14..4fdf159094e 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -18,7 +18,6 @@ Properties Off ..\SkiaSharpSample.Shared\Strings - 8.0 true diff --git a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index fa7a91faf3d..1f6453a3ad0 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -19,7 +19,6 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 8.0 true diff --git a/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj b/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj index 0e7f7b9b849..b8ca868dafc 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj @@ -1,7 +1,6 @@  netstandard2.0 - 8.0 diff --git a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index d6c7233efb2..148f486585d 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -7,7 +7,6 @@ Exe netstandard2.0 $(DefineConstants);__WASM__ - 8.0 true true diff --git a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 9e80ff1409d..605a740ccaa 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -10,7 +10,6 @@ SkiaSharpSample Resources ..\SkiaSharpSample.Shared\Strings - 8.0 true diff --git a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 3fc1aad818c..d7cac9ee10f 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -11,7 +11,6 @@ v2.0 Xamarin.Mac Resources - 8.0 true diff --git a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj index 2fdec42c396..a2efd09b90f 100644 --- a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -14,7 +14,6 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 - 8.0 icon.ico diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index 6ba9689239c..064946c01c6 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -18,7 +18,6 @@ Properties\AndroidManifest.xml v10.0 armeabi-v7a;x86;arm64-v8a;x86_64 - 8.0 true diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj index 6e4d3be4b3f..bf941a6e986 100644 --- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj +++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj @@ -2,7 +2,6 @@ netstandard2.0 - 8.0 diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index 866dea97800..4d9fe7e58f7 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -11,7 +11,6 @@ v2.0 Xamarin.Mac Resources - 8.0 true diff --git a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj index fc234bdd111..be026667c4f 100644 --- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj +++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj @@ -6,7 +6,6 @@ SkiaSharpSample.Platform TizenOS $(DefineConstants);__TIZEN__; - 8.0 diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index a7047950139..9033e4460ed 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -19,7 +19,6 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 8.0 true diff --git a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj index 65d12014257..528dbdfd2b2 100644 --- a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj +++ b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj @@ -14,7 +14,6 @@ 4 true true - 8.0 icon.ico diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index 7bb2a9a8603..54002c6fd82 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -11,7 +11,6 @@ SkiaSharpSample.Platform Resources SkiaSharpSampleFormsSampleiOS - 8.0 true diff --git a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj index bb2814201d8..cc263433c36 100644 --- a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -11,7 +11,6 @@ v2.0 Xamarin.Mac Resources - 8.0 true diff --git a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 1b0044694bd..60c7a8eb678 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,6 @@ SkiaSharpSample SkiaSharpSample Resources - 8.0 true diff --git a/scripts/install-maui.ps1 b/scripts/install-maui.ps1 index 3e7523c8ad3..73ef6fceab0 100644 --- a/scripts/install-maui.ps1 +++ b/scripts/install-maui.ps1 @@ -1,6 +1,5 @@ Param( - [string] $InstallDir, - [string] $Manifest + [string] $InstallDir ) $ErrorActionPreference = 'Stop' @@ -12,7 +11,7 @@ Write-Host "Installing maui-check..." Write-Host "Installing Maui..." & maui-check ` - --preview ` + --main ` --verbose --ci --fix --non-interactive ` --skip androidsdk ` --skip xcode ` diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index b6624a146ba..72d910e635d 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -21,7 +21,7 @@ true false $(MSBuildThisFileDirectory)..\docs\SkiaSharpAPI - 8.0 + 9.0 @@ -38,6 +38,11 @@ true + + + true + + true diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Android.cs b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Android.cs index ab19b9f18ab..f1433a9422a 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Android.cs +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Android.cs @@ -31,7 +31,7 @@ protected override void DisconnectHandler(SKCanvasView nativeView) // Mapper actions / properties - public static void OnInvalidateSurface(SKCanvasViewHandler handler, ISKCanvasView canvasView) + public static void OnInvalidateSurface(SKCanvasViewHandler handler, ISKCanvasView canvasView, object? args) { handler.NativeView?.Invalidate(); } diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Ref.cs b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Ref.cs index 5e099ed8262..fecf1629007 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Ref.cs +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Ref.cs @@ -11,6 +11,6 @@ public static void MapIgnorePixelScaling(SKCanvasViewHandler handler, ISKCanvasV public static void MapEnableTouchEvents(SKCanvasViewHandler handler, ISKCanvasView canvasView) { } - public static void OnInvalidateSurface(SKCanvasViewHandler handler, ISKCanvasView canvasView) { } + public static void OnInvalidateSurface(SKCanvasViewHandler handler, ISKCanvasView canvasView, object? args) { } } } diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Windows.cs b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Windows.cs index 2eed7b3c519..2acee105f72 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Windows.cs +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.Windows.cs @@ -30,7 +30,7 @@ protected override void DisconnectHandler(SKXamlCanvas nativeView) // Mapper actions / properties - public static void OnInvalidateSurface(SKCanvasViewHandler handler, ISKCanvasView canvasView) + public static void OnInvalidateSurface(SKCanvasViewHandler handler, ISKCanvasView canvasView, object? args) { handler.NativeView?.Invalidate(); } diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.cs b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.cs index 410b2551e9d..dd9deea98e7 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.cs +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.cs @@ -10,20 +10,21 @@ public partial class SKCanvasViewHandler { [nameof(ISKCanvasView.EnableTouchEvents)] = MapEnableTouchEvents, [nameof(ISKCanvasView.IgnorePixelScaling)] = MapIgnorePixelScaling, + }; - Actions = - { - [nameof(ISKCanvasView.InvalidateSurface)] = OnInvalidateSurface, - } + public static CommandMapper SKCanvasViewCommandMapper = + new CommandMapper() + { + [nameof(ISKCanvasView.InvalidateSurface)] = OnInvalidateSurface, }; public SKCanvasViewHandler() - : base(SKCanvasViewMapper) + : base(SKCanvasViewMapper, SKCanvasViewCommandMapper) { } - public SKCanvasViewHandler(PropertyMapper? mapper) - : base(mapper ?? SKCanvasViewMapper) + public SKCanvasViewHandler(PropertyMapper? mapper, CommandMapper? commands) + : base(mapper ?? SKCanvasViewMapper, commands ?? SKCanvasViewCommandMapper) { } } diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.iOS.cs b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.iOS.cs index 0806300bff8..fd777a88e15 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.iOS.cs +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/Handlers/SKCanvasView/SKCanvasViewHandler.iOS.cs @@ -31,7 +31,7 @@ protected override void DisconnectHandler(SKCanvasView nativeView) // Mapper actions / properties - public static void OnInvalidateSurface(SKCanvasViewHandler handler, ISKCanvasView canvasView) + public static void OnInvalidateSurface(SKCanvasViewHandler handler, ISKCanvasView canvasView, object? args) { handler.NativeView?.SetNeedsDisplay(); } diff --git a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj index 8d0e3e317f9..d7ed9fb3214 100644 --- a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj +++ b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj @@ -7,7 +7,7 @@ SkiaSharp.Views.WinUI - + diff --git a/utils/WasmTestRunner/WasmTestRunner.csproj b/utils/WasmTestRunner/WasmTestRunner.csproj index 7f73c189b13..c587326b10b 100644 --- a/utils/WasmTestRunner/WasmTestRunner.csproj +++ b/utils/WasmTestRunner/WasmTestRunner.csproj @@ -3,7 +3,6 @@ Exe netcoreapp3.1 - 8.0 wasm-test From 49ddd12d3381f73f25b877310d9f3cec7f99a30e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 27 Jul 2021 00:40:33 +0200 Subject: [PATCH 02/14] C# 9 --- cake/UtilsManaged.cake | 5 +++++ scripts/azure-templates-bootstrapper.yml | 22 +++++++++++----------- source/SkiaSharp.Build.props | 7 ++++++- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake index 70933384138..ff8d4388e52 100644 --- a/cake/UtilsManaged.cake +++ b/cake/UtilsManaged.cake @@ -306,6 +306,11 @@ async Task DownloadPackageAsync(string id, DirectoryPath outputDirectory) Information($"Downloading '{currentId}' version '{currentVersion}'..."); + if (currentId == "_nativeassets.maccatalyst") { + Warning($"Skipping '{currentId}' because we do not yet have this package working..."); + return; + } + var root = await comparer.ExtractCachedPackageAsync(currentId, currentVersion); var toolsDir = $"{root}/tools/"; if (DirectoryExists(toolsDir)) { diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 3807f9fc5cf..5cf422fc709 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -16,7 +16,7 @@ parameters: condition: succeeded() # whether or not to run this template shouldPublish: true # whether or not to publish the artifacts configuration: $(CONFIGURATION) # the build configuration - buildExternals: '' # the build number to download externals from + buildExternals: '5020287' # the build number to download externals from verbosity: $(VERBOSITY) # the level of verbosity to use when building docker: '' # the Docker image to build and use dockerArgs: '' # any additional arguments to pass to docker build @@ -29,17 +29,17 @@ parameters: installEmsdk: false # whether or not to install the Emscripten SDK jobs: -# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}: -# - template: azure-templates-download.yml -# parameters: -# name: ${{ parameters.name }} -# displayName: ${{ parameters.displayName }} -# vmImage: ${{ parameters.vmImage }} -# condition: ${{ parameters.condition }} -# postBuildSteps: ${{ parameters.postBuildSteps }} -# buildExternals: ${{ parameters.buildExternals }} +- ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}: + - template: azure-templates-download.yml + parameters: + name: ${{ parameters.name }} + displayName: ${{ parameters.displayName }} + vmImage: ${{ parameters.vmImage }} + condition: ${{ parameters.condition }} + postBuildSteps: ${{ parameters.postBuildSteps }} + buildExternals: ${{ parameters.buildExternals }} -# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}: +- ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}: - job: ${{ parameters.name }} displayName: ${{ parameters.displayName }} timeoutInMinutes: 120 diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index 72d910e635d..7d9dd9b9a27 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -38,11 +38,16 @@ true + - true + + + + + true From e65f021d755210c4d7ba3c46f76b1c786602551d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 27 Jul 2021 15:56:07 +0200 Subject: [PATCH 03/14] DisableImplicitNamespaceImports --- samples/Directory.Build.props | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index de297e327ef..db752625a53 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -9,4 +9,14 @@ false + + + true + + + + + + + \ No newline at end of file From 7ad9e415c7d298a3c31e02f3bde3e519cd47daba Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 27 Jul 2021 19:12:58 +0200 Subject: [PATCH 04/14] LangVersion --- samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj | 2 +- .../Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj | 2 +- .../Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj | 2 +- .../Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj | 2 +- .../Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj | 2 +- samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../SkiaSharpSample.Android/SkiaSharpSample.Android.csproj | 2 +- .../SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj | 2 +- .../SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj | 2 +- .../SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj | 2 +- .../SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj | 2 +- .../SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj | 2 +- .../SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj | 2 +- .../Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj | 2 +- .../SkiaSharpSample.OnWatchExtension.csproj | 2 +- samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Directory.Build.props | 2 +- samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj | 2 +- .../Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj | 2 +- .../Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj | 2 +- .../Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj | 2 +- .../Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj | 2 +- .../Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj | 2 +- samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Gallery/Xamarin.Forms/Android/Android.csproj | 2 +- samples/Gallery/Xamarin.Forms/Core/Core.csproj | 2 +- samples/Gallery/Xamarin.Forms/Mac/Mac.csproj | 2 +- samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj | 2 +- samples/Gallery/Xamarin.Forms/UWP/UWP.csproj | 2 +- samples/Gallery/Xamarin.Forms/WPF/WPF.csproj | 2 +- samples/Gallery/Xamarin.Forms/iOS/iOS.csproj | 2 +- samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj | 2 +- source/SkiaSharp.Build.props | 2 +- utils/WasmTestRunner/WasmTestRunner.csproj | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj index 5bd3720f183..f8b47e76bd1 100644 --- a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj @@ -15,7 +15,7 @@ Resources Assets armeabi-v7a;x86;arm64-v8a;x86_64 - 9.0 + 8.0 true diff --git a/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index 7fbbe6beeb3..eecb870b60a 100644 --- a/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -12,7 +12,7 @@ 512 true - 9.0 + 8.0 app.manifest icon.ico diff --git a/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj index 438a4e9bd42..66399a97a2d 100644 --- a/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Docker/Console/SkiaSharpSample/SkiaSharpSample.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - 9.0 + 8.0 diff --git a/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj index abd8db06ed1..1cc25f8d9fe 100644 --- a/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Docker/WebApi/SkiaSharpSample/SkiaSharpSample.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 9.0 + 8.0 diff --git a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj index 5c3eb53cde5..70c082c0818 100644 --- a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,7 @@ tizen40 Exe $(DefineConstants);__TIZEN__; - 9.0 + 8.0 diff --git a/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj index 49963943d44..7142d377e14 100644 --- a/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj @@ -8,7 +8,7 @@ v4.7.2 SkiaSharpSample - 9.0 + 8.0 portable diff --git a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj index cba19b5cca3..a76a3f73075 100644 --- a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj @@ -3,7 +3,7 @@ WinExe netcoreapp3.1 - 9.0 + 8.0 diff --git a/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj index fe69ea2e7a1..e9f16c2b811 100644 --- a/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/NetCore/Console/SkiaSharpSample/SkiaSharpSample.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - 9.0 + 8.0 diff --git a/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj index 8d12334008e..44310b7c35b 100644 --- a/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/NetCore/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,7 @@ WinExe netcoreapp3.1 true - 9.0 + 8.0 icon.ico diff --git a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj index a29f7f250da..d477ac5767f 100644 --- a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj @@ -4,7 +4,7 @@ tizen40 Exe $(DefineConstants);__TIZEN__; - 9.0 + 8.0 diff --git a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj index f6e7bbded70..deb92848e2d 100644 --- a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -19,7 +19,7 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 9.0 + 8.0 true diff --git a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 34ecc47b076..f3ececd991c 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -18,7 +18,7 @@ Properties Off ..\SkiaSharpSample.Shared\Strings - 9.0 + 8.0 true diff --git a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index aa21e7f1cea..4f0e8a664e1 100644 --- a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -19,7 +19,7 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 9.0 + 8.0 true diff --git a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index eacb4dc6c7b..46b66c35b90 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -6,7 +6,7 @@ Exe netstandard2.0 $(DefineConstants);__WASM__ - 9.0 + 8.0 true true diff --git a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 879512294b5..9bdb285039b 100644 --- a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -10,7 +10,7 @@ SkiaSharpSample Resources ..\SkiaSharpSample.Shared\Strings - 9.0 + 8.0 true diff --git a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index aa51058c731..46efe99bfe2 100644 --- a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -11,7 +11,7 @@ v2.0 Xamarin.Mac Resources - 9.0 + 8.0 true diff --git a/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj index b66d2b76611..278477e1f9e 100644 --- a/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -14,7 +14,7 @@ 4 true - 9.0 + 8.0 app.manifest icon.ico diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index fe280acebba..f459b4778d4 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -15,7 +15,7 @@ Resources Assets armeabi-v7a;x86;arm64-v8a;x86_64 - 9.0 + 8.0 true diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj index ee47d411eac..dc2cd8e51c0 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj @@ -11,7 +11,7 @@ v4.7.2 SkiaSharpSample - 9.0 + 8.0 portable diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj index a5e6a17582c..4efff872a7a 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj @@ -4,7 +4,7 @@ tizen40 Exe $(DefineConstants);__TIZEN__; - 9.0 + 8.0 diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 6840e94d2d9..7406b57079c 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -19,7 +19,7 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 9.0 + 8.0 true diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj index 6aa5a11236a..06733501ed3 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj @@ -15,7 +15,7 @@ 4 true true - 9.0 + 8.0 icon.ico diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 2f77b855f85..ad60a24490d 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -11,7 +11,7 @@ SkiaSharpSample.iOS Resources SkiaSharpSample.iOS - 9.0 + 8.0 true diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index c29cf36b027..2f3e0cd14a6 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -11,7 +11,7 @@ v2.0 Xamarin.Mac Resources - 9.0 + 8.0 true diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj index ed1ddb82154..ff4ee18d01a 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 9.0 + 8.0 diff --git a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj index 20feb53d953..d6524b6a59b 100644 --- a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,7 @@ SkiaSharpSample SkiaSharpSample Resources - 9.0 + 8.0 true NSUrlSessionHandler PackageReference diff --git a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj index c450ce23ad9..89aac012251 100644 --- a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -11,7 +11,7 @@ v2.0 Xamarin.Mac Resources - 9.0 + 8.0 true diff --git a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 2e6d0c844fc..82cdf59bdf0 100644 --- a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,7 @@ SkiaSharpSample SkiaSharpSample Resources - 9.0 + 8.0 true diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj b/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj index b04fe27c812..915722d26ab 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj @@ -9,7 +9,7 @@ SkiaSharpSample.OnWatch SkiaSharpSampleOnWatch Resources - 9.0 + 8.0 true diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj index 1b7bd3dc4d0..da02c4e83ca 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj @@ -9,7 +9,7 @@ SkiaSharpSample.OnWatchExtension SkiaSharpSampleOnWatchExtension Resources - 9.0 + 8.0 true diff --git a/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj index cdb04a2eb96..a0d5c6ef7de 100644 --- a/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,7 @@ SkiaSharpSample SkiaSharpSample Resources - 9.0 + 8.0 true diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index db752625a53..11601da4e0d 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -15,7 +15,7 @@ - + diff --git a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index 41a2299349b..90612c642d0 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -13,7 +13,7 @@ 512 app.manifest - 9.0 + 8.0 icon.ico diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index 894bfd86cb3..a2a45028d1f 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -19,7 +19,7 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 9.0 + 8.0 true diff --git a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 791f7b9bedc..d7e1dd3dc14 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -18,7 +18,7 @@ Properties Off ..\SkiaSharpSample.Shared\Strings - 9.0 + 8.0 true diff --git a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 36fe4fc790a..fa7a91faf3d 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -19,7 +19,7 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 9.0 + 8.0 true diff --git a/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj b/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj index dece1d35b7a..0e7f7b9b849 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj @@ -1,7 +1,7 @@  netstandard2.0 - 9.0 + 8.0 diff --git a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index de861c5ead2..d6c7233efb2 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -7,7 +7,7 @@ Exe netstandard2.0 $(DefineConstants);__WASM__ - 9.0 + 8.0 true true diff --git a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index b2fb95d5244..9e80ff1409d 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -10,7 +10,7 @@ SkiaSharpSample Resources ..\SkiaSharpSample.Shared\Strings - 9.0 + 8.0 true diff --git a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 63c9e312d40..3fc1aad818c 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -11,7 +11,7 @@ v2.0 Xamarin.Mac Resources - 9.0 + 8.0 true diff --git a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj index bedb246ba89..2fdec42c396 100644 --- a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -14,7 +14,7 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 - 9.0 + 8.0 icon.ico diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index 8842c32a8ce..6ba9689239c 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -18,7 +18,7 @@ Properties\AndroidManifest.xml v10.0 armeabi-v7a;x86;arm64-v8a;x86_64 - 9.0 + 8.0 true diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj index b3244a86d54..6e4d3be4b3f 100644 --- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj +++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 9.0 + 8.0 diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index 4c70c03bbf4..866dea97800 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -11,7 +11,7 @@ v2.0 Xamarin.Mac Resources - 9.0 + 8.0 true diff --git a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj index d8e11f39712..fc234bdd111 100644 --- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj +++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj @@ -6,7 +6,7 @@ SkiaSharpSample.Platform TizenOS $(DefineConstants);__TIZEN__; - 9.0 + 8.0 diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 804f9677df1..a7047950139 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -19,7 +19,7 @@ ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx 5FC604ABEDFB78C8B4E57214FEB937949F44ABE4 PackageReference - 9.0 + 8.0 true diff --git a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj index 10fe1a33284..65d12014257 100644 --- a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj +++ b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj @@ -14,7 +14,7 @@ 4 true true - 9.0 + 8.0 icon.ico diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index 4c6b6744d8d..7bb2a9a8603 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -11,7 +11,7 @@ SkiaSharpSample.Platform Resources SkiaSharpSampleFormsSampleiOS - 9.0 + 8.0 true diff --git a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 06ad2f0041d..bb2814201d8 100644 --- a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -11,7 +11,7 @@ v2.0 Xamarin.Mac Resources - 9.0 + 8.0 true diff --git a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index a928010a7da..1b0044694bd 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,7 @@ SkiaSharpSample SkiaSharpSample Resources - 9.0 + 8.0 true diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index 7d9dd9b9a27..7181be545ec 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -21,7 +21,7 @@ true false $(MSBuildThisFileDirectory)..\docs\SkiaSharpAPI - 9.0 + 8.0 diff --git a/utils/WasmTestRunner/WasmTestRunner.csproj b/utils/WasmTestRunner/WasmTestRunner.csproj index 3db4299b650..7f73c189b13 100644 --- a/utils/WasmTestRunner/WasmTestRunner.csproj +++ b/utils/WasmTestRunner/WasmTestRunner.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - 9.0 + 8.0 wasm-test From a805e306986a5b59b5ec7d74f77890a04bf5da50 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 27 Jul 2021 19:15:15 +0200 Subject: [PATCH 05/14] things --- .../Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj | 1 + samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/samples/Basic/Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj b/samples/Basic/Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj index 1b7f6155ca4..b49d7683891 100644 --- a/samples/Basic/Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj +++ b/samples/Basic/Maui/SkiaSharpSample.WinUI/SkiaSharpSample.WinUI.csproj @@ -8,6 +8,7 @@ SkiaSharpSample true win-x64 + 9.0 true diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj index 5e6e1ccd6a5..ccced9a1412 100644 --- a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj @@ -10,6 +10,7 @@ 1.0 1 true + 9.0 From 47058ebac57895bea12a6fc42c2ace12cf59c5cf Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 27 Jul 2021 20:14:56 +0200 Subject: [PATCH 06/14] net6.0 --- nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec | 4 ++++ nuget/SkiaSharp.Views.Maui.Controls.nuspec | 8 ++------ nuget/SkiaSharp.Views.Maui.Core.nuspec | 8 ++------ source/SkiaSharp.Build.props | 4 ++++ .../SKCanvasViewRendererBase.cs | 4 +++- .../SKGLViewRendererBase.cs | 2 +- .../AppHostBuilderExtensions.cs | 2 ++ .../SkiaSharp.Views.Maui.Controls.Compatibility.csproj | 2 +- .../SkiaSharp.Views.Maui.Controls.csproj | 2 +- .../SkiaSharp.Views.Maui.Core.csproj | 2 +- 10 files changed, 21 insertions(+), 17 deletions(-) diff --git a/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec b/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec index a37892e242c..df0701e1534 100644 --- a/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec +++ b/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec @@ -27,6 +27,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. + + + @@ -45,6 +48,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release + diff --git a/nuget/SkiaSharp.Views.Maui.Controls.nuspec b/nuget/SkiaSharp.Views.Maui.Controls.nuspec index 3ccd5e0297a..92e181f4c45 100644 --- a/nuget/SkiaSharp.Views.Maui.Controls.nuspec +++ b/nuget/SkiaSharp.Views.Maui.Controls.nuspec @@ -27,12 +27,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - @@ -51,8 +48,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - + diff --git a/nuget/SkiaSharp.Views.Maui.Core.nuspec b/nuget/SkiaSharp.Views.Maui.Core.nuspec index b1bc92ce72a..4369369b1dd 100644 --- a/nuget/SkiaSharp.Views.Maui.Core.nuspec +++ b/nuget/SkiaSharp.Views.Maui.Core.nuspec @@ -27,12 +27,9 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - @@ -55,8 +52,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - + diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index 7181be545ec..84df9a56743 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -34,6 +34,10 @@ $(DefineConstants);THROW_OBJECT_EXCEPTIONS + + $(DefineConstants);NETSTANDARD + + true diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKCanvasViewRendererBase.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKCanvasViewRendererBase.cs index fee4b023a85..e4f9935e5f0 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKCanvasViewRendererBase.cs +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKCanvasViewRendererBase.cs @@ -1,4 +1,5 @@ -using System; +#if !NETSTANDARD +using System; using System.ComponentModel; #if __MAUI__ @@ -298,3 +299,4 @@ private void OnGetCanvasSize(object sender, GetPropertyValueEventArgs e) } } } +#endif diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs index 2a08f6fd111..656280e9a98 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Native.Shared/SKGLViewRendererBase.cs @@ -1,4 +1,4 @@ -#if !__GTK__ && !WINDOWS +#if !__GTK__ && !WINDOWS && !NETSTANDARD using System; using System.ComponentModel; diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs index dbac6dcf895..f824885adba 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/AppHostBuilderExtensions.cs @@ -10,6 +10,7 @@ public static IAppHostBuilder UseSkiaSharpCompatibilityRenderers(this IAppHostBu builder .ConfigureMauiHandlers(handlers => { +#if !NETSTANDARD handlers.AddCompatibilityRenderer(typeof(SKCanvasView), typeof(SKCanvasViewRenderer)); #if !WINDOWS handlers.AddCompatibilityRenderer(typeof(SKGLView), typeof(SKGLViewRenderer)); @@ -19,6 +20,7 @@ public static IAppHostBuilder UseSkiaSharpCompatibilityRenderers(this IAppHostBu CompatRegistrar.Registered.Register(typeof(SKBitmapImageSource), typeof(SKImageSourceHandler)); CompatRegistrar.Registered.Register(typeof(SKPixmapImageSource), typeof(SKImageSourceHandler)); CompatRegistrar.Registered.Register(typeof(SKPictureImageSource), typeof(SKImageSourceHandler)); +#endif }); } } diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/SkiaSharp.Views.Maui.Controls.Compatibility.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/SkiaSharp.Views.Maui.Controls.Compatibility.csproj index bd1ea076998..f001d218537 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/SkiaSharp.Views.Maui.Controls.Compatibility.csproj +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/SkiaSharp.Views.Maui.Controls.Compatibility.csproj @@ -1,6 +1,6 @@  - net6.0-ios;net6.0-maccatalyst;net6.0-android + net6.0;net6.0-ios;net6.0-maccatalyst;net6.0-android $(TargetFrameworks);net6.0-windows10.0.19041 10.0.17763.0 SkiaSharp.Views.Maui.Controls.Compatibility diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj index 48817bacb4b..f76293c6def 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj @@ -1,6 +1,6 @@  - net6.0-ios;net6.0-maccatalyst;net6.0-android + net6.0;net6.0-ios;net6.0-maccatalyst;net6.0-android $(TargetFrameworks);net6.0-windows10.0.19041 10.0.17763.0 SkiaSharp.Views.Maui.Controls diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj index de8fdde1604..78f083e3152 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj @@ -1,6 +1,6 @@  - net6.0-ios;net6.0-maccatalyst;net6.0-android + net6.0;net6.0-ios;net6.0-maccatalyst;net6.0-android $(TargetFrameworks);net6.0-windows10.0.19041 10.0.17763.0 SkiaSharp.Views.Maui.Core From 0d0ac08fd0cade243bd03e9ca779d404eb11da8e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 27 Jul 2021 20:59:58 +0200 Subject: [PATCH 07/14] 5025018 --- scripts/azure-templates-bootstrapper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 5cf422fc709..5ee1d0360ac 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -16,7 +16,7 @@ parameters: condition: succeeded() # whether or not to run this template shouldPublish: true # whether or not to publish the artifacts configuration: $(CONFIGURATION) # the build configuration - buildExternals: '5020287' # the build number to download externals from + buildExternals: '5025018' # the build number to download externals from verbosity: $(VERBOSITY) # the level of verbosity to use when building docker: '' # the Docker image to build and use dockerArgs: '' # any additional arguments to pass to docker build From ebe6719d2ea393737318f3a4663d6e2d7ea6477c Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 27 Jul 2021 23:23:36 +0200 Subject: [PATCH 08/14] net6.0 --- cake/UtilsManaged.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake index ff8d4388e52..b663b3ad565 100644 --- a/cake/UtilsManaged.cake +++ b/cake/UtilsManaged.cake @@ -137,7 +137,7 @@ IEnumerable<(DirectoryPath path, string platform)> GetPlatformDirectories(Direct // try find any cross-platform frameworks foreach (var dir in platformDirs) { var d = dir.GetDirectoryName().ToLower(); - if (d.StartsWith("netstandard") || d.StartsWith("portable")) { + if (d.StartsWith("netstandard") || d.StartsWith("portable") || d.Equals("net6.0")) { // we just want this single platform yield return (dir, null); yield break; From 25ee95ac8c7ced516b13c5450c23b69f57c966bb Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 28 Jul 2021 01:57:33 +0200 Subject: [PATCH 09/14] MAUI_CHECK_MANIFEST --- scripts/azure-pipelines.yml | 1 + scripts/azure-templates-bootstrapper.yml | 2 +- scripts/install-maui.ps1 | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 9be2ee9f849..241bf56842d 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -38,6 +38,7 @@ variables: ENABLE_CODE_COVERAGE: true EMSCRIPTEN_VERSION: 2.0.12 XHARNESS_VERSION: 1.0.0-prerelease.21314.1 + MAUI_CHECK_MANIFEST: https://raw.githubusercontent.com/Redth/dotnet-maui-check/mattleibow-patch-2/manifests/maui-main.manifest.json resources: repositories: diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 5ee1d0360ac..e9fff8a6796 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -123,7 +123,7 @@ jobs: - pwsh: .\scripts\install-vs.ps1 -Version $env:VS_VERSION_PREVIEW displayName: Install Visual Studio Preview - ${{ if not(endsWith(parameters.name, '_linux')) }}: - - pwsh: .\scripts\install-maui.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" + - pwsh: .\scripts\install-maui.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -Manifest $env:MAUI_CHECK_MANIFEST displayName: Install the .NET Core workloads # display dotnet info - pwsh: dotnet --info diff --git a/scripts/install-maui.ps1 b/scripts/install-maui.ps1 index 73ef6fceab0..c8e2573d017 100644 --- a/scripts/install-maui.ps1 +++ b/scripts/install-maui.ps1 @@ -1,5 +1,6 @@ Param( - [string] $InstallDir + [string] $InstallDir, + [string] $Manifest ) $ErrorActionPreference = 'Stop' @@ -11,7 +12,7 @@ Write-Host "Installing maui-check..." Write-Host "Installing Maui..." & maui-check ` - --main ` + $Manifest ` --verbose --ci --fix --non-interactive ` --skip androidsdk ` --skip xcode ` From 39e9eac7ac97f0c538e779b71159861265a71af4 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 28 Jul 2021 02:23:46 +0200 Subject: [PATCH 10/14] --manifest --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 241bf56842d..54f9636a391 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -38,7 +38,7 @@ variables: ENABLE_CODE_COVERAGE: true EMSCRIPTEN_VERSION: 2.0.12 XHARNESS_VERSION: 1.0.0-prerelease.21314.1 - MAUI_CHECK_MANIFEST: https://raw.githubusercontent.com/Redth/dotnet-maui-check/mattleibow-patch-2/manifests/maui-main.manifest.json + MAUI_CHECK_MANIFEST: --manifest https://raw.githubusercontent.com/Redth/dotnet-maui-check/mattleibow-patch-2/manifests/maui-main.manifest.json resources: repositories: From c5a53514ce86362898ad2ec323df4233392d12ad Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 28 Jul 2021 02:41:26 +0200 Subject: [PATCH 11/14] --main --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 54f9636a391..ee65670749e 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -38,7 +38,7 @@ variables: ENABLE_CODE_COVERAGE: true EMSCRIPTEN_VERSION: 2.0.12 XHARNESS_VERSION: 1.0.0-prerelease.21314.1 - MAUI_CHECK_MANIFEST: --manifest https://raw.githubusercontent.com/Redth/dotnet-maui-check/mattleibow-patch-2/manifests/maui-main.manifest.json + MAUI_CHECK_MANIFEST: --main resources: repositories: From 3484acce565f9acf91223617170ecca3d0d5ea30 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 28 Jul 2021 02:43:26 +0200 Subject: [PATCH 12/14] 6.0.100-preview.7.21377.3 --- scripts/azure-pipelines.yml | 3 +-- scripts/install-maui.ps1 | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index ee65670749e..f6c69e68351 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -25,7 +25,7 @@ variables: XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.410 DOTNET_VERSION: 5.0.301 - DOTNET_VERSION_PREVIEW: 6.0.100-preview.7.21369.5 + DOTNET_VERSION_PREVIEW: 6.0.100-preview.7.21377.3 VS_VERSION_PREVIEW: 16/pre CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 @@ -38,7 +38,6 @@ variables: ENABLE_CODE_COVERAGE: true EMSCRIPTEN_VERSION: 2.0.12 XHARNESS_VERSION: 1.0.0-prerelease.21314.1 - MAUI_CHECK_MANIFEST: --main resources: repositories: diff --git a/scripts/install-maui.ps1 b/scripts/install-maui.ps1 index c8e2573d017..73ef6fceab0 100644 --- a/scripts/install-maui.ps1 +++ b/scripts/install-maui.ps1 @@ -1,6 +1,5 @@ Param( - [string] $InstallDir, - [string] $Manifest + [string] $InstallDir ) $ErrorActionPreference = 'Stop' @@ -12,7 +11,7 @@ Write-Host "Installing maui-check..." Write-Host "Installing Maui..." & maui-check ` - $Manifest ` + --main ` --verbose --ci --fix --non-interactive ` --skip androidsdk ` --skip xcode ` From 1530fd8ff13c5454b80f2e9109b500a60f1c1096 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 28 Jul 2021 02:43:40 +0200 Subject: [PATCH 13/14] -Manifest --- scripts/azure-templates-bootstrapper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index e9fff8a6796..5ee1d0360ac 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -123,7 +123,7 @@ jobs: - pwsh: .\scripts\install-vs.ps1 -Version $env:VS_VERSION_PREVIEW displayName: Install Visual Studio Preview - ${{ if not(endsWith(parameters.name, '_linux')) }}: - - pwsh: .\scripts\install-maui.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -Manifest $env:MAUI_CHECK_MANIFEST + - pwsh: .\scripts\install-maui.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the .NET Core workloads # display dotnet info - pwsh: dotnet --info From a7de5fc7fec525a29d065b6d382e6e5a750b79d1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 28 Jul 2021 04:22:04 +0200 Subject: [PATCH 14/14] Build all --- scripts/azure-templates-bootstrapper.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 5ee1d0360ac..3807f9fc5cf 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -16,7 +16,7 @@ parameters: condition: succeeded() # whether or not to run this template shouldPublish: true # whether or not to publish the artifacts configuration: $(CONFIGURATION) # the build configuration - buildExternals: '5025018' # the build number to download externals from + buildExternals: '' # the build number to download externals from verbosity: $(VERBOSITY) # the level of verbosity to use when building docker: '' # the Docker image to build and use dockerArgs: '' # any additional arguments to pass to docker build @@ -29,17 +29,17 @@ parameters: installEmsdk: false # whether or not to install the Emscripten SDK jobs: -- ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}: - - template: azure-templates-download.yml - parameters: - name: ${{ parameters.name }} - displayName: ${{ parameters.displayName }} - vmImage: ${{ parameters.vmImage }} - condition: ${{ parameters.condition }} - postBuildSteps: ${{ parameters.postBuildSteps }} - buildExternals: ${{ parameters.buildExternals }} +# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}: +# - template: azure-templates-download.yml +# parameters: +# name: ${{ parameters.name }} +# displayName: ${{ parameters.displayName }} +# vmImage: ${{ parameters.vmImage }} +# condition: ${{ parameters.condition }} +# postBuildSteps: ${{ parameters.postBuildSteps }} +# buildExternals: ${{ parameters.buildExternals }} -- ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}: +# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}: - job: ${{ parameters.name }} displayName: ${{ parameters.displayName }} timeoutInMinutes: 120