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

fix: Fixes libdeflate gc pin issue (#1794)

Browse source
This commit is contained in:
Kamron Batman 2024-05-25 18:11:46 -07:00 • committed by GitHub
parent 21347c8b6b
commit 21c5e46565
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Server.Tests/Server.Tests.csproj
View file

@ -5,8 +5,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.8.0" /> <PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0"> <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

3
Projects/Server/Guild.cs
View file

@ -54,11 +54,10 @@ public abstract class BaseGuild : ISerializable
public BufferWriter SaveBuffer { get; set; } public BufferWriter SaveBuffer { get; set; }
public int TypeRef { get; private set; }
public abstract void Serialize(IGenericWriter writer); public abstract void Serialize(IGenericWriter writer);
public abstract void Deserialize(IGenericReader reader); public abstract void Deserialize(IGenericReader reader);
public abstract void OnDelete(Mobile mob); public abstract void OnDelete(Mobile mob);
public static BaseGuild FindByName(string name) public static BaseGuild FindByName(string name)

2
Projects/Server/IEntity.cs
View file

@ -55,8 +55,6 @@ public class Entity : IEntity
public BufferWriter SaveBuffer { get; set; } public BufferWriter SaveBuffer { get; set; }
public int TypeRef => -1;
public Serial Serial { get; } public Serial Serial { get; }
public Point3D Location { get; private set; } public Point3D Location { get; private set; }

2
Projects/Server/Server.csproj
View file

@ -35,7 +35,7 @@
</Target> </Target>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" /> <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
<PackageReference Include="LibDeflate.Bindings" Version="1.0.1.120" /> <PackageReference Include="LibDeflate.Bindings" Version="1.0.2.120" />
<PackageReference Include="PollGroup" Version="1.5.0" /> <PackageReference Include="PollGroup" Version="1.5.0" />
<PackageReference Include="System.IO.Hashing" Version="8.0.0" /> <PackageReference Include="System.IO.Hashing" Version="8.0.0" />

4
Projects/UOContent.Tests/UOContent.Tests.csproj
View file

@ -5,8 +5,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.8.0" /> <PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0"> <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

6
Projects/UOContent/Accounting/Accounts.cs
View file

@ -29,11 +29,7 @@ public class Accounts : GenericEntityPersistence<IAccount>
public static IEnumerable<IAccount> GetAccounts() => _accountsByName.Values; public static IEnumerable<IAccount> GetAccounts() => _accountsByName.Values;
public static IAccount GetAccount(string username) public static IAccount GetAccount(string username) => _accountsByName.GetValueOrDefault(username);
{
_accountsByName.TryGetValue(username, out var a);
return a;
}
public static void Add(Account a) public static void Add(Account a)
{ {

2
Projects/UOContent/UOContent.csproj
View file

@ -34,7 +34,7 @@
<ProjectReference Include="..\Server\Server.csproj" Private="false" PrivateAssets="All" IncludeAssets="None"> <ProjectReference Include="..\Server\Server.csproj" Private="false" PrivateAssets="All" IncludeAssets="None">
<IncludeInPackage>false</IncludeInPackage> <IncludeInPackage>false</IncludeInPackage>
</ProjectReference> </ProjectReference>
<PackageReference Include="LibDeflate.Bindings" Version="1.0.1.120" /> <PackageReference Include="LibDeflate.Bindings" Version="1.0.2.120" />
<PackageReference Include="MailKit" Version="4.6.0" /> <PackageReference Include="MailKit" Version="4.6.0" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" /> <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />