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

4
Projects/UOContent/Commands/Object Creation/AddGump.cs
View file

@ -135,7 +135,7 @@ namespace Server.Gumps
var t = types[i];
if ((typeofMobile.IsAssignableFrom(t) || typeofItem.IsAssignableFrom(t)) &&
t.Name.ToLower().IndexOf(match) >= 0 && !results.Contains(t))
t.Name.ToLower().IndexOf(match, StringComparison.Ordinal) >= 0 && !results.Contains(t))
{
var ctors = t.GetConstructors();
@ -236,7 +236,7 @@ namespace Server.Gumps
private class TypeNameComparer : IComparer<Type>
{
public int Compare(Type x, Type y) => x?.Name.CompareTo(y?.Name) ?? 1;
public int Compare(Type x, Type y) => string.CompareOrdinal(x?.Name, y?.Name);
}
public class InternalTarget : Target

28
Projects/UOContent/Commands/Object Creation/Categorization.cs
View file

@ -265,34 +265,14 @@ namespace Server.Commands
public class CategorySorter : IComparer<CategoryEntry>
{
public int Compare(CategoryEntry x, CategoryEntry y)
{
var a = x?.Title;
var b = y?.Title;
return a switch
{
null when b == null => 0,
null => 1,
_ => a.CompareTo(b)
};
}
public int Compare(CategoryEntry x, CategoryEntry y) =>
string.CompareOrdinal(x?.Title, y?.Title);
}
public class CategoryTypeSorter : IComparer<CategoryTypeEntry>
{
public int Compare(CategoryTypeEntry x, CategoryTypeEntry y)
{
var a = x?.Type.Name;
var b = y?.Type.Name;
return a switch
{
null when b == null => 0,
null => 1,
_ => a.CompareTo(b)
};
}
public int Compare(CategoryTypeEntry x, CategoryTypeEntry y) =>
string.CompareOrdinal(x?.Type.Name, y?.Type.Name);
}
public class CategoryTypeEntry