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

Adds official .NET 5 support (#300)

Browse source
This commit is contained in:
Kamron Batman 2020-11-07 13:26:27 -08:00 • committed by GitHub
parent c3289a20ab
commit 013f333898
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 496 additions and 668 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/Server/ClientVersion.cs
View file

@ -60,12 +60,12 @@ namespace Server
}
}
if (fmt.IndexOf("god") >= 0 || fmt.IndexOf("gq") >= 0)
if (fmt.IndexOf("god", StringComparison.Ordinal) >= 0 || fmt.IndexOf("gq", StringComparison.Ordinal) >= 0)
{
Type = ClientType.God;
}
else if (fmt.IndexOf("third dawn") >= 0 || fmt.IndexOf("uo:td") >= 0 || fmt.IndexOf("uotd") >= 0 ||
fmt.IndexOf("uo3d") >= 0 || fmt.IndexOf("uo:3d") >= 0)
else if (fmt.IndexOf("third dawn", StringComparison.Ordinal) >= 0 || fmt.IndexOf("uo:td", StringComparison.Ordinal) >= 0 || fmt.IndexOf("uotd", StringComparison.Ordinal) >= 0 ||
fmt.IndexOf("uo3d", StringComparison.Ordinal) >= 0 || fmt.IndexOf("uo:3d", StringComparison.Ordinal) >= 0)
{
Type = ClientType.UOTD;
}

2
Projects/Server/Commands.cs
View file

@ -108,7 +108,7 @@ namespace Server
public AccessLevel AccessLevel { get; }
public int CompareTo(CommandEntry e) => e == null ? 1 : Command.CompareTo(e.Command);
public int CompareTo(CommandEntry e) => string.CompareOrdinal(Command, e?.Command);
}
public static class CommandSystem

2
Projects/Server/Configuration/ServerConfiguration.cs
View file

@ -244,7 +244,7 @@ namespace Server
break;
}
if (ipStr.IndexOf(":", StringComparison.Ordinal) == -1)
if (ipStr.IndexOf(':') == -1)
{
ipStr += ":2593";
}

14
Projects/Server/Geometry/Point2D.cs
View file

@ -104,23 +104,13 @@ namespace Server
public int CompareTo(Point2D other)
{
var xComparison = m_X.CompareTo(other.m_X);
if (xComparison != 0)
{
return xComparison;
}
return m_Y.CompareTo(other.m_Y);
return xComparison != 0 ? xComparison : m_Y.CompareTo(other.m_Y);
}
public int CompareTo(IPoint2D other)
{
var xComparison = m_X.CompareTo(other.X);
if (xComparison != 0)
{
return xComparison;
}
return m_Y.CompareTo(other.Y);
return xComparison != 0 ? xComparison : m_Y.CompareTo(other.Y);
}
}
}

3
Projects/Server/Guild.cs
View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
@ -63,7 +64,7 @@ namespace Server.Guilds
{
var name = g.Name.ToLower();
if (words.All(t => name.IndexOf(t) != -1))
if (words.All(t => name.IndexOf(t, StringComparison.Ordinal) != -1))
{
results.Add(g);
}

2
Projects/Server/Network/NetState/NetState.cs
View file

@ -163,7 +163,7 @@ namespace Server.Network
public bool IsDisposing => m_Disposing != 0;
public int CompareTo(NetState other) => other == null ? 1 : m_ToString.CompareTo(other.m_ToString);
public int CompareTo(NetState other) => string.CompareOrdinal(m_ToString, other?.m_ToString);
public void ValidateAllTrades()
{

2
Projects/Server/Server.csproj
View file

@ -26,7 +26,7 @@
<Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.json" ContinueOnError="true" />
</Target>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>