warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moves zlib to its own nuget (#164)

Browse source
This commit is contained in:
Kamron Batman 2020-06-25 13:48:40 -07:00 • committed by GitHub
parent 561b40c3d8
commit d76d60d900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 75 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Projects/UOContent/Multis/HouseFoundation.cs
View file

@ -3,6 +3,7 @@ using System.Buffers;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Threading;
using System.Threading.Tasks;
using Server.Gumps;
@ -10,7 +11,6 @@ using Server.Items;
using Server.Mobiles;
using Server.Network;
using Server.Spells;
using Server.Compression;
namespace Server.Multis
{
@ -2325,10 +2325,10 @@ namespace Server.Multis
byte[] inflatedBuffer = m_PlaneBuffers[i];
int deflatedLength = m_DeflatedBuffer.Length;
ZLibError ce = ZLib.Pack(m_DeflatedBuffer, ref deflatedLength, inflatedBuffer, size,
ZLibQuality.Default);
ZlibError ce = Zlib.Pack(m_DeflatedBuffer, ref deflatedLength, inflatedBuffer, size,
ZlibQuality.Default);
if (ce != ZLibError.Okay)
if (ce != ZlibError.Okay)
{
Console.WriteLine("ZLib error: {0} (#{1})", ce, (int)ce);
deflatedLength = 0;
@ -2361,10 +2361,10 @@ namespace Server.Multis
byte[] inflatedBuffer = m_StairBuffers[i];
int deflatedLength = m_DeflatedBuffer.Length;
ZLibError ce = ZLib.Pack(m_DeflatedBuffer, ref deflatedLength, inflatedBuffer, size,
ZLibQuality.Default);
ZlibError ce = Zlib.Pack(m_DeflatedBuffer, ref deflatedLength, inflatedBuffer, size,
ZlibQuality.Default);
if (ce != ZLibError.Okay)
if (ce != ZlibError.Okay)
{
Console.WriteLine("ZLib error: {0} (#{1})", ce, (int)ce);
deflatedLength = 0;

2
Projects/UOContent/UOContent.csproj
View file

@ -68,7 +68,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.5" />
<!-- Direct packages -->
<PackageReference Include="MailKit" Version="2.7.0" />
<PackageReference Include="Zlib.Bindings" Version="1.0.2" />
<PackageReference Include="Zlib.Bindings" Version="1.0.3" />
<PackageReference Include="Argon2.Bindings" Version="1.3.0" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Analyze'">

34
Projects/UOContent/packages.lock.json
View file

@ -54,11 +54,11 @@
"resolved": "3.1.5",
"contentHash": "ZvwowjRSWXewdPI+whPFXgwF4Qme6Q9KV9SCPEITSGiqHLArct7q5hTBtTzj3GPsVLjTqehvTg6Bd/EQk9JS0A=="
},
"ZLib.Bindings": {
"Zlib.Bindings": {
"type": "Direct",
"requested": "[1.0.2, )",
"resolved": "1.0.2",
"contentHash": "KlvJLY55UYpwlxbiX+lJbTuaMWBK3mja3BC3GzTlCA3uHRYxsllL9uYqpe4poFe6l8NMBS/k759+ns8pbeXeMg=="
"requested": "[1.0.3, )",
"resolved": "1.0.3",
"contentHash": "zk4N0anMKT8s25NY2Euw+Z5mwlSoh2D1XyYik0NJ2fRrSw96hP7nnu9ii2BRdl0ttdl0oflNZ9cme99JoSavyQ=="
},
"Libuv": {
"type": "Transitive",
@ -792,7 +792,7 @@
"Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv": "3.1.5",
"Microsoft.Extensions.Hosting.Abstractions": "3.1.5",
"System.IO.Pipelines": "4.7.2",
"ZLib.Bindings": "1.0.2"
"Zlib.Bindings": "1.0.3"
}
}
},
@ -803,11 +803,11 @@
"resolved": "1.3.0",
"contentHash": "cxRZ+nwH33QozaFBAftjctf9PoNEXgcEI5dBHHDkWI24EwCeOXRp0M+h5muavQADfxIvPG9o4FNCSnP7VkV6wQ=="
},
"ZLib.Bindings": {
"Zlib.Bindings": {
"type": "Direct",
"requested": "[1.0.2, )",
"resolved": "1.0.2",
"contentHash": "KlvJLY55UYpwlxbiX+lJbTuaMWBK3mja3BC3GzTlCA3uHRYxsllL9uYqpe4poFe6l8NMBS/k759+ns8pbeXeMg=="
"requested": "[1.0.3, )",
"resolved": "1.0.3",
"contentHash": "zk4N0anMKT8s25NY2Euw+Z5mwlSoh2D1XyYik0NJ2fRrSw96hP7nnu9ii2BRdl0ttdl0oflNZ9cme99JoSavyQ=="
},
"Libuv": {
"type": "Transitive",
@ -1506,11 +1506,11 @@
"resolved": "1.3.0",
"contentHash": "cxRZ+nwH33QozaFBAftjctf9PoNEXgcEI5dBHHDkWI24EwCeOXRp0M+h5muavQADfxIvPG9o4FNCSnP7VkV6wQ=="
},
"ZLib.Bindings": {
"Zlib.Bindings": {
"type": "Direct",
"requested": "[1.0.2, )",
"resolved": "1.0.2",
"contentHash": "KlvJLY55UYpwlxbiX+lJbTuaMWBK3mja3BC3GzTlCA3uHRYxsllL9uYqpe4poFe6l8NMBS/k759+ns8pbeXeMg=="
"requested": "[1.0.3, )",
"resolved": "1.0.3",
"contentHash": "zk4N0anMKT8s25NY2Euw+Z5mwlSoh2D1XyYik0NJ2fRrSw96hP7nnu9ii2BRdl0ttdl0oflNZ9cme99JoSavyQ=="
},
"Libuv": {
"type": "Transitive",
@ -2209,11 +2209,11 @@
"resolved": "1.3.0",
"contentHash": "cxRZ+nwH33QozaFBAftjctf9PoNEXgcEI5dBHHDkWI24EwCeOXRp0M+h5muavQADfxIvPG9o4FNCSnP7VkV6wQ=="
},
"ZLib.Bindings": {
"Zlib.Bindings": {
"type": "Direct",
"requested": "[1.0.2, )",
"resolved": "1.0.2",
"contentHash": "KlvJLY55UYpwlxbiX+lJbTuaMWBK3mja3BC3GzTlCA3uHRYxsllL9uYqpe4poFe6l8NMBS/k759+ns8pbeXeMg=="
"requested": "[1.0.3, )",
"resolved": "1.0.3",
"contentHash": "zk4N0anMKT8s25NY2Euw+Z5mwlSoh2D1XyYik0NJ2fRrSw96hP7nnu9ii2BRdl0ttdl0oflNZ9cme99JoSavyQ=="
},
"Libuv": {
"type": "Transitive",