diff --git a/Directory.Build.props b/Directory.Build.props
index 8b0d592c8..fa59f0e06 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -12,14 +12,28 @@
         <DefineConstants Condition="$(RuntimeIdentifier.StartsWith('win'))">WINDOWS</DefineConstants>
         <DefineConstants Condition="$(RuntimeIdentifier.StartsWith(`win`)) != true">UNIX</DefineConstants>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-        <RestoreLockedMode>true</RestoreLockedMode>
         <NoWarn>NU1603</NoWarn>
-        <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
         <RuntimeIdentifiers>win-x64;debian.10-x64;debian.9-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;centos.7-x64;centos.8-x64;osx-x64</RuntimeIdentifiers>
         <Configurations>Debug;Release;Analyze</Configurations>
-        <RunCodeAnalysis>true</RunCodeAnalysis>
-        <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+        <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+        <UseNETCoreGenerator>true</UseNETCoreGenerator>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <WarningsAsErrors />
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
+        <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+        <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+    </PropertyGroup>
+    <PropertyGroup  Condition="'$(RuntimeIdentifier)'==''">
+        <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+        <SelfContained>false</SelfContained>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    </PropertyGroup>
+    <PropertyGroup  Condition="'$(IsWindows)'=='true' AND '$(RuntimeIdentifier)'==''">
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    </PropertyGroup>
+    <PropertyGroup  Condition="'$(IsOSX)'=='true' AND '$(RuntimeIdentifier)'==''">
+        <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     </PropertyGroup>
     <ItemGroup Condition="'$(Configuration)'=='Analyze'">
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="all" />
diff --git a/Distribution/Configuration/email-settings.json b/Distribution/Configuration/email-settings.json
new file mode 100644
index 000000000..ee04379aa
--- /dev/null
+++ b/Distribution/Configuration/email-settings.json
@@ -0,0 +1,15 @@
+{
+  "enabled": false,
+  "fromAddress": "support@modernuo.com",
+  "fromName": "ModernUO Team",
+  "crashAddress": "crashes@modernuo.com",
+  "crashName": "Crash Log",
+  "speechLogPageAddress": "support@modernuo.com",
+  "speechLogPageName": "GM Support Conversation",
+  "emailServer": "smtp.gmail.com",
+  "emailPort": 465,
+  "emailUsername": "support@modernuo.com",
+  "emailPassword": "Some Password 123",
+  "emailSendRetryCount": 5,
+  "emailSendRetryDelay": 3
+}
\ No newline at end of file
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index c9b5f06cd..e6ac3c2da 100644
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -6,17 +6,9 @@
         <StartupObject>Server.Core</StartupObject>
         <AssemblyName>ModernUO</AssemblyName>
         <Win32Resource />
-        <Version>0.5.0</Version>
         <Product>ModernUO Server</Product>
         <PublishDir>..\..\Distribution</PublishDir>
-        <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-        <UseNETCoreGenerator>true</UseNETCoreGenerator>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <WarningsAsErrors />
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-        <RunCodeAnalysis>true</RunCodeAnalysis>
-        <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+        <OutDir>..\..\Distribution</OutDir>
     </PropertyGroup>
     <Target Name="CleanPub" AfterTargets="Clean">
         <Message Text="Removing distribution files..." />
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index d1f2ee69d..e2f403273 100644
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -5,11 +5,7 @@
         <AssemblyName>UOContent</AssemblyName>
         <Product>ModernUO Content</Product>
         <PublishDir>..\..\Distribution\Assemblies</PublishDir>
-        <UseNETCoreGenerator>true</UseNETCoreGenerator>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <WarningsAsErrors />
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <OutDir>..\..\Distribution\Assemblies</OutDir>
     </PropertyGroup>
     <Target Name="CleanPub" AfterTargets="Clean">
         <Message Text="Removing distribution assemblies..." />