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

4
Projects/Server/MultiData.cs
View file

@ -22,7 +22,7 @@ using System;
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using Server.Compression;
using System.IO.Compression;
namespace Server
{
@ -167,7 +167,7 @@ namespace Server
if (compressionMethod == 1)
{
data = new byte[decompressedSize];
ZLib.Unpack(data, ref decompressedSize, sourceData, compressedSize);
Zlib.Unpack(data, ref decompressedSize, sourceData, compressedSize);
}
else
{

4
Projects/Server/Network/Packets/Old Packets/GumpPackets.cs
View file

@ -21,8 +21,8 @@
using System.Buffers;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Text;
using Server.Compression;
using Server.Gumps;
namespace Server.Network
@ -183,7 +183,7 @@ namespace Server.Network
var packLength = wantLength;
ZLib.Pack(packBuffer, ref packLength, buffer, length, ZLibQuality.Default);
Zlib.Pack(packBuffer, ref packLength, buffer, length, ZlibQuality.Default);
Stream.Write(4 + packLength);
Stream.Write(length);

2
Projects/Server/Server.csproj
View file

@ -69,7 +69,7 @@
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.5" />
<PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
<PackageReference Include="ZLib.Bindings" Version="1.0.2" />
<PackageReference Include="Zlib.Bindings" Version="1.0.3" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Analyze'">
<PackageReference Include="StyleCop.Analyzers">

32
Projects/Server/packages.lock.json
View file

@ -42,11 +42,11 @@
"resolved": "4.7.2",
"contentHash": "rGIIhoY3lUdn9rWeuGdgeZZ0P+SpJ1wZI5g8TnXqgvuhFgUP7iP9Nt5FZebYInQZQxqnwjPxdYYBE5l/8PJmqQ=="
},
"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",
@ -112,11 +112,11 @@
}
},
".NETCoreApp,Version=v3.1/linux-x64": {
"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",
@ -128,11 +128,11 @@
}
},
".NETCoreApp,Version=v3.1/osx-x64": {
"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",
@ -144,11 +144,11 @@
}
},
".NETCoreApp,Version=v3.1/win-x64": {
"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",