From 4c62bccb73ae453b8f1a8ea087b5653fc992e901 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sat, 4 Apr 2026 00:35:39 -0700
Subject: [PATCH] fix: Fixes publishing with build tool (#2398)

---
 Directory.Build.props               |  4 +++-
 Projects/Logger/Logger.csproj       | 12 ++++--------
 Projects/UOContent/UOContent.csproj |  3 +++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0c1d1814d..f373966be 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -31,10 +31,12 @@
         <GitVersionBaseDirectory>$(SolutionDir)</GitVersionBaseDirectory>
         <PredefinedCulturesOnly>false</PredefinedCulturesOnly>
     </PropertyGroup>
+    <PropertyGroup>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(RuntimeIdentifier)'==''">
         <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
         <SelfContained>false</SelfContained>
-        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <InvariantGlobalization>false</InvariantGlobalization>
     </PropertyGroup>
     <PropertyGroup Condition="'$(IsWindows)'=='true' AND '$(IsX64)'=='true' AND '$(RuntimeIdentifier)'==''">
diff --git a/Projects/Logger/Logger.csproj b/Projects/Logger/Logger.csproj
index e94ae59a8..d9cca1040 100644
--- a/Projects/Logger/Logger.csproj
+++ b/Projects/Logger/Logger.csproj
@@ -8,13 +8,9 @@
         <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"/>
+        <Message Text="Logger: Removing distribution assemblies..."/>
+        <Delete Files="..\..\Distribution\Assemblies\$(AssemblyName).deps.json" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\Assemblies\$(AssemblyName).dll" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\Assemblies\$(AssemblyName).pdb" ContinueOnError="true"/>
     </Target>
 </Project>
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index 1eaf9e807..a127f62c4 100644
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -30,7 +30,10 @@
         <Delete Files="..\..\Distribution\Assemblies\libdeflate.dll" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\Assemblies\libdeflate.dylib" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\Assemblies\ZstdNet.dll" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\Assemblies\libzstd.dll" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\Assemblies\ModernUO.Serialization.Annotations.dll" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\Assemblies\ModernUO.CodeGeneratedEvents.Annotations.dll" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\Assemblies\ModernUO.CodeGeneratedEvents.Generator.dll" ContinueOnError="true" />
     </Target>
     <ItemGroup>
         <ProjectReference Include="..\Logger\Logger.csproj" />