Updated all the samples (#1021)

* Updated all the samples with new things * Update the docs
mono · Nov 21, 2019 · 83ba22c · 83ba22c
1 parent a6a514c
commit 83ba22c
Show file tree

Hide file tree

Showing 48 changed files with 172 additions and 315 deletions.
diff --git a/VERSIONS.txt b/VERSIONS.txt
@@ -16,6 +16,7 @@ Cake                                            release     0.35.0
 GtkSharp                                        release     3.22.24.37
 GLibSharp                                       release     3.22.24.37
 AtkSharp                                        release     3.22.24.37
+System.Memory                                   release     4.5.3
 
 # additional references used by the tooling
 OpenTK.GLControl                                reference   1.1.2349.61993

diff --git a/cake/UpdateDocs.cake b/cake/UpdateDocs.cake
@@ -35,7 +35,7 @@ void CopyChangelogs (DirectoryPath diffRoot, string id, string version)
     }
 }
 
-Task ("docs-download-output")
+Task ("docs-download-build-artifact")
     .IsDependentOn ("download-last-successful-build")
     .Does (() =>
 {
@@ -45,6 +45,11 @@ Task ("docs-download-output")
     CleanDirectories ("./output");
 
     DownloadFile(url, "./output/nuget.zip");
+});
+
+Task ("docs-expand-build-artifact")
+    .Does (() =>
+{
     Unzip ("./output/nuget.zip", "./output");
     MoveDirectory ("./output/nuget", "./output/nugets");
 
@@ -56,6 +61,10 @@ Task ("docs-download-output")
     }
 });
 
