mono · mattleibow · Aug 17, 2023 · Aug 14, 2023 · Aug 14, 2023 · Aug 14, 2023
diff --git a/binding/Binding.Shared/DelegateProxies.shared.cs b/binding/Binding.Shared/DelegateProxies.shared.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.Collections.Concurrent;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

diff --git a/binding/Binding.Shared/HashCode.cs b/binding/Binding.Shared/HashCode.cs
@@ -1,6 +1,8 @@
 // Partial code copied from:
 // https://github.com/dotnet/runtime/blob/6072e4d3a7a2a1493f514cdf4be75a3d56580e84/src/libraries/System.Private.CoreLib/src/System/HashCode.cs
 
+#nullable disable
+
 using System;
 using System.Runtime.CompilerServices;
 

diff --git a/binding/Binding.Shared/LibraryLoader.cs b/binding/Binding.Shared/LibraryLoader.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.IO;
 using System.Runtime.InteropServices;
 

diff --git a/binding/Binding.Shared/PlatformConfiguration.cs b/binding/Binding.Shared/PlatformConfiguration.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.Runtime.InteropServices;
 
 #if WINDOWS_UWP

diff --git a/binding/HarfBuzzSharp.NativeAssets.Tizen/HarfBuzzSharp.NativeAssets.Tizen.csproj b/binding/HarfBuzzSharp.NativeAssets.Tizen/HarfBuzzSharp.NativeAssets.Tizen.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageFile Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.*" PackagePath="runtimes\tizen-armel\native\%(Filename)%(Extension)" />
-    <PackageFile Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" PackagePath="runtimes\tizen-x86\native\%(Filename)%(Extension)" />
-    <PackageFile Include="..\..\output\native\tizen\i386\libHarfBuzzSharp.*" PackagePath="runtimes\linux-x86\native\%(Filename)%(Extension)" />
+    <PackageFile Include="..\..\output\native\tizen\i586\libHarfBuzzSharp.*" PackagePath="runtimes\tizen-x86\native\%(Filename)%(Extension)" />
+    <PackageFile Include="..\..\output\native\tizen\i586\libHarfBuzzSharp.*" PackagePath="runtimes\linux-x86\native\%(Filename)%(Extension)" />
   </ItemGroup>
   <Target Name="IncludeAdditionalTfmSpecificPackageFiles">
     <ItemGroup>

diff --git a/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets b/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets
@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <!-- If this is a ASP.NET Blazor web assembly app -->
-  <PropertyGroup  Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
+  <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
     <WasmBuildNative Condition="'$(WasmBuildNative)' == ''">true</WasmBuildNative>
   </PropertyGroup>
   <ItemGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(TargetFrameworkVersion)' != ''">

diff --git a/binding/HarfBuzzSharp/Blob.cs b/binding/HarfBuzzSharp/Blob.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.ComponentModel;
 using System.IO;
 

diff --git a/binding/HarfBuzzSharp/Buffer.cs b/binding/HarfBuzzSharp/Buffer.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.Buffers;
 using System.Runtime.InteropServices;
 using System.Text;

diff --git a/binding/HarfBuzzSharp/Definitions.cs b/binding/HarfBuzzSharp/Definitions.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/DelegateProxies.cs b/binding/HarfBuzzSharp/DelegateProxies.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.ComponentModel;
 
 namespace HarfBuzzSharp

diff --git a/binding/HarfBuzzSharp/DelegateProxies.font.cs b/binding/HarfBuzzSharp/DelegateProxies.font.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/DelegateProxies.unicode.cs b/binding/HarfBuzzSharp/DelegateProxies.unicode.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/Face.cs b/binding/HarfBuzzSharp/Face.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/Feature.cs b/binding/HarfBuzzSharp/Feature.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.Runtime.InteropServices;
 
 namespace HarfBuzzSharp

diff --git a/binding/HarfBuzzSharp/Font.cs b/binding/HarfBuzzSharp/Font.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/binding/HarfBuzzSharp/FontFunctions.cs b/binding/HarfBuzzSharp/FontFunctions.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/HarfBuzzApi.cs b/binding/HarfBuzzSharp/HarfBuzzApi.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/HarfBuzzSharp.csproj b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj
@@ -5,6 +5,7 @@
     <AssemblyName>HarfBuzzSharp</AssemblyName>
     <PackagingGroup>HarfBuzzSharp</PackagingGroup>
     <DefineConstants>$(DefineConstants);HARFBUZZ</DefineConstants>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);USE_DELEGATES</DefineConstants>

diff --git a/binding/HarfBuzzSharp/Language.cs b/binding/HarfBuzzSharp/Language.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.Globalization;
 using System.Runtime.InteropServices;
 

diff --git a/binding/HarfBuzzSharp/NativeObject.cs b/binding/HarfBuzzSharp/NativeObject.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 

