Merge branch 'main' into feat-logger

modernuo · Dec 31, 2024 · 1a8bcb7 · 1a8bcb7
2 parents 665cc36 + 333b408
commit 1a8bcb7
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 20 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "modernuoschemagenerator": {
-      "version": "2.12.13",
+      "version": "2.12.18",
       "commands": [
         "ModernUOSchemaGenerator"
       ]

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -66,7 +66,7 @@
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
         <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
-            <Version>3.6.146</Version>
+            <Version>3.7.112</Version>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <AdditionalFiles Include="..\..\Rules.ruleset" />

diff --git a/Distribution/Data/Decoration/Felucca/VesperGraveyard.cfg b/Distribution/Data/Decoration/Felucca/VesperGraveyard.cfg
@@ -0,0 +1,7 @@
+# Iron Gate right
+IronGateShort 0x0856 (Facing=NorthCCW)
+2783 867 0
+
+# Iron Gate left
+IronGateShort 0x0854 (Facing=SouthCW)
+2783 868 0
diff --git a/Distribution/Data/Decoration/Trammel/VesperGraveyard.cfg b/Distribution/Data/Decoration/Trammel/VesperGraveyard.cfg
@@ -0,0 +1,7 @@
+# Iron Gate right
+IronGateShort 0x0856 (Facing=NorthCCW)
+2783 867 0
+
+# Iron Gate left
+IronGateShort 0x0854 (Facing=SouthCW)
+2783 868 0
diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj
@@ -7,7 +7,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/Projects/Server/Network/TcpServer.cs b/Projects/Server/Network/TcpServer.cs
@@ -37,8 +37,8 @@ public static class TcpServer
 
     public static void Start()
     {
-        HashSet<IPEndPoint> listeningAddresses = new HashSet<IPEndPoint>();
-        List<Socket> listeners = new List<Socket>();
+        HashSet<IPEndPoint> listeningAddresses = [];
+        List<Socket> listeners = [];
         foreach (var ipep in ServerConfiguration.Listeners)
         {
             var listener = CreateListener(ipep);
@@ -62,7 +62,7 @@ public static void Start()
 
         foreach (var ipep in listeningAddresses)
         {
-            logger.Information("Listening: {Address}:{Port}", ipep.Address, ipep.Port);
+            logger.Information("Listening: {Address}", ipep);
         }
 
         ListeningAddresses = listeningAddresses.ToArray();
@@ -107,16 +107,16 @@ public static Socket CreateListener(IPEndPoint ipep)
             // WSAEADDRINUSE
             if (se.ErrorCode == 10048)
             {
-                logger.Warning("Listener: {Address}:{Port}: Failed (In Use)", ipep.Address, ipep.Port);
+                logger.Warning("Listener: {Address} Exception: {Reason}", ipep, "Currently in use");
             }
             // WSAEADDRNOTAVAIL
             else if (se.ErrorCode == 10049)
             {
-                logger.Warning("Listener {Address}:{Port}: Failed (Unavailable)", ipep.Address, ipep.Port);
+                logger.Warning("Listener {Address} Exception: {Reason}", ipep, "Unavailable");
             }
             else
             {
-                logger.Warning(se, "Listener Exception:");
+                logger.Warning(se, "Listener {Address} Exception: {Reason}", ipep, se.Message);
             }
         }
 

diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
@@ -34,13 +34,13 @@
     </Target>
     <ItemGroup>
         <ProjectReference Include="..\Logger\Logger.csproj" />
-        <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
+        <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
         <PackageReference Include="LibDeflate.Bindings" Version="1.0.2.120" />
         <PackageReference Include="PollGroup" Version="1.6.1" />
         <PackageReference Include="System.IO.Hashing" Version="9.0.0" />
 
         <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.9.1" />
-        <PackageReference Include="ModernUO.Serialization.Generator" Version="2.12.13" />
+        <PackageReference Include="ModernUO.Serialization.Generator" Version="2.12.18" />
     </ItemGroup>
     <ItemGroup>
         <AdditionalFiles Include="Migrations/*.v*.json" />

diff --git a/Projects/UOContent.Tests/UOContent.Tests.csproj b/Projects/UOContent.Tests/UOContent.Tests.csproj
@@ -6,7 +6,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="xunit" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/Projects/UOContent/Items/Guilds/GuildTeleporter.cs b/Projects/UOContent/Items/Guilds/GuildTeleporter.cs
@@ -51,7 +51,7 @@ public override void OnDoubleClick(Mobile from)
         {
             from.SendLocalizedMessage(501141); // You can only place a guildstone in a house you own!
         }
-        else if (house.FindGuildstone() != null)
+        else if (house.FindGuildstone() != null && house.FindGuildstone() != _stone)
         {
             from.SendLocalizedMessage(501142); // Only one guildstone may reside in a given house.
         }

diff --git a/Projects/UOContent/Mobiles/PlayerMobile.cs b/Projects/UOContent/Mobiles/PlayerMobile.cs
@@ -28,13 +28,9 @@
 using Server.SkillHandlers;
 using Server.Spells;
 using Server.Spells.Bushido;
-using Server.Spells.Fifth;
-using Server.Spells.First;
 using Server.Spells.Fourth;
-using Server.Spells.Mysticism;
 using Server.Spells.Necromancy;
 using Server.Spells.Ninjitsu;
-using Server.Spells.Second;
 using Server.Spells.Sixth;
 using Server.Spells.Spellweaving;
 using Server.Targeting;

diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
@@ -39,16 +39,16 @@
             <IncludeInPackage>false</IncludeInPackage>
         </ProjectReference>
         <PackageReference Include="LibDeflate.Bindings" Version="1.0.2.120" />
-        <PackageReference Include="MailKit" Version="4.8.0" />
+        <PackageReference Include="MailKit" Version="4.9.0" />
         <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
-        <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
+        <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
         <PackageReference Include="Argon2.Bindings" Version="1.16.1" />
         <PackageReference Include="ModernUO.CodeGeneratedEvents.Annotations" Version="1.0.0" />
         <PackageReference Include="ModernUO.CodeGeneratedEvents.Generator" Version="1.0.3.2" PrivateAssets="all" />
         <PackageReference Include="Zstd.Binaries" Version="1.6.0" />
 
         <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.9.1" />
-        <PackageReference Include="ModernUO.Serialization.Generator" Version="2.12.13" />
+        <PackageReference Include="ModernUO.Serialization.Generator" Version="2.12.18" />
     </ItemGroup>
     <ItemGroup>
         <AdditionalFiles Include="Migrations/*.v*.json" />