Use ZlibSharp nuget package instead of buggy zlib.managed. (#112)

Elskom · Dec 7, 2022 · 80d010b · 80d010b
1 parent 79a88da
commit 80d010b
Show file tree

Hide file tree

Showing 42 changed files with 5 additions and 6,357 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageVersion Include="ZlibSharp" Version="1.2.13" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Diagnostics.NetCore.Client" Version="0.2.328102" />
     <PackageVersion Include="IDisposableGenerator" Version="1.1.0" />

diff --git a/pkg/sfx/Directory.Packages.props b/pkg/sfx/Directory.Packages.props
@@ -6,8 +6,6 @@
     <FrameworkReference Include="Microsoft.NETCore.App" />
     <ProjectReference Include="$(ProjectReferenceBaseFolder)GitInformation/GitInformation.csproj" />
     <ProjectReference Include="$(ProjectReferenceBaseFolder)Common/Common.csproj" />
-    <!-- zlib.managed has a zlib compression regression that needs fixed. -->
-    <ProjectReference Include="$(ProjectReferenceBaseFolder)zlib.managed/zlib.managed.csproj" />
     <ProjectReference Include="$(ProjectReferenceBaseFolder)BlowFish/BlowFish.csproj" />
     <ProjectReference Include="$(ProjectReferenceBaseFolder)MessageManager/MessageManager.csproj" />
     <ProjectReference Include="$(ProjectReferenceBaseFolder)PluginUpdateCheck/PluginUpdateCheck.csproj" />

diff --git a/ref/PluginFramework/Directory.Build.targets b/ref/PluginFramework/Directory.Build.targets
@@ -10,6 +10,7 @@
     <Using Include="System.Diagnostics" />
     <Using Include="System.Text" />
     <Using Include="System.Xml.Linq" />
+    <Using Include="ZlibSharp" />
   </ItemGroup>
 
 </Project>
diff --git a/ref/PluginFramework/Directory.Packages.props b/ref/PluginFramework/Directory.Packages.props
@@ -2,7 +2,7 @@
 
   <ItemGroup>
     <!-- <PackageReference Include="zlib.managed" Version="*-*" /> -->
-    <ProjectReference Include="../zlib.managed/zlib.managed.csproj" />
+    <PackageReference Include="ZlibSharp" />
     <ProjectReference Include="../SettingsFile/SettingsFile.csproj" />
   </ItemGroup>
 

diff --git a/ref/zlib.managed/.editorconfig b/ref/zlib.managed/.editorconfig
diff --git a/ref/zlib.managed/.gitignore b/ref/zlib.managed/.gitignore
diff --git a/ref/zlib.managed/Directory.Build.props b/ref/zlib.managed/Directory.Build.props
diff --git a/ref/zlib.managed/Directory.Build.targets b/ref/zlib.managed/Directory.Build.targets
diff --git a/ref/zlib.managed/Directory.Packages.props b/ref/zlib.managed/Directory.Packages.props
diff --git a/ref/zlib.managed/LICENSE b/ref/zlib.managed/LICENSE
diff --git a/ref/zlib.managed/zlib.managed.csproj b/ref/zlib.managed/zlib.managed.csproj