diff --git a/binding/HarfBuzzSharp/OpenTypeMetrics.cs b/binding/HarfBuzzSharp/OpenTypeMetrics.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/Script.cs b/binding/HarfBuzzSharp/Script.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/Script.fields.cs b/binding/HarfBuzzSharp/Script.fields.cs
@@ -1,4 +1,6 @@
-namespace HarfBuzzSharp
+#nullable disable
+
+namespace HarfBuzzSharp
 {
 	public partial struct Script
 	{

diff --git a/binding/HarfBuzzSharp/Tag.cs b/binding/HarfBuzzSharp/Tag.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/HarfBuzzSharp/UnicodeFunctions.cs b/binding/HarfBuzzSharp/UnicodeFunctions.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace HarfBuzzSharp
 {

diff --git a/binding/IncludeNativeAssets.HarfBuzzSharp.targets b/binding/IncludeNativeAssets.HarfBuzzSharp.targets
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
-    <TizenTpkFiles Include="$(MSBuildThisFileDirectory)..\output\native\tizen\i386\libHarfBuzzSharp.so">
+    <TizenTpkFiles Include="$(MSBuildThisFileDirectory)..\output\native\tizen\i586\libHarfBuzzSharp.so">
       <Visible>false</Visible>
       <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
       <TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
@@ -62,7 +62,7 @@
     <Content Include="$(MSBuildThisFileDirectory)..\output\native\wasm\libHarfBuzzSharp.a\**\*.a" Visible="false" />
   </ItemGroup>
 
-  <PropertyGroup  Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(TargetFrameworkVersion)' != ''">
+  <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
     <WasmBuildNative Condition="'$(WasmBuildNative)' == ''">true</WasmBuildNative>
   </PropertyGroup>
   <ItemGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(TargetFrameworkVersion)' != ''">

diff --git a/binding/IncludeNativeAssets.SkiaSharp.targets b/binding/IncludeNativeAssets.SkiaSharp.targets
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
-    <TizenTpkFiles Include="$(MSBuildThisFileDirectory)..\output\native\tizen\i386\libSkiaSharp.so">
+    <TizenTpkFiles Include="$(MSBuildThisFileDirectory)..\output\native\tizen\i586\libSkiaSharp.so">
       <Visible>false</Visible>
       <TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
       <TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
@@ -66,8 +66,9 @@
     <WasmShellExtraEmccFlags Condition="'$(WasmShellEnableThreads)'=='True'" Include="-s OFFSCREEN_FRAMEBUFFER=1" />
   </ItemGroup>
 
-  <PropertyGroup  Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(TargetFrameworkVersion)' != ''">
+  <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
     <WasmBuildNative Condition="'$(WasmBuildNative)' == ''">true</WasmBuildNative>
+    <EmccExtraLDFlags>$(EmccExtraLDFlags) -s USE_WEBGL2=1</EmccExtraLDFlags>
   </PropertyGroup>
   <ItemGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(TargetFrameworkVersion)' != ''">
     <NativeFileReference Include="$(MSBuildThisFileDirectory)..\output\native\wasm\libSkiaSharp.a\2.0.23\*.a" Condition="$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0'))" />

diff --git a/binding/SkiaSharp.NativeAssets.Tizen/SkiaSharp.NativeAssets.Tizen.csproj b/binding/SkiaSharp.NativeAssets.Tizen/SkiaSharp.NativeAssets.Tizen.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageFile Include="..\..\output\native\tizen\armel\libSkiaSharp.*" PackagePath="runtimes\tizen-armel\native\%(Filename)%(Extension)" />
-    <PackageFile Include="..\..\output\native\tizen\i386\libSkiaSharp.*" PackagePath="runtimes\tizen-x86\native\%(Filename)%(Extension)" />
-    <PackageFile Include="..\..\output\native\tizen\i386\libSkiaSharp.*" PackagePath="runtimes\linux-x86\native\%(Filename)%(Extension)" />
+    <PackageFile Include="..\..\output\native\tizen\i586\libSkiaSharp.*" PackagePath="runtimes\tizen-x86\native\%(Filename)%(Extension)" />
+    <PackageFile Include="..\..\output\native\tizen\i586\libSkiaSharp.*" PackagePath="runtimes\linux-x86\native\%(Filename)%(Extension)" />
   </ItemGroup>
   <Target Name="IncludeAdditionalTfmSpecificPackageFiles">
     <ItemGroup>

diff --git a/binding/SkiaSharp.NativeAssets.WebAssembly/buildTransitive/SkiaSharp.targets b/binding/SkiaSharp.NativeAssets.WebAssembly/buildTransitive/SkiaSharp.targets
@@ -12,8 +12,9 @@
   </ItemGroup>
 
   <!-- If this is a ASP.NET Blazor web assembly app -->
-  <PropertyGroup  Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
+  <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">
     <WasmBuildNative Condition="'$(WasmBuildNative)' == ''">true</WasmBuildNative>
+    <EmccExtraLDFlags>$(EmccExtraLDFlags) -s USE_WEBGL2=1</EmccExtraLDFlags>
   </PropertyGroup>
   <ItemGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(TargetFrameworkVersion)' != ''">
     <NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\2.0.23\*.a" Condition="$([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0'))" />

diff --git a/binding/SkiaSharp.SceneGraph/InvalidationController.cs b/binding/SkiaSharp.SceneGraph/InvalidationController.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using System.ComponentModel;
 using System.IO;
 using System.Runtime.InteropServices;

diff --git a/binding/SkiaSharp.SceneGraph/SceneGraphApi.cs b/binding/SkiaSharp.SceneGraph/SceneGraphApi.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace SkiaSharp
 {

diff --git a/binding/SkiaSharp.SceneGraph/SceneGraphApi.generated.cs b/binding/SkiaSharp.SceneGraph/SceneGraphApi.generated.cs
@@ -17,29 +17,26 @@
 using gr_vk_extensions_t = System.IntPtr;
 using gr_vk_memory_allocator_t = System.IntPtr;
 using gr_vkinterface_t = System.IntPtr;
-using sk_3dview_t = System.IntPtr;
 using sk_bitmap_t = System.IntPtr;
 using sk_canvas_t = System.IntPtr;
 using sk_codec_t = System.IntPtr;
 using sk_colorfilter_t = System.IntPtr;
 using sk_colorspace_icc_profile_t = System.IntPtr;
 using sk_colorspace_t = System.IntPtr;
-using sk_colortable_t = System.IntPtr;
 using sk_compatpaint_t = System.IntPtr;
 using sk_data_t = System.IntPtr;
 using sk_document_t = System.IntPtr;
 using sk_drawable_t = System.IntPtr;
+using sk_flattenable_t = System.IntPtr;
 using sk_font_t = System.IntPtr;
 using sk_fontmgr_t = System.IntPtr;
 using sk_fontstyle_t = System.IntPtr;
 using sk_fontstyleset_t = System.IntPtr;
 using sk_image_t = System.IntPtr;
-using sk_imagefilter_croprect_t = System.IntPtr;
 using sk_imagefilter_t = System.IntPtr;
 using sk_manageddrawable_t = System.IntPtr;
 using sk_managedtracememorydump_t = System.IntPtr;
 using sk_maskfilter_t = System.IntPtr;
-using sk_matrix44_t = System.IntPtr;
 using sk_nodraw_canvas_t = System.IntPtr;
 using sk_nvrefcnt_t = System.IntPtr;
 using sk_nway_canvas_t = System.IntPtr;
@@ -62,7 +59,6 @@
 using sk_region_t = System.IntPtr;
 using sk_rrect_t = System.IntPtr;
 using sk_runtimeeffect_t = System.IntPtr;
-using sk_runtimeeffect_uniform_t = System.IntPtr;
 using sk_shader_t = System.IntPtr;
 using sk_stream_asset_t = System.IntPtr;
 using sk_stream_filestream_t = System.IntPtr;
@@ -83,8 +79,6 @@
 using sk_wstream_filestream_t = System.IntPtr;
 using sk_wstream_managedstream_t = System.IntPtr;
 using sk_wstream_t = System.IntPtr;
-using sk_xmlstreamwriter_t = System.IntPtr;
-using sk_xmlwriter_t = System.IntPtr;
 using skottie_animation_builder_t = System.IntPtr;
 using skottie_animation_t = System.IntPtr;
 using skottie_logger_t = System.IntPtr;

diff --git a/binding/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.csproj b/binding/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.csproj
@@ -7,6 +7,7 @@
     <Title>SkiaSharp Skottie</Title>
     <PackageDescription>SkiaSharp Skottie provides a Lottie implementation using the SkiaSharp library.</PackageDescription>
     <PackageTags>skottie;lottie</PackageTags>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);USE_DELEGATES</DefineConstants>

diff --git a/binding/SkiaSharp.Skottie/Animation.cs b/binding/SkiaSharp.Skottie/Animation.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
 using System.IO;
 using SkiaSharp.SceneGraph;
 

diff --git a/binding/SkiaSharp.Skottie/SkiaSharp.Skottie.csproj b/binding/SkiaSharp.Skottie/SkiaSharp.Skottie.csproj
@@ -7,6 +7,7 @@
     <Title>SkiaSharp Skottie</Title>
     <PackageDescription>SkiaSharp Skottie provides a Lottie implementation using the SkiaSharp library.</PackageDescription>
     <PackageTags>skottie;lottie</PackageTags>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);USE_DELEGATES</DefineConstants>

diff --git a/binding/SkiaSharp.Skottie/SkottieApi.cs b/binding/SkiaSharp.Skottie/SkottieApi.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 
 namespace SkiaSharp
 {