Merge branch 'main' into addon-tutorial

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "modernuoschemagenerator": {
-      "version": "2.12.13",
+      "version": "2.12.18",
       "commands": [
         "ModernUOSchemaGenerator"
       ]

.gitignore

@@ -1,4 +1,6 @@
 # Distribution Files
+/Distribution/Logger
+/Distribution/Logger.*
 /Distribution/ModernUO
 /Distribution/ModernUO.*
 /Distribution/Server

CONTRIBUTING.md

@@ -28,7 +28,6 @@ We accept fixes and features! Here are some resources to help you get started on
 
 If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests. Make sure the repository can build and all tests pass. Familiarize yourself with the project workflow and our coding conventions.
 
-1. Sign a [Contributor License Agreement](https://cla-assistant.io/modernuo/ModernUO) when submitting your pull request.
 1. Ensure all files have the appropriate [LICENSE](/LICENSE) header (Line 634-649)
 1. Ensure any install or build dependencies are removed.
 1. Update the README.md with details of changes to the interface, this includes new build process,
@@ -38,6 +37,5 @@ If you don't know what a pull request is read this article: https://help.github.
 1. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
    do not have permission to do that, you may request the second reviewer to merge it for you.
 
-[aspnet-contributing]: https://github.com/aspnet/AspNetCore/blob/456dbf1309f9fcae1d7b376784088dcd7818c01e/CONTRIBUTING.md
 [homepage]: http://contributor-covenant.org
 [version]: http://contributor-covenant.org/version/1/4/

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" />

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

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

ModernUO.sln

@@ -14,6 +14,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application", "Projects\App
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddonExample", "Projects\AddonExample\AddonExample.csproj", "{73F435F7-7D30-4275-8B74-D80A0BD7AC23}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logger", "Projects\Logger\Logger.csproj", "{ECAD3793-A7C5-4546-AA88-77DD24574410}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Analyze|Any CPU = Analyze|Any CPU
@@ -57,6 +59,12 @@ Global
 		{73F435F7-7D30-4275-8B74-D80A0BD7AC23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73F435F7-7D30-4275-8B74-D80A0BD7AC23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73F435F7-7D30-4275-8B74-D80A0BD7AC23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECAD3793-A7C5-4546-AA88-77DD24574410}.Analyze|Any CPU.ActiveCfg = Analyze|Any CPU
+		{ECAD3793-A7C5-4546-AA88-77DD24574410}.Analyze|Any CPU.Build.0 = Analyze|Any CPU
+		{ECAD3793-A7C5-4546-AA88-77DD24574410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECAD3793-A7C5-4546-AA88-77DD24574410}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECAD3793-A7C5-4546-AA88-77DD24574410}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECAD3793-A7C5-4546-AA88-77DD24574410}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Projects/Logger/Logger.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <RootNamespace>Server</RootNamespace>
+        <AssemblyName>Logger</AssemblyName>
+        <Product>ModernUO Logger</Product>
+        <OutDir>..\..\Distribution\Assemblies</OutDir>
+        <PublishDir>..\..\Distribution\Assemblies</PublishDir>
+        <Configurations>Debug;Release;Analyze</Configurations>
+    </PropertyGroup>
+    <Target Name="CleanPub" AfterTargets="Clean">
+        <Message Text="Application: Removing distribution files..."/>
+        <Delete Files="..\..\Distribution\$(AssemblyName)" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).deps.json" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).dll" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).dll.config" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).pdb" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.dev.json" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.json" ContinueOnError="true"/>
+    </Target>
+</Project>

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>

Projects/Server/Network/TcpServer.cs

@@ -37,8 +37,8 @@ public static class TcpServer
 
     public static void Start()
     {
-        HashSet<IPEndPoint> listeningAddresses = new HashSet<IPEndPoint>();
+        HashSet<IPEndPoint> listeningAddresses = [];
-        List<Socket> listeners = new List<Socket>();
+        List<Socket> listeners = [];
         foreach (var ipep in ServerConfiguration.Listeners)
         {
             var listener = CreateListener(ipep);
@@ -62,7 +62,7 @@ public static class TcpServer
 
         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 class TcpServer
             // 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);
             }
         }
 

Projects/Server/Server.csproj

@@ -33,13 +33,14 @@
         <Delete Files="..\..\Distribution\System.IO.Hashing.dll" ContinueOnError="true" />
     </Target>
     <ItemGroup>
-        <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
+        <ProjectReference Include="..\Logger\Logger.csproj" />
+        <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" />

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>

Projects/UOContent/Items/Guilds/GuildTeleporter.cs

@@ -51,7 +51,7 @@ public partial class GuildTeleporter : Item
         {
             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.
         }

Projects/UOContent/Mobiles/PlayerMobile.cs

@@ -28,13 +28,9 @@ using Server.Regions;
 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;

Projects/UOContent/UOContent.csproj

@@ -34,20 +34,21 @@
         <Delete Files="..\..\Distribution\Assemblies\ModernUO.Serialization.Annotations.dll" ContinueOnError="true" />
     </Target>
     <ItemGroup>
+        <ProjectReference Include="..\Logger\Logger.csproj" />
         <ProjectReference Include="..\Server\Server.csproj" Private="false" PrivateAssets="All" IncludeAssets="None">
             <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" />

version.json

@@ -1,4 +1,4 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.13.7"
+  "version": "0.14.0"
 }