Merge branch 'master' into dev/fix-536

VERSIONS.txt

@@ -15,15 +15,15 @@ HarfBuzz                soname      0.10406.0
 
 # SkiaSharp.dll
 SkiaSharp               assembly    1.60.0.0
-SkiaSharp               file        1.60.1.0
+SkiaSharp               file        1.60.2.0
 
 # HarfBuzzSharp.dll
 HarfBuzzSharp           assembly    1.0.0.0
 HarfBuzzSharp           file        1.4.6.1
 
 # nuget versions
-SkiaSharp               nuget       1.60.1
-SkiaSharp.Views         nuget       1.60.1
-SkiaSharp.Views.Forms   nuget       1.60.1
-SkiaSharp.HarfBuzz      nuget       1.60.1
+SkiaSharp               nuget       1.60.2
+SkiaSharp.Views         nuget       1.60.2
+SkiaSharp.Views.Forms   nuget       1.60.2
+SkiaSharp.HarfBuzz      nuget       1.60.2
 HarfBuzzSharp           nuget       1.4.6.1

install-tizen.sh

@@ -3,7 +3,7 @@
 # download tizen
 mkdir ~/tizen-temp
 cd ~/tizen-temp
-curl -L -o "tizen-install.bin" http://download.tizen.org/sdk/Installer/tizen-studio_2.3/web-cli_Tizen_Studio_2.3_ubuntu-64.bin
+curl -L -o "tizen-install.bin" http://download.tizen.org/sdk/Installer/tizen-studio_2.4/web-cli_Tizen_Studio_2.4_ubuntu-64.bin
 
 # install tizen
 chmod +x tizen-install.bin
@@ -12,4 +12,3 @@ chmod +x tizen-install.bin
 # install packages
 cd ~/tizen-studio
 ./package-manager/package-manager-cli.bin install --no-java-check --accept-license MOBILE-4.0
-./package-manager/package-manager-cli.bin install --no-java-check --accept-license MOBILE-4.0

tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj

@@ -19,8 +19,8 @@
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.4.0-beta.1.build3958" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.1.build3958" />
-    <PackageReference Include="SkiaSharp" Version="1.60.1" />
-    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.2" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="1.60.2" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />

workbooks/SkiaSharp.WPF.workbook

@@ -6,9 +6,9 @@ platforms:
 - WPF
 packages:
 - id: SkiaSharp
-  version: 1.60.1
+  version: 1.60.2
 - id: SkiaSharp.Views
-  version: 1.60.1
+  version: 1.60.2
 ---
 
 # SkiaSharp on WPF Workbook

workbooks/SkiaSharp.iOS.workbook

@@ -6,9 +6,9 @@ platforms:
 - iOS
 packages:
 - id: SkiaSharp
-  version: 1.60.1
+  version: 1.60.2
 - id: SkiaSharp.Views
-  version: 1.60.1
+  version: 1.60.2
 ---
 
 # SkiaSharp on iOS Workbook

workbooks/SkiaSharp.workbook

@@ -6,7 +6,7 @@ platforms:
 - DotNetCore
 packages:
 - id: SkiaSharp
-  version: 1.60.1
+  version: 1.60.2
 ---
 
 # SkiaSharp Workbook