Merge pull request #1098 from NiklasGustafsson/bugs

Update to SkiaSharp 2.88.6

Author: NiklasGustafsson

RELEASENOTES.md

@@ -2,14 +2,18 @@
 
 Releases, starting with 9/2/2021, are listed with the most recent release at the top.
 
+## NuGet Version 0.100.6
+
+__Bug Fixes__:
+
+Update to SkiaSharp 2.88.6 to avoid the libwebp vulnerability.<br/>
+
 ## NuGet Version 0.100.5
 
 __Breaking Changes__:
 
 Inplace operators no longer create an alias, but instead return 'this'. This change will impact any code that explicitly calls `Dispose` on a tensor after the operation.
 
-__API Changes__:
-
 __Bug Fixes__:
 
 #1041 Running example code got error in Windows 10<br/>

build/BranchInfo.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <MajorVersion>0</MajorVersion>
     <MinorVersion>100</MinorVersion>
-    <PatchVersion>5</PatchVersion>
+    <PatchVersion>6</PatchVersion>
   </PropertyGroup>
 
 </Project>

src/Examples/Examples.csproj

@@ -26,7 +26,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="SharpZipLib" Version="1.4.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.6" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 

src/TorchSharp/TorchSharp.csproj

@@ -30,7 +30,8 @@
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.21.9" />
     <PackageReference Include="SharpZipLib" Version="1.4.0" />
-    <PackageReference Include="SkiaSharp" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.6" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 

src/TorchVision/TorchVision.csproj

@@ -28,8 +28,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.88.3" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp" Version="2.88.6" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" />
   </ItemGroup>
 
   <ItemGroup>

test/TorchSharpTest/TestJIT.cs

@@ -6,14 +6,14 @@
 using static TorchSharp.torch.nn;
 using Xunit;
 
-#if false
 #nullable enable
 
 namespace TorchSharp
 {
     [Collection("Sequential")]
     public class TestJIT
     {
+#if false
         [Fact]
         public void TestLoadJIT_Func()
         {
@@ -445,6 +445,6 @@ def list_from_two(a: List[Tensor], b: List[Tensor]) -> List[Tensor]:
                 Assert.Equal(w, zArr[3]);
             }
         }
+#endif
     }
-}
-#endif
+}