From a2856a131a1a3f5f379ca8b4c2cd0ddbb1e07063 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 18 Oct 2016 19:04:16 +0200 Subject: [PATCH] Revert "SkiaSharp Views are no longer beta :)" This reverts commit 7ea17bcfa41057d7a29dc30c64b53fbc43b15d19. --- build.cake | 4 ++-- nuget/SkiaSharp.Views.Forms.Mac.nuspec | 6 +++--- nuget/SkiaSharp.Views.Forms.Windows.nuspec | 4 ++-- nuget/SkiaSharp.Views.Forms.nuspec | 8 ++++---- nuget/SkiaSharp.Views.Mac.nuspec | 2 +- nuget/SkiaSharp.Views.Windows.nuspec | 2 +- nuget/SkiaSharp.Views.nuspec | 2 +- samples/FormsSample/Android/Android.csproj | 4 ++-- samples/FormsSample/Android/packages.config | 4 ++-- samples/FormsSample/Core/Core.csproj | 2 +- samples/FormsSample/Core/packages.config | 2 +- samples/FormsSample/UWP/UWP.nuget.targets | 2 +- samples/FormsSample/UWP/project.json | 4 ++-- samples/FormsSample/iOS/iOS.csproj | 7 ++++--- samples/FormsSample/iOS/packages.config | 4 ++-- samples/MacSample/MacSample/MacSample.csproj | 2 +- samples/MacSample/MacSample/packages.config | 2 +- samples/TvSample/TvSample/TvSample.csproj | 2 +- samples/TvSample/TvSample/packages.config | 2 +- samples/UWPSample/UWPSample/UWPSample.nuget.targets | 2 +- samples/UWPSample/UWPSample/project.json | 2 +- samples/WPFSample/WPFSample/WPFSample.csproj | 4 ++-- samples/WPFSample/WPFSample/packages.config | 2 +- samples/WindowsSample/WindowsSample/WindowsSample.csproj | 4 ++-- samples/WindowsSample/WindowsSample/packages.config | 2 +- 25 files changed, 41 insertions(+), 40 deletions(-) diff --git a/build.cake b/build.cake index 9cf4dc3f0..5b13584e9 100644 --- a/build.cake +++ b/build.cake @@ -319,8 +319,8 @@ Task ("set-versions") var fileVersion = "1.55.0.0"; var versions = new Dictionary { { "SkiaSharp", "1.55.0" }, - { "SkiaSharp.Views", "1.55.0" }, - { "SkiaSharp.Views.Forms", "1.55.0" }, + { "SkiaSharp.Views", "1.55.0-beta1" }, + { "SkiaSharp.Views.Forms", "1.55.0-beta1" }, { "SkiaSharp.Svg", "1.55.0-beta1" }, }; diff --git a/nuget/SkiaSharp.Views.Forms.Mac.nuspec b/nuget/SkiaSharp.Views.Forms.Mac.nuspec index 6edceb6de..1b8fe9473 100644 --- a/nuget/SkiaSharp.Views.Forms.Mac.nuspec +++ b/nuget/SkiaSharp.Views.Forms.Mac.nuspec @@ -3,7 +3,7 @@ SkiaSharp.Views.Forms SkiaSharp for Xamarin.Forms (for macOS) - 1.55.0 + 1.55.0-beta1 Xamarin Inc. Xamarin Inc. false @@ -20,12 +20,12 @@ - + - + diff --git a/nuget/SkiaSharp.Views.Forms.Windows.nuspec b/nuget/SkiaSharp.Views.Forms.Windows.nuspec index e318aac12..aae1ebf76 100644 --- a/nuget/SkiaSharp.Views.Forms.Windows.nuspec +++ b/nuget/SkiaSharp.Views.Forms.Windows.nuspec @@ -3,7 +3,7 @@ SkiaSharp.Views.Forms SkiaSharp for Xamarin.Forms (for Windows) - 1.55.0 + 1.55.0-beta1 Xamarin Inc. Xamarin Inc. false @@ -20,7 +20,7 @@ - + diff --git a/nuget/SkiaSharp.Views.Forms.nuspec b/nuget/SkiaSharp.Views.Forms.nuspec index 2827c8640..872c903fe 100644 --- a/nuget/SkiaSharp.Views.Forms.nuspec +++ b/nuget/SkiaSharp.Views.Forms.nuspec @@ -3,7 +3,7 @@ SkiaSharp.Views.Forms SkiaSharp for Xamarin.Forms - 1.55.0 + 1.55.0-beta1 Xamarin Inc. Xamarin Inc. false @@ -20,17 +20,17 @@ - + - + - + diff --git a/nuget/SkiaSharp.Views.Mac.nuspec b/nuget/SkiaSharp.Views.Mac.nuspec index 151f5f1f3..2c73c1e9f 100644 --- a/nuget/SkiaSharp.Views.Mac.nuspec +++ b/nuget/SkiaSharp.Views.Mac.nuspec @@ -3,7 +3,7 @@ SkiaSharp.Views SkiaSharp Views & Layers (for macOS) - 1.55.0 + 1.55.0-beta1 Xamarin Inc. Xamarin Inc. false diff --git a/nuget/SkiaSharp.Views.Windows.nuspec b/nuget/SkiaSharp.Views.Windows.nuspec index b4c98e9b7..841026c72 100644 --- a/nuget/SkiaSharp.Views.Windows.nuspec +++ b/nuget/SkiaSharp.Views.Windows.nuspec @@ -3,7 +3,7 @@ SkiaSharp.Views SkiaSharp Views & Layers (for Windows) - 1.55.0 + 1.55.0-beta1 Xamarin Inc. Xamarin Inc. false diff --git a/nuget/SkiaSharp.Views.nuspec b/nuget/SkiaSharp.Views.nuspec index 77b31663f..a82ca26eb 100644 --- a/nuget/SkiaSharp.Views.nuspec +++ b/nuget/SkiaSharp.Views.nuspec @@ -3,7 +3,7 @@ SkiaSharp.Views SkiaSharp Views & Layers - 1.55.0 + 1.55.0-beta1 Xamarin Inc. Xamarin Inc. false diff --git a/samples/FormsSample/Android/Android.csproj b/samples/FormsSample/Android/Android.csproj index 7caa4efca..088dd2647 100644 --- a/samples/FormsSample/Android/Android.csproj +++ b/samples/FormsSample/Android/Android.csproj @@ -72,11 +72,11 @@ True - ..\packages\SkiaSharp.Views.1.55.0\lib\MonoAndroid\SkiaSharp.Views.Android.dll + ..\packages\SkiaSharp.Views.1.55.0-beta1\lib\MonoAndroid\SkiaSharp.Views.Android.dll True - ..\packages\SkiaSharp.Views.Forms.1.55.0\lib\MonoAndroid\SkiaSharp.Views.Forms.dll + ..\packages\SkiaSharp.Views.Forms.1.55.0-beta1\lib\MonoAndroid\SkiaSharp.Views.Forms.dll True diff --git a/samples/FormsSample/Android/packages.config b/samples/FormsSample/Android/packages.config index 19330d698..5a6339dca 100644 --- a/samples/FormsSample/Android/packages.config +++ b/samples/FormsSample/Android/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/samples/FormsSample/Core/Core.csproj b/samples/FormsSample/Core/Core.csproj index 9b20e1dd1..204c0360f 100644 --- a/samples/FormsSample/Core/Core.csproj +++ b/samples/FormsSample/Core/Core.csproj @@ -82,7 +82,7 @@ True - ..\packages\SkiaSharp.Views.Forms.1.55.0\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Views.Forms.dll + ..\packages\SkiaSharp.Views.Forms.1.55.0-beta1\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Views.Forms.dll True diff --git a/samples/FormsSample/Core/packages.config b/samples/FormsSample/Core/packages.config index 3f8289a90..a9886c926 100644 --- a/samples/FormsSample/Core/packages.config +++ b/samples/FormsSample/Core/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/samples/FormsSample/UWP/UWP.nuget.targets b/samples/FormsSample/UWP/UWP.nuget.targets index b41db3d5b..d927e1c17 100644 --- a/samples/FormsSample/UWP/UWP.nuget.targets +++ b/samples/FormsSample/UWP/UWP.nuget.targets @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/samples/FormsSample/UWP/project.json b/samples/FormsSample/UWP/project.json index 72cc8fe84..40edfc514 100644 --- a/samples/FormsSample/UWP/project.json +++ b/samples/FormsSample/UWP/project.json @@ -4,8 +4,8 @@ "PCLStorage": "1.0.2", "SkiaSharp": "1.55.0", "SkiaSharp.Svg": "1.55.0-beta1", - "SkiaSharp.Views": "1.55.0", - "SkiaSharp.Views.Forms": "1.55.0", + "SkiaSharp.Views": "1.55.0-beta1", + "SkiaSharp.Views.Forms": "1.55.0-beta1", "Xamarin.Forms": "2.3.0.49" }, "frameworks": { diff --git a/samples/FormsSample/iOS/iOS.csproj b/samples/FormsSample/iOS/iOS.csproj index 3f376591c..8f5ec158b 100644 --- a/samples/FormsSample/iOS/iOS.csproj +++ b/samples/FormsSample/iOS/iOS.csproj @@ -11,7 +11,8 @@ SkiaSharpSample.FormsSample.Platform Resources SkiaSharpSampleFormsSampleiOS - + + true @@ -153,11 +154,11 @@ True - ..\packages\SkiaSharp.Views.Forms.1.55.0\lib\XamariniOS\SkiaSharp.Views.Forms.dll + ..\packages\SkiaSharp.Views.Forms.1.55.0-beta1\lib\XamariniOS\SkiaSharp.Views.Forms.dll True - ..\packages\SkiaSharp.Views.1.55.0\lib\XamariniOS\SkiaSharp.Views.iOS.dll + ..\packages\SkiaSharp.Views.1.55.0-beta1\lib\XamariniOS\SkiaSharp.Views.iOS.dll True diff --git a/samples/FormsSample/iOS/packages.config b/samples/FormsSample/iOS/packages.config index beb66990c..2996f6d15 100644 --- a/samples/FormsSample/iOS/packages.config +++ b/samples/FormsSample/iOS/packages.config @@ -3,7 +3,7 @@ - - + + \ No newline at end of file diff --git a/samples/MacSample/MacSample/MacSample.csproj b/samples/MacSample/MacSample/MacSample.csproj index 070b68e9b..6c6efc9aa 100644 --- a/samples/MacSample/MacSample/MacSample.csproj +++ b/samples/MacSample/MacSample/MacSample.csproj @@ -57,7 +57,7 @@ True - ..\packages\SkiaSharp.Views.1.55.0\lib\XamarinMac\SkiaSharp.Views.Mac.dll + ..\packages\SkiaSharp.Views.1.55.0-beta1\lib\XamarinMac\SkiaSharp.Views.Mac.dll diff --git a/samples/MacSample/MacSample/packages.config b/samples/MacSample/MacSample/packages.config index 273286ab8..9f57615f5 100644 --- a/samples/MacSample/MacSample/packages.config +++ b/samples/MacSample/MacSample/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/samples/TvSample/TvSample/TvSample.csproj b/samples/TvSample/TvSample/TvSample.csproj index 8164cbd3b..bab9ce200 100644 --- a/samples/TvSample/TvSample/TvSample.csproj +++ b/samples/TvSample/TvSample/TvSample.csproj @@ -100,7 +100,7 @@ True - ..\packages\SkiaSharp.Views.1.55.0\lib\XamarintvOS\SkiaSharp.Views.tvOS.dll + ..\packages\SkiaSharp.Views.1.55.0-beta1\lib\XamarintvOS\SkiaSharp.Views.tvOS.dll diff --git a/samples/TvSample/TvSample/packages.config b/samples/TvSample/TvSample/packages.config index b30a9bce9..4346798a8 100644 --- a/samples/TvSample/TvSample/packages.config +++ b/samples/TvSample/TvSample/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/samples/UWPSample/UWPSample/UWPSample.nuget.targets b/samples/UWPSample/UWPSample/UWPSample.nuget.targets index 7a840b6ca..0948cda9d 100644 --- a/samples/UWPSample/UWPSample/UWPSample.nuget.targets +++ b/samples/UWPSample/UWPSample/UWPSample.nuget.targets @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/samples/UWPSample/UWPSample/project.json b/samples/UWPSample/UWPSample/project.json index f7cc31985..18d6f3cb8 100644 --- a/samples/UWPSample/UWPSample/project.json +++ b/samples/UWPSample/UWPSample/project.json @@ -4,7 +4,7 @@ "PCLStorage": "1.0.2", "SkiaSharp": "1.55.0", "SkiaSharp.Svg": "1.55.0-beta1", - "SkiaSharp.Views": "1.55.0" + "SkiaSharp.Views": "1.55.0-beta1" }, "frameworks": { "uap10.0": {} diff --git a/samples/WPFSample/WPFSample/WPFSample.csproj b/samples/WPFSample/WPFSample/WPFSample.csproj index 7b0833f45..6d9d91a9f 100644 --- a/samples/WPFSample/WPFSample/WPFSample.csproj +++ b/samples/WPFSample/WPFSample/WPFSample.csproj @@ -100,11 +100,11 @@ True - ..\packages\SkiaSharp.Views.1.55.0\lib\net45\SkiaSharp.Views.Desktop.dll + ..\packages\SkiaSharp.Views.1.55.0-beta1\lib\net45\SkiaSharp.Views.Desktop.dll True - ..\packages\SkiaSharp.Views.1.55.0\lib\net45\SkiaSharp.Views.WPF.dll + ..\packages\SkiaSharp.Views.1.55.0-beta1\lib\net45\SkiaSharp.Views.WPF.dll True diff --git a/samples/WPFSample/WPFSample/packages.config b/samples/WPFSample/WPFSample/packages.config index 25f03fa91..df2cf11ee 100644 --- a/samples/WPFSample/WPFSample/packages.config +++ b/samples/WPFSample/WPFSample/packages.config @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/samples/WindowsSample/WindowsSample/WindowsSample.csproj b/samples/WindowsSample/WindowsSample/WindowsSample.csproj index d61ba61fa..aa74e2b6d 100644 --- a/samples/WindowsSample/WindowsSample/WindowsSample.csproj +++ b/samples/WindowsSample/WindowsSample/WindowsSample.csproj @@ -101,11 +101,11 @@ True - ..\packages\SkiaSharp.Views.1.55.0\lib\net45\SkiaSharp.Views.Desktop.dll + ..\packages\SkiaSharp.Views.1.55.0-beta1\lib\net45\SkiaSharp.Views.Desktop.dll True - ..\packages\SkiaSharp.Views.1.55.0\lib\net45\SkiaSharp.Views.WPF.dll + ..\packages\SkiaSharp.Views.1.55.0-beta1\lib\net45\SkiaSharp.Views.WPF.dll True diff --git a/samples/WindowsSample/WindowsSample/packages.config b/samples/WindowsSample/WindowsSample/packages.config index 25f03fa91..df2cf11ee 100644 --- a/samples/WindowsSample/WindowsSample/packages.config +++ b/samples/WindowsSample/WindowsSample/packages.config @@ -5,5 +5,5 @@ - + \ No newline at end of file