diff --git a/binding/Binding/Properties/SkiaSharpAssemblyInfo.cs b/binding/Binding/Properties/SkiaSharpAssemblyInfo.cs index 8cbdbde7..5bd8d3de 100644 --- a/binding/Binding/Properties/SkiaSharpAssemblyInfo.cs +++ b/binding/Binding/Properties/SkiaSharpAssemblyInfo.cs @@ -9,9 +9,9 @@ using System.Reflection; [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SkiaSharp")] -[assembly: AssemblyVersion("1.59.0.0")] -[assembly: AssemblyFileVersion("1.59.1.0")] -[assembly: AssemblyInformationalVersion("1.59.1.0-{GIT_SHA}")] +[assembly: AssemblyVersion("1.60.0.0")] +[assembly: AssemblyFileVersion("1.60.0.0")] +[assembly: AssemblyInformationalVersion("1.60.0.0-{GIT_SHA}")] [assembly: AssemblyCopyright("Xamarin Inc.")] [assembly: AssemblyTrademark("")] diff --git a/build.cake b/build.cake index 990b6246..24ddf7d3 100644 --- a/build.cake +++ b/build.cake @@ -25,8 +25,8 @@ var SNToolPath = GetSNToolPath (EnvironmentVariable ("SN_EXE")); var MSBuildToolPath = GetMSBuildToolPath (EnvironmentVariable ("MSBUILD_EXE")); var PythonToolPath = EnvironmentVariable ("PYTHON_EXE") ?? "python"; -var VERSION_ASSEMBLY = "1.59.0.0"; -var VERSION_FILE = "1.59.1.0"; +var VERSION_ASSEMBLY = "1.60.0.0"; +var VERSION_FILE = "1.60.0.0"; var VERSION_SONAME = VERSION_FILE.Substring(VERSION_FILE.IndexOf(".") + 1); var ANGLE_VERSION_SOURCE = "2.1.13"; @@ -37,10 +37,10 @@ var HARFBUZZ_VERSION_FILE = "1.4.6.0"; var HARFBUZZ_VERSION_SONAME = HARFBUZZ_VERSION_FILE.Substring(0, HARFBUZZ_VERSION_FILE.LastIndexOf(".")); var VERSION_PACKAGES = new Dictionary { - { "SkiaSharp", "1.59.1" }, - { "SkiaSharp.Views", "1.59.1" }, - { "SkiaSharp.Views.Forms", "1.59.1" }, - { "SkiaSharp.HarfBuzz", "1.59.0-beta" }, + { "SkiaSharp", "1.60.0" }, + { "SkiaSharp.Views", "1.60.0" }, + { "SkiaSharp.Views.Forms", "1.60.0" }, + { "SkiaSharp.HarfBuzz", "1.60.0-beta" }, { "HarfBuzzSharp", "1.4.6" }, }; diff --git a/nuget/SkiaSharp.HarfBuzz.nuspec b/nuget/SkiaSharp.HarfBuzz.nuspec index 531f17b3..29d0885f 100644 --- a/nuget/SkiaSharp.HarfBuzz.nuspec +++ b/nuget/SkiaSharp.HarfBuzz.nuspec @@ -3,7 +3,7 @@ SkiaSharp.HarfBuzz SkiaSharp.HarfBuzz - 1.59.0-beta + 1.60.0-beta Xamarin Inc. Xamarin Inc. false @@ -14,7 +14,7 @@ https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png xamarin,graphics,ios,android,windows,uwp,tvos,watchos,macos,cross-platform,skiasharp - + diff --git a/nuget/SkiaSharp.Linux.nuspec b/nuget/SkiaSharp.Linux.nuspec index c7af11b1..e86f93c6 100644 --- a/nuget/SkiaSharp.Linux.nuspec +++ b/nuget/SkiaSharp.Linux.nuspec @@ -3,7 +3,7 @@ SkiaSharp SkiaSharp (for Linux) - 1.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false diff --git a/nuget/SkiaSharp.Mac.nuspec b/nuget/SkiaSharp.Mac.nuspec index 30597a33..98d817a5 100644 --- a/nuget/SkiaSharp.Mac.nuspec +++ b/nuget/SkiaSharp.Mac.nuspec @@ -3,7 +3,7 @@ SkiaSharp SkiaSharp (for macOS) - 1.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false diff --git a/nuget/SkiaSharp.Views.Forms.Mac.nuspec b/nuget/SkiaSharp.Views.Forms.Mac.nuspec index ca3343df..d4746cc6 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.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false @@ -16,22 +16,22 @@ - + - - + + - - + + - - + + diff --git a/nuget/SkiaSharp.Views.Forms.Windows.nuspec b/nuget/SkiaSharp.Views.Forms.Windows.nuspec index c92b3cc1..a6a1f04b 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.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false @@ -16,12 +16,12 @@ - + - - + + diff --git a/nuget/SkiaSharp.Views.Forms.nuspec b/nuget/SkiaSharp.Views.Forms.nuspec index 9a8cb89f..960cdc39 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.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false @@ -16,27 +16,27 @@ - + - - + + - - + + - - + + - - + + diff --git a/nuget/SkiaSharp.Views.Mac.nuspec b/nuget/SkiaSharp.Views.Mac.nuspec index 933c2dfa..8f9a3f49 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.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false @@ -14,7 +14,7 @@ https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png ui,xamarin,graphics,ios,android,linux,windows,uwp,tvos,watchos,macos,cross-platform,skiasharp - + diff --git a/nuget/SkiaSharp.Views.Windows.nuspec b/nuget/SkiaSharp.Views.Windows.nuspec index 52685fb9..dd6f3a31 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.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false @@ -14,7 +14,7 @@ https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png ui,xamarin,graphics,ios,android,linux,windows,uwp,tvos,watchos,macos,cross-platform,skiasharp - + diff --git a/nuget/SkiaSharp.Views.nuspec b/nuget/SkiaSharp.Views.nuspec index 725e1c7b..352f4c55 100644 --- a/nuget/SkiaSharp.Views.nuspec +++ b/nuget/SkiaSharp.Views.nuspec @@ -3,7 +3,7 @@ SkiaSharp.Views SkiaSharp Views & Layers - 1.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false @@ -14,7 +14,7 @@ https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png ui,xamarin,graphics,ios,android,linux,windows,uwp,tvos,watchos,macos,cross-platform,skiasharp - + diff --git a/nuget/SkiaSharp.Windows.nuspec b/nuget/SkiaSharp.Windows.nuspec index 632cf115..2b3b59d1 100644 --- a/nuget/SkiaSharp.Windows.nuspec +++ b/nuget/SkiaSharp.Windows.nuspec @@ -3,7 +3,7 @@ SkiaSharp SkiaSharp (for Windows) - 1.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec index ba122b26..2b2b10bb 100644 --- a/nuget/SkiaSharp.nuspec +++ b/nuget/SkiaSharp.nuspec @@ -3,7 +3,7 @@ SkiaSharp SkiaSharp - 1.59.1 + 1.60.0 Xamarin Inc. Xamarin Inc. false diff --git a/samples/FormsSample/Android/Android.csproj b/samples/FormsSample/Android/Android.csproj index 85055a8a..0e50d20c 100644 --- a/samples/FormsSample/Android/Android.csproj +++ b/samples/FormsSample/Android/Android.csproj @@ -53,10 +53,10 @@ - - + + - + diff --git a/samples/FormsSample/Core/Core.csproj b/samples/FormsSample/Core/Core.csproj index abadd063..b24a7868 100644 --- a/samples/FormsSample/Core/Core.csproj +++ b/samples/FormsSample/Core/Core.csproj @@ -8,10 +8,10 @@ - - + + - + diff --git a/samples/FormsSample/Mac/Mac.csproj b/samples/FormsSample/Mac/Mac.csproj index 0859affe..6f2d7d3d 100644 --- a/samples/FormsSample/Mac/Mac.csproj +++ b/samples/FormsSample/Mac/Mac.csproj @@ -51,10 +51,10 @@ - - + + - + diff --git a/samples/FormsSample/UWP/project.json b/samples/FormsSample/UWP/project.json index 89733b44..49b66121 100644 --- a/samples/FormsSample/UWP/project.json +++ b/samples/FormsSample/UWP/project.json @@ -3,11 +3,11 @@ "HarfBuzzSharp": "1.4.6", "Microsoft.NETCore.UniversalWindowsPlatform": "5.4.0", "PCLStorage": "1.0.2", - "SkiaSharp": "1.59.1", - "SkiaSharp.HarfBuzz": "1.59.0-beta", + "SkiaSharp": "1.60.0", + "SkiaSharp.HarfBuzz": "1.60.0-beta", "SkiaSharp.Svg": "1.59.0", - "SkiaSharp.Views": "1.59.1", - "SkiaSharp.Views.Forms": "1.59.1", + "SkiaSharp.Views": "1.60.0", + "SkiaSharp.Views.Forms": "1.60.0", "Xamarin.Forms": "2.4.0.269-pre2" }, "frameworks": { diff --git a/samples/FormsSample/iOS/iOS.csproj b/samples/FormsSample/iOS/iOS.csproj index 681fce11..30e12a48 100644 --- a/samples/FormsSample/iOS/iOS.csproj +++ b/samples/FormsSample/iOS/iOS.csproj @@ -113,10 +113,10 @@ - - + + - + diff --git a/samples/MacSample/MacSample/MacSample.csproj b/samples/MacSample/MacSample/MacSample.csproj index 0d198ff5..a5b7aabc 100644 --- a/samples/MacSample/MacSample/MacSample.csproj +++ b/samples/MacSample/MacSample/MacSample.csproj @@ -54,10 +54,10 @@ - - + + - + diff --git a/samples/TvSample/TvSample/TvSample.csproj b/samples/TvSample/TvSample/TvSample.csproj index 64f1fbd2..8cc5c805 100644 --- a/samples/TvSample/TvSample/TvSample.csproj +++ b/samples/TvSample/TvSample/TvSample.csproj @@ -87,10 +87,10 @@ - - + + - + diff --git a/samples/UWPSample/UWPSample/project.json b/samples/UWPSample/UWPSample/project.json index 5c655259..edf68de1 100644 --- a/samples/UWPSample/UWPSample/project.json +++ b/samples/UWPSample/UWPSample/project.json @@ -3,10 +3,10 @@ "HarfBuzzSharp": "1.4.6", "Microsoft.NETCore.UniversalWindowsPlatform": "5.4.0", "PCLStorage": "1.0.2", - "SkiaSharp": "1.59.1", - "SkiaSharp.HarfBuzz": "1.59.0-beta", + "SkiaSharp": "1.60.0", + "SkiaSharp.HarfBuzz": "1.60.0-beta", "SkiaSharp.Svg": "1.59.0", - "SkiaSharp.Views": "1.59.1" + "SkiaSharp.Views": "1.60.0" }, "frameworks": { "uap10.0": {} diff --git a/samples/WPFSample/WPFSample/WPFSample.csproj b/samples/WPFSample/WPFSample/WPFSample.csproj index 0cc499d9..ecb57c09 100644 --- a/samples/WPFSample/WPFSample/WPFSample.csproj +++ b/samples/WPFSample/WPFSample/WPFSample.csproj @@ -97,10 +97,10 @@ - - + + - + diff --git a/samples/WatchSample/WatchSample.OnWatch/WatchSample.OnWatch.csproj b/samples/WatchSample/WatchSample.OnWatch/WatchSample.OnWatch.csproj index fc5630dc..ed34ccd7 100644 --- a/samples/WatchSample/WatchSample.OnWatch/WatchSample.OnWatch.csproj +++ b/samples/WatchSample/WatchSample.OnWatch/WatchSample.OnWatch.csproj @@ -1,4 +1,4 @@ - + Debug @@ -85,8 +85,8 @@ - - + + diff --git a/samples/WatchSample/WatchSample.OnWatchExtension/WatchSample.OnWatchExtension.csproj b/samples/WatchSample/WatchSample.OnWatchExtension/WatchSample.OnWatchExtension.csproj index da7f81c8..b5841bdc 100644 --- a/samples/WatchSample/WatchSample.OnWatchExtension/WatchSample.OnWatchExtension.csproj +++ b/samples/WatchSample/WatchSample.OnWatchExtension/WatchSample.OnWatchExtension.csproj @@ -1,4 +1,4 @@ - + Debug @@ -85,8 +85,8 @@ - - + + diff --git a/samples/WindowsSample/WindowsSample/WindowsSample.csproj b/samples/WindowsSample/WindowsSample/WindowsSample.csproj index caaf651a..093b4ccd 100644 --- a/samples/WindowsSample/WindowsSample/WindowsSample.csproj +++ b/samples/WindowsSample/WindowsSample/WindowsSample.csproj @@ -91,10 +91,10 @@ - - + + - + diff --git a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Shared/Properties/SkiaSharpHarfBuzzAssemblyInfo.cs b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Shared/Properties/SkiaSharpHarfBuzzAssemblyInfo.cs index 727371aa..09bb2129 100644 --- a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Shared/Properties/SkiaSharpHarfBuzzAssemblyInfo.cs +++ b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Shared/Properties/SkiaSharpHarfBuzzAssemblyInfo.cs @@ -9,9 +9,9 @@ using System.Reflection; [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SkiaSharp.HarfBuzz")] -[assembly: AssemblyVersion("1.59.0.0")] -[assembly: AssemblyFileVersion("1.59.1.0")] -[assembly: AssemblyInformationalVersion("1.59.1.0-{GIT_SHA}")] +[assembly: AssemblyVersion("1.60.0.0")] +[assembly: AssemblyFileVersion("1.60.0.0")] +[assembly: AssemblyInformationalVersion("1.60.0.0-{GIT_SHA}")] [assembly: AssemblyCopyright("Xamarin Inc.")] [assembly: AssemblyTrademark("")] diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Shared/Properties/SkiaSharpViewsFormsAssemblyInfo.cs b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Shared/Properties/SkiaSharpViewsFormsAssemblyInfo.cs index b6064784..3fbd4f24 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Shared/Properties/SkiaSharpViewsFormsAssemblyInfo.cs +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Shared/Properties/SkiaSharpViewsFormsAssemblyInfo.cs @@ -9,9 +9,9 @@ using System.Reflection; [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SkiaSharp.Views.Forms")] -[assembly: AssemblyVersion("1.59.0.0")] -[assembly: AssemblyFileVersion("1.59.1.0")] -[assembly: AssemblyInformationalVersion("1.59.1.0-{GIT_SHA}")] +[assembly: AssemblyVersion("1.60.0.0")] +[assembly: AssemblyFileVersion("1.60.0.0")] +[assembly: AssemblyInformationalVersion("1.60.0.0-{GIT_SHA}")] [assembly: AssemblyCopyright("Xamarin Inc.")] [assembly: AssemblyTrademark("")] diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Shared/Properties/SkiaSharpViewsAssemblyInfo.cs b/source/SkiaSharp.Views/SkiaSharp.Views.Shared/Properties/SkiaSharpViewsAssemblyInfo.cs index fca910f8..aef21ff1 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Shared/Properties/SkiaSharpViewsAssemblyInfo.cs +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Shared/Properties/SkiaSharpViewsAssemblyInfo.cs @@ -9,9 +9,9 @@ using System.Reflection; [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SkiaSharp.Views")] -[assembly: AssemblyVersion("1.59.0.0")] -[assembly: AssemblyFileVersion("1.59.1.0")] -[assembly: AssemblyInformationalVersion("1.59.1.0-{GIT_SHA}")] +[assembly: AssemblyVersion("1.60.0.0")] +[assembly: AssemblyFileVersion("1.60.0.0")] +[assembly: AssemblyInformationalVersion("1.60.0.0-{GIT_SHA}")] [assembly: AssemblyCopyright("Xamarin Inc.")] [assembly: AssemblyTrademark("")] diff --git a/source/SkiaSharp.Workbooks/Properties/SkiaSharpWorkbooksAssemblyInfo.cs b/source/SkiaSharp.Workbooks/Properties/SkiaSharpWorkbooksAssemblyInfo.cs index 5aac5eba..0b8257e6 100644 --- a/source/SkiaSharp.Workbooks/Properties/SkiaSharpWorkbooksAssemblyInfo.cs +++ b/source/SkiaSharp.Workbooks/Properties/SkiaSharpWorkbooksAssemblyInfo.cs @@ -9,9 +9,9 @@ using System.Reflection; [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SkiaSharp")] -[assembly: AssemblyVersion("1.59.0.0")] -[assembly: AssemblyFileVersion("1.59.1.0")] -[assembly: AssemblyInformationalVersion("1.59.1.0-{GIT_SHA}")] +[assembly: AssemblyVersion("1.60.0.0")] +[assembly: AssemblyFileVersion("1.60.0.0")] +[assembly: AssemblyInformationalVersion("1.60.0.0-{GIT_SHA}")] [assembly: AssemblyCopyright("Microsoft")] [assembly: AssemblyTrademark("")] diff --git a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj index 5606d006..7862a81b 100644 --- a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj +++ b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj @@ -32,7 +32,7 @@ - - + + \ No newline at end of file