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

9
Projects/UOContent/Gumps/AdminGump.cs
View file

@ -2463,12 +2463,12 @@ namespace Server.Gumps
var m = ns.Mobile;
var a = ns.Account;
isMatch = m?.Name.ToLower().IndexOf(match) >= 0
|| a?.Username.ToLower().IndexOf(match) >= 0;
isMatch = m?.Name.ToLower().IndexOf(match, StringComparison.Ordinal) >= 0
|| a?.Username.ToLower().IndexOf(match, StringComparison.Ordinal) >= 0;
}
else
{
isMatch = ns.ToString().IndexOf(match) >= 0;
isMatch = ns.ToString().IndexOf(match, StringComparison.Ordinal) >= 0;
}
if (isMatch)
@ -2725,7 +2725,8 @@ namespace Server.Gumps
else
{
results = Accounts.GetAccounts()
.Where(acct => acct.Username.ToLower().IndexOf(match) >= 0)
.Where(acct =>
acct.Username.ToLower().IndexOf(match, StringComparison.Ordinal) >= 0)
.ToList();
results.Sort(AccountComparer.Instance);
}

3
Projects/UOContent/Gumps/Guilds/New Guild System/BaseGuildGump.cs
View file

@ -1,3 +1,4 @@
using System;
using Server.Gumps;
using Server.Misc;
using Server.Mobiles;
@ -119,7 +120,7 @@ namespace Server.Guilds
for (var i = 0; i < disallowed.Length; i++)
{
if (s.IndexOf(disallowed[i]) != -1)
if (s.IndexOf(disallowed[i], StringComparison.Ordinal) != -1)
{
return false;
}

2
Projects/UOContent/Gumps/Props/PropsGump.cs
View file

@ -868,7 +868,7 @@ namespace Server.Gumps
return -1;
}
return y == null ? 1 : x.Name.CompareTo(x.Name);
return y == null ? 1 : string.CompareOrdinal(x.Name, x.Name);
}
}

7
Projects/UOContent/Gumps/Props/SetBodyGump.cs
View file

@ -330,12 +330,7 @@ namespace Server.Gumps
public int CompareTo(InternalEntry comp)
{
if (Name == null && comp.Name == null)
{
return 0;
}
var v = Name?.CompareTo(comp.Name) ?? 1;
var v = string.CompareOrdinal(Name, comp.Name);
return v == 0 ? Body.CompareTo(comp.Body) : v;
}

2
Projects/UOContent/Gumps/SkillsGump.cs
View file

@ -634,7 +634,7 @@ namespace Server.Gumps
var aName = SkillInfo.Table[(int)a].Name;
var bName = SkillInfo.Table[(int)b].Name;
return aName.CompareTo(bName);
return string.CompareOrdinal(aName, bName);
}
}
}

2
Projects/UOContent/Gumps/WhoGump.cs
View file

@ -105,7 +105,7 @@ namespace Server.Gumps
if (m != null && (m == owner || !m.Hidden || owner.AccessLevel >= m.AccessLevel ||
m is PlayerMobile mobile && mobile.VisibilityList.Contains(owner)))
{
if (filter != null && !(m.Name?.ToLower().IndexOf(filter) >= 0))
if (filter != null && !(m.Name?.ToLower().IndexOf(filter, StringComparison.Ordinal) >= 0))
{
continue;
}