+Task ("docs-download-output")
+    .IsDependentOn ("docs-download-build-artifact")
+    .IsDependentOn ("docs-expand-build-artifact");
+
 Task ("docs-api-diff")
     .Does (async () =>
 {

diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake
@@ -377,6 +377,7 @@ async Task<NuGetDiff> CreateNuGetDiffAsync ()
     await AddDep ("GtkSharp", "netstandard2.0");
     await AddDep ("GLibSharp", "netstandard2.0");
     await AddDep ("AtkSharp", "netstandard2.0");
+    await AddDep ("System.Memory", "netstandard2.0");
 
     return comparer;
 

diff --git a/changelogs/SkiaSharp/1.68.1/SkiaSharp.md b/changelogs/SkiaSharp/1.68.1/SkiaSharp.md
@@ -572,9 +572,12 @@ protected override void DisposeNative ();
 
 #### Type Changed: SkiaSharp.SKTypeface
 
-Added property:
+Added properties:
 
 ```csharp
+public bool IsBold { get; }
+public bool IsFixedPitch { get; }
+public bool IsItalic { get; }
 public int TableCount { get; }
 ```
 

diff --git a/docs b/docs
diff --git a/samples/Basic/Android/SkiaSharpSample/Properties/AndroidManifest.xml b/samples/Basic/Android/SkiaSharpSample/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" package="com.companyname.skiasharpsample" android:versionCode="1">
-	<uses-sdk android:minSdkVersion="10" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
 	<application android:allowBackup="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:theme="@style/Theme.AppCompat" android:hardwareAccelerated="true"></application>
 </manifest>
diff --git a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj
@@ -15,7 +15,6 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -27,6 +26,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidDexTool>d8</AndroidDexTool>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,6 +38,8 @@
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <AndroidLinkMode>Full</AndroidLinkMode>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Tizen.NET.Sdk/1.0.8">
 
   <PropertyGroup>
     <TargetFramework>tizen40</TargetFramework>
@@ -13,12 +13,6 @@
     <DebugType>None</DebugType>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
-    <PackageReference Include="Tizen.NET" Version="4.0.0" />
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj" />
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
@@ -39,6 +33,4 @@
 
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />
 
-  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
-
 </Project>
diff --git a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Tizen.NET.Sdk/1.0.8">
 
   <PropertyGroup>
     <TargetFramework>tizen40</TargetFramework>
@@ -16,9 +16,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
-    <PackageReference Include="Tizen.NET" Version="4.0.0" />
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
     <PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
   </ItemGroup>
 
@@ -43,6 +40,4 @@
 
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />
 
-  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
-
 </Project>
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/Properties/AndroidManifest.xml b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.SkiaSharpSample" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="15" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
 	<application android:label="SkiaSharpSample.Android" android:icon="@drawable/icon" android:theme="@style/MainTheme"></application>
 </manifest>
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
@@ -15,7 +15,6 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -27,6 +26,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidDexTool>d8</AndroidDexTool>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,6 +38,8 @@
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <AndroidLinkMode>Full</AndroidLinkMode>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -63,7 +65,7 @@
       <Name>SkiaSharp.Views.Android</Name>
     </ProjectReference>
     <ProjectReference Include="..\SkiaSharpSample\SkiaSharpSample.csproj">
-      <Project>{7CF655F1-590C-4A0B-92A4-78D104AD38E9}</Project>
+      <Project>{B178E8E3-A5AD-4C98-B365-86E05EE53643}</Project>
       <Name>SkiaSharpSample</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Tizen.NET.Sdk/1.0.8">
 
   <PropertyGroup>
     <TargetFramework>tizen40</TargetFramework>
@@ -20,9 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.65" PrivateAssets="All" />
-    <PackageReference Include="Tizen.NET" Version="4.0.0" />
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
     <PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
   </ItemGroup>
 
@@ -48,6 +45,4 @@
 
   <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />
 
-  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
-
 </Project>
diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
@@ -23,7 +23,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>x86_64</MtouchArch>
+    <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
   </PropertyGroup>
@@ -34,7 +34,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
-    <MtouchArch>x86_64</MtouchArch>
+    <MtouchArch>i386, x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@@ -46,7 +46,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARM64</MtouchArch>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -57,7 +57,7 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARM64</MtouchArch>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>

diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
@@ -28,9 +28,10 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <Profiling>true</Profiling>
-    <HttpClientHandler></HttpClientHandler>
+    <HttpClientHandler>NSUrlSessionHandler</HttpClientHandler>
     <LinkMode></LinkMode>
     <XamMacArch></XamMacArch>
+    <AOTMode>None</AOTMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -46,8 +47,10 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <LinkMode>Full</LinkMode>
-    <HttpClientHandler></HttpClientHandler>
+    <HttpClientHandler>NSUrlSessionHandler</HttpClientHandler>
     <XamMacArch></XamMacArch>
+    <AOTMode>None</AOTMode>
+    <MonoBundlingExtraArgs>--linkskip=Xamarin.Forms.Platform.macOS</MonoBundlingExtraArgs>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj
@@ -25,8 +25,8 @@
     <MtouchProfiling>true</MtouchProfiling>
     <IOSDebuggerPort>41640</IOSDebuggerPort>
     <MtouchLink>None</MtouchLink>
-    <MtouchArch>x86_64</MtouchArch>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <DeviceSpecificBuild>false</DeviceSpecificBuild>
     <MtouchVerbosity></MtouchVerbosity>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -42,8 +42,8 @@
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>Full</MtouchLink>
-    <MtouchArch>ARM64</MtouchArch>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity></MtouchVerbosity>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -56,8 +56,8 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
     <MtouchLink>None</MtouchLink>
-    <MtouchArch>x86_64</MtouchArch>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity></MtouchVerbosity>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@@ -78,8 +78,8 @@
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <IOSDebuggerPort>59169</IOSDebuggerPort>
     <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchArch>ARM64</MtouchArch>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity></MtouchVerbosity>
   </PropertyGroup>
   <ItemGroup>

diff --git a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj
@@ -28,7 +28,7 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <Profiling>true</Profiling>
-    <HttpClientHandler></HttpClientHandler>
+    <HttpClientHandler>NSUrlSessionHandler</HttpClientHandler>
     <LinkMode></LinkMode>
     <XamMacArch></XamMacArch>
     <AOTMode>None</AOTMode>
@@ -47,7 +47,7 @@
     <UseSGen>true</UseSGen>
     <UseRefCounting>true</UseRefCounting>
     <LinkMode>Full</LinkMode>
-    <HttpClientHandler></HttpClientHandler>
+    <HttpClientHandler>NSUrlSessionHandler</HttpClientHandler>
     <XamMacArch></XamMacArch>
     <AOTMode>None</AOTMode>
   </PropertyGroup>

diff --git a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj
@@ -26,7 +26,7 @@
     <IOSDebuggerPort>19489</IOSDebuggerPort>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <DeviceSpecificBuild>false</DeviceSpecificBuild>
     <MtouchVerbosity></MtouchVerbosity>
   </PropertyGroup>
@@ -44,7 +44,7 @@
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>Full</MtouchLink>
     <MtouchArch>ARM64</MtouchArch>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity></MtouchVerbosity>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -58,7 +58,7 @@
     <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity></MtouchVerbosity>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@@ -80,7 +80,7 @@
     <IOSDebuggerPort>17830</IOSDebuggerPort>
     <MtouchLink>SdkOnly</MtouchLink>
     <MtouchArch>ARM64</MtouchArch>
-    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity></MtouchVerbosity>
   </PropertyGroup>
   <ItemGroup>

diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/InterfaceController.cs b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/InterfaceController.cs
@@ -31,7 +31,7 @@ public override void Awake(NSObject context)
 
 				using (var path = new SKPath())
 				{
-					path.AddRoundedRect(new SKRect(5, 5, bitmap.Width - 5, bitmap.Height - 5), 5, 5);
+					path.AddRoundRect(new SKRect(5, 5, bitmap.Width - 5, bitmap.Height - 5), 5, 5);
 					canvas.ClipPath(path);
 				}
+3 −0		SkiaSharpAPI/FrameworksIndex/skiasharp-1.68.1.xml
+76 −0		SkiaSharpAPI/SkiaSharp/SKTypeface.xml
+17 −17		SkiaSharpAPI/index.xml