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

feat: Updates to .NET 8. (#1542)

Browse source 
### Breaking Changes
- Updating to .NET 8 - Required O/S's have slightly changed.
This commit is contained in:
Kamron Batman 2023-11-14 17:08:09 -08:00 • committed by GitHub
parent bd79509400
commit 2e4668dbe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 56 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ProjectReference Include="..\Server\Server.csproj" />
<ProjectReference Include="..\UOContent\UOContent.csproj" />
<DataFiles Include="$(SolutionDir)\Distribution\Data\**" />

2
Projects/Server/Buffers/SpanWriter.cs
View file

@ -19,7 +19,7 @@ using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Microsoft.Toolkit.HighPerformance;
using CommunityToolkit.HighPerformance;
using Server;
using Server.Buffers;
using Server.Text;

6
Projects/Server/Server.csproj
View file

@ -22,7 +22,7 @@
<Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.dev.json" ContinueOnError="true" />
<Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.json" ContinueOnError="true" />
<Delete Files="..\..\Distribution\ModernUO.Serialization.Annotations.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\Microsoft.Toolkit.HighPerformance.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\CommunityToolkit.HighPerformance.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\PollGroup.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\ref\$(AssemblyName).dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\Serilog.dll" ContinueOnError="true" />
@ -32,12 +32,12 @@
<Delete Files="..\..\Distribution\ZLib.Bindings.dll" ContinueOnError="true" />
</Target>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
<PackageReference Include="PollGroup" Version="1.4.3" />
<PackageReference Include="Standart.Hash.xxHash.Signed" Version="4.0.5" />
<PackageReference Include="Zlib.Bindings" Version="1.11.0" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.6.0" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.8.0" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.7.2" />
</ItemGroup>
<ItemGroup>

6
Projects/Server/Text/OrdinalStringHelpers.cs
View file

@ -37,7 +37,7 @@ public static class OrdinalStringHelpers
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool StartsWithOrdinal(this ReadOnlySpan<char> a, char b) =>
a.StartsWithOrdinal(new ReadOnlySpan<char>(b));
a.StartsWithOrdinal(new ReadOnlySpan<char>(ref b));
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool StartsWithOrdinal(this ReadOnlySpan<char> a, ReadOnlySpan<char> b) =>
@ -52,7 +52,7 @@ public static class OrdinalStringHelpers
a?.EndsWith(b, StringComparison.Ordinal) == true;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool EndsWithOrdinal(this ReadOnlySpan<char> a, char b) => a.EndsWithOrdinal(new ReadOnlySpan<char>(b));
public static bool EndsWithOrdinal(this ReadOnlySpan<char> a, char b) => a.EndsWithOrdinal(new ReadOnlySpan<char>(ref b));
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool EndsWithOrdinal(this ReadOnlySpan<char> a, ReadOnlySpan<char> b) =>
@ -86,7 +86,7 @@ public static class OrdinalStringHelpers
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int IndexOfOrdinal(this ReadOnlySpan<char> a, char b) =>
a.IndexOfOrdinal(new ReadOnlySpan<char>(b));
a.IndexOfOrdinal(new ReadOnlySpan<char>(ref b));
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static int IndexOfOrdinal(this ReadOnlySpan<char> a, ReadOnlySpan<char> b) =>

1
Projects/Server/Utilities/Utility.cs
View file

@ -8,7 +8,6 @@ using System.Net.Sockets;
using System.Runtime.CompilerServices;
using System.Text;
using System.Xml;
using Microsoft.Toolkit.HighPerformance;
using Server.Buffers;
using Server.Collections;
using Server.Logging;

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

@ -6,7 +6,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ProjectReference Include="..\Server\Server.csproj" />
<ProjectReference Include="..\Server.Tests\Server.Tests.csproj" />
<ProjectReference Include="..\UOContent\UOContent.csproj" />

2
Projects/UOContent/Accounting/Firewall.cs
View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Runtime.CompilerServices;
using Microsoft.Toolkit.HighPerformance;
using CommunityToolkit.HighPerformance;
namespace Server
{

5
Projects/UOContent/Commands/Object Creation/Decorate.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.Toolkit.HighPerformance;
using CommunityToolkit.HighPerformance;
using Server.Collections;
using Server.Engines.Quests.Haven;
using Server.Engines.Quests.Necro;
@ -9,6 +9,7 @@ using Server.Engines.Spawners;
using Server.Items;
using Server.Network;
using Server.Utilities;
using MemoryExtensions = System.MemoryExtensions;
namespace Server.Commands
{
@ -1266,7 +1267,7 @@ namespace Server.Commands
}
else
{
list.m_Params = new string[parms.Count(';') + 1];
list.m_Params = new string[MemoryExtensions.Count(parms, ';') + 1];
indexOf = 0;
foreach (var part in parms.Tokenize(';'))

5
Projects/UOContent/Commands/Object Creation/DecorateMag.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using Microsoft.Toolkit.HighPerformance;
using CommunityToolkit.HighPerformance;
using Server.Collections;
using Server.Engines.Quests.Haven;
using Server.Engines.Quests.Necro;
@ -9,6 +9,7 @@ using Server.Engines.Spawners;
using Server.Items;
using Server.Network;
using Server.Utilities;
using MemoryExtensions = System.MemoryExtensions;
namespace Server.Commands
{
@ -1252,7 +1253,7 @@ namespace Server.Commands
}
else
{
list.m_Params = new string[parms.Count(';') + 1];
list.m_Params = new string[MemoryExtensions.Count(parms, ';') + 1];
indexOf = 0;
foreach (var part in parms.Tokenize(';'))

2
Projects/UOContent/Network/Packets/IncomingPlayerPackets.cs
View file

@ -15,7 +15,7 @@
using System.Buffers;
using System.Diagnostics;
using Microsoft.Toolkit.HighPerformance;
using CommunityToolkit.HighPerformance;
using Server.Diagnostics;
using Server.Engines.Virtues;
using Server.Exceptions;

2
Projects/UOContent/Special Systems/Engines/TestCenter.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Text;
using Microsoft.Toolkit.HighPerformance;
using CommunityToolkit.HighPerformance;
using Server.Commands;
using Server.Factions;
using Server.Gumps;

7
Projects/UOContent/UOContent.csproj
View file

@ -14,6 +14,7 @@
<Delete Files="..\..\Distribution\Assemblies\MailKit.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\Assemblies\MimeKit.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\Assemblies\Microsoft.Toolkit.HighPerformance.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\Assemblies\CommunityToolkit.HighPerformance.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\Assemblies\Microsoft.Extensions.FileSystemGlobbing.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\Assemblies\Serilog.dll" ContinueOnError="true" />
<Delete Files="..\..\Distribution\Assemblies\Serilog.Sinks.Async.dll" ContinueOnError="true" />
@ -32,13 +33,13 @@
<IncludeInPackage>false</IncludeInPackage>
</ProjectReference>
<PackageReference Include="MailKit" Version="4.3.0" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
<PackageReference Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
<PackageReference Include="Zlib.Bindings" Version="1.11.0" />
<PackageReference Include="Argon2.Bindings" Version="1.16.1" />
<PackageReference Include="Zstd.Binaries" Version="1.6.0" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.6.0" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.8.0" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.7.2" />
</ItemGroup>
<ItemGroup>

2
Projects/UOContent/World Saves/AutoArchive.cs
View file

@ -4,7 +4,7 @@ using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices;
using System.Threading;
using Microsoft.Toolkit.HighPerformance;
using CommunityToolkit.HighPerformance;
using Server.Compression;
using Server.Logging;