diff --git a/VERSIONS.txt b/VERSIONS.txt index 82b6eae6..f118b56a 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -5,7 +5,7 @@ mdoc release 5.7.2 harfbuzz release 1.4.6 skia release m67 xunit.runner.console release 2.4.0 -Xamarin.Forms release 2.5.0.280555 +Xamarin.Forms release 3.0.0.561731 Tizen.NET release 4.0.0 OpenTK.GLControl release 1.1.2349.61993 MSBuild.Sdk.Extras release 1.6.41 diff --git a/nuget/SkiaSharp.Views.Forms.nuspec b/nuget/SkiaSharp.Views.Forms.nuspec index b8fd8efa..a2330f25 100644 --- a/nuget/SkiaSharp.Views.Forms.nuspec +++ b/nuget/SkiaSharp.Views.Forms.nuspec @@ -28,31 +28,31 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + - + - + - + - + - + diff --git a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj index 2645043d..657cff54 100644 --- a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj @@ -8,7 +8,7 @@ Library SkiaSharpSample SkiaSharpSample - v8.0 + v8.1 True Resources\Resource.designer.cs Resource diff --git a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj index 5f377486..23e5e013 100644 --- a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj @@ -18,7 +18,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 6d9a5f60..e7ee00be 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -8,7 +8,7 @@ Library SkiaSharpSample.Droid SkiaSharpSample.Android - v8.0 + v8.1 True Resources\Resource.designer.cs Resource @@ -49,7 +49,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj index 3a43fbdf..f7215a56 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj @@ -22,7 +22,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 2abeb335..ff4f9d14 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -11,8 +11,8 @@ SkiaSharpSample.UWP en-US UAP - 10.0.10240.0 - 10.0.10240.0 + 10.0.16299.0 + 10.0.16299.0 14 true 512 @@ -92,7 +92,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index e91c9c68..ada8a749 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -70,7 +70,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 0ad71273..2e286fa2 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -55,7 +55,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj index 3331d960..2d3ae69d 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj @@ -1,11 +1,11 @@ - netstandard1.3 + netstandard2.0 - + diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index 3f680305..7cc3129c 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -17,7 +17,7 @@ Off Properties\AndroidManifest.xml false - v8.0 + v8.1 armeabi-v7a;x86;arm64-v8a;x86_64 @@ -51,7 +51,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj index 061164e0..0c62bec0 100644 --- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj +++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj @@ -1,12 +1,12 @@  - netstandard1.3 + netstandard2.0 $(DefineConstants);NET_STANDARD - + diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index 92eba355..575d63c8 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -55,7 +55,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj index c3815135..63c5ebfe 100644 --- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj +++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj @@ -20,7 +20,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 3e584b87..6dd994d8 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -11,8 +11,8 @@ SkiaSharpSample.UWP en-US UAP - 10.0.10240.0 - 10.0.10240.0 + 10.0.16299.0 + 10.0.16299.0 14 true 512 @@ -92,7 +92,7 @@ - + @@ -127,7 +127,7 @@ - + Windows Mobile Extensions for the UWP diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index abb5e462..b01727c6 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -112,7 +112,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj index 07eaa5d8..ecb3ddb3 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj @@ -1,7 +1,7 @@  - monoandroid8.0 + monoandroid8.1 library SkiaSharp.Views.Forms SkiaSharp.Views.Forms @@ -13,7 +13,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj index a5d50717..d035e16b 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj @@ -13,7 +13,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj index 3a053446..4945fe1a 100755 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj @@ -13,7 +13,7 @@ $(DefineConstants);__TIZEN__; - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj index 1ff44e7f..2a64f6b9 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj @@ -1,7 +1,7 @@  - uap10.0.10240 + uap10.0.16299 library SkiaSharp.Views.Forms SkiaSharp.Views.Forms @@ -12,7 +12,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj index b5c388e2..8e55dedf 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj @@ -13,7 +13,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj index d02e880b..21f04976 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj @@ -12,7 +12,7 @@ - +