Merge #3329 Switch from outdated SharpZipLib.Patched to newer SharpZi…

…pLib
KSP-CKAN · Mar 21, 2021 · bf7064f · bf7064f
2 parents 0a32ed1 + 53a1372
commit bf7064f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ StyleCop.Cache
 *.ncrunchsolution
 *.pyc
 node_modules/
+venv/
 
 # Build results
 [Dd]ebug/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - [Netkan] Time out after 10 seconds on text downloads in NetKAN (#3325 by: DasSkelett; reviewed: HebaruSan)
 - [Netkan] Netkan errors and warnings for Harmony bundlers (#3326 by: HebaruSan; reviewed: DasSkelett)
 - [Netkan] Print path of unused version file (#3327, #3328 by: HebaruSan; reviewed: DasSkelett)
+- [Multiple] Switch from outdated SharpZipLib.Patched to newer SharpZipLib (#3329 by: DasSkelett; reviewed: HebaruSan)
 
 ## v1.30.0 (Glenn)
 

diff --git a/Core/CKAN-core.csproj b/Core/CKAN-core.csproj
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Autofac" Version="4.9.4" />
-    <PackageReference Include="ICSharpCode.SharpZipLib.Patched" Version="0.86.5.1" />
+    <PackageReference Include="SharpZipLib" Version="1.3.1" />
     <PackageReference Include="log4net" Version="2.0.10" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>

diff --git a/Netkan/CKAN-netkan.csproj b/Netkan/CKAN-netkan.csproj
@@ -41,7 +41,7 @@
     <PackageReference Include="AWSSDK.Core" Version="3.3.103.64" />
     <PackageReference Include="AWSSDK.SQS" Version="3.3.102.31" />
     <PackageReference Include="CommandLineParser" Version="1.9.71" />
-    <PackageReference Include="ICSharpCode.SharpZipLib.Patched" Version="0.86.5.1" />
+    <PackageReference Include="SharpZipLib" Version="1.3.1" />
     <PackageReference Include="log4net" Version="2.0.10" />
     <PackageReference Include="Namotion.Reflection" Version="1.0.7" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -42,7 +42,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.4.1" />
-    <PackageReference Include="ICSharpCode.SharpZipLib.Patched" Version="0.86.5.1" />
+    <PackageReference Include="SharpZipLib" Version="1.3.1" />
     <PackageReference Include="log4net" Version="2.0.10" />
     <PackageReference Include="Moq" Version="4.14.5" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

diff --git a/bin/requirements.txt b/bin/requirements.txt
@@ -1,4 +1,5 @@
 click
+exitstatus
 gitpython
 jsonschema
 pygithub