diff --git a/.gitignore b/.gitignore index 9553838c52..15cfbf6e52 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ mods/*/*.mdb /*.mdb /*.exe thirdparty/StyleCop* +thirdparty/ICSharpCode.SharpZipLib.dll* # backup files by various editors *~ diff --git a/thirdparty/ICSharpCode.SharpZipLib.dll b/thirdparty/ICSharpCode.SharpZipLib.dll deleted file mode 100644 index fe643ebc63..0000000000 Binary files a/thirdparty/ICSharpCode.SharpZipLib.dll and /dev/null differ diff --git a/thirdparty/README b/thirdparty/README index aeefbb1b1a..9911349b60 100644 --- a/thirdparty/README +++ b/thirdparty/README @@ -10,11 +10,6 @@ FuzzyLogicLibrary.dll Version 1.2.0 GPL v2.0 license -ICSharpCode.SharpZipLib.dll - http://icsharpcode.github.io/SharpZipLib/ - Version 0.86 - GPL 2.0 with GNU Classpath exception - MaxMind.Db.dll MaxMind.GeoIP2.dll Newtonsoft.Json.dll diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index bfc9fdb8fc..a8ec7e31d5 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -3,6 +3,7 @@ if (!(Test-Path "nuget.exe")) echo "Fetching NuGet." Invoke-WebRequest "http://nuget.org/nuget.exe" -OutFile "nuget.exe" } + if (!(Test-Path "StyleCop.dll")) { echo "Fetching StyleCop files from NuGet." @@ -10,3 +11,11 @@ if (!(Test-Path "StyleCop.dll")) cp StyleCop.MSBuild.4.7.49.0/tools/StyleCop*.dll . rmdir StyleCop.MSBuild.4.7.49.0 -Recurse } + +if (!(Test-Path "ICSharpCode.SharpZipLib.dll")) +{ + echo "Fetching ICSharpCode.SharpZipLib from NuGet." + ./nuget.exe install SharpZipLib -Version 0.86.0 + cp SharpZipLib.0.86.0/lib/20/ICSharpCode.SharpZipLib.dll . + rmdir SharpZipLib.0.86.0 -Recurse +} \ No newline at end of file diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index efff79699c..eaf14354f4 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -4,4 +4,11 @@ if [ ! -f StyleCop.dll ]; then nuget install StyleCop.MSBuild -Version 4.7.49.0 cp ./StyleCop.MSBuild.4.7.49.0/tools/StyleCop*.dll . rm -rf StyleCop.MSBuild.4.7.49.0 +fi + +if [ ! -f ICSharpCode.SharpZipLib.dll ]; then + echo "Fetching ICSharpCode.SharpZipLib from nuget" + nuget install SharpZipLib -Version 0.86.0 + cp ./SharpZipLib.0.86.0/lib/20/ICSharpCode.SharpZipLib.dll . + rm -rf SharpZipLib.0.86.0 fi \ No newline at end of file