From feedbeb2622f5d0992aa72d76bbf646dc8e4cbc0 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Fri, 4 Oct 2019 22:05:45 -0700
Subject: [PATCH] Updates publish profiles and readme

---
 .../Linux-SelfContained.pubxml                | 26 ++++-----
 .../Properties/PublishProfiles/Linux.pubxml   |  9 ++++
 .../MacOSX-SelfContained.pubxml               | 16 ------
 .../PublishProfiles/OSX-SelfContained.pubxml  | 10 ++++
 .../Properties/PublishProfiles/OSX.pubxml     |  9 ++++
 .../PublishProfiles/Unix-Portable.pubxml      | 16 ------
 .../Windows-SelfContained.pubxml              | 10 ++++
 .../Properties/PublishProfiles/Windows.pubxml | 25 ++++-----
 README.md                                     | 53 ++++++++++++-------
 9 files changed, 90 insertions(+), 84 deletions(-)
 create mode 100644 Projects/Server/Properties/PublishProfiles/Linux.pubxml
 delete mode 100644 Projects/Server/Properties/PublishProfiles/MacOSX-SelfContained.pubxml
 create mode 100644 Projects/Server/Properties/PublishProfiles/OSX-SelfContained.pubxml
 create mode 100644 Projects/Server/Properties/PublishProfiles/OSX.pubxml
 delete mode 100644 Projects/Server/Properties/PublishProfiles/Unix-Portable.pubxml
 create mode 100644 Projects/Server/Properties/PublishProfiles/Windows-SelfContained.pubxml

diff --git a/Projects/Server/Properties/PublishProfiles/Linux-SelfContained.pubxml b/Projects/Server/Properties/PublishProfiles/Linux-SelfContained.pubxml
index 52201225c..c43c47567 100644
--- a/Projects/Server/Properties/PublishProfiles/Linux-SelfContained.pubxml
+++ b/Projects/Server/Properties/PublishProfiles/Linux-SelfContained.pubxml
@@ -1,16 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <PublishDir>../</PublishDir>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <_IsPortable>false</_IsPortable>
-  </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishTrimmed>true</PublishTrimmed>
+  </PropertyGroup>
+</Project>
diff --git a/Projects/Server/Properties/PublishProfiles/Linux.pubxml b/Projects/Server/Properties/PublishProfiles/Linux.pubxml
new file mode 100644
index 000000000..fb76af4c2
--- /dev/null
+++ b/Projects/Server/Properties/PublishProfiles/Linux.pubxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>
diff --git a/Projects/Server/Properties/PublishProfiles/MacOSX-SelfContained.pubxml b/Projects/Server/Properties/PublishProfiles/MacOSX-SelfContained.pubxml
deleted file mode 100644
index dbafc0569..000000000
--- a/Projects/Server/Properties/PublishProfiles/MacOSX-SelfContained.pubxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <PublishDir>../</PublishDir>
-    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <_IsPortable>false</_IsPortable>
-  </PropertyGroup>
-</Project>
diff --git a/Projects/Server/Properties/PublishProfiles/OSX-SelfContained.pubxml b/Projects/Server/Properties/PublishProfiles/OSX-SelfContained.pubxml
new file mode 100644
index 000000000..2f9813651
--- /dev/null
+++ b/Projects/Server/Properties/PublishProfiles/OSX-SelfContained.pubxml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishTrimmed>true</PublishTrimmed>
+  </PropertyGroup>
+</Project>
diff --git a/Projects/Server/Properties/PublishProfiles/OSX.pubxml b/Projects/Server/Properties/PublishProfiles/OSX.pubxml
new file mode 100644
index 000000000..7c45904d8
--- /dev/null
+++ b/Projects/Server/Properties/PublishProfiles/OSX.pubxml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>
diff --git a/Projects/Server/Properties/PublishProfiles/Unix-Portable.pubxml b/Projects/Server/Properties/PublishProfiles/Unix-Portable.pubxml
deleted file mode 100644
index 06a48d905..000000000
--- a/Projects/Server/Properties/PublishProfiles/Unix-Portable.pubxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <PublishDir>../</PublishDir>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
-    <_IsPortable>true</_IsPortable>
-  </PropertyGroup>
-</Project>
diff --git a/Projects/Server/Properties/PublishProfiles/Windows-SelfContained.pubxml b/Projects/Server/Properties/PublishProfiles/Windows-SelfContained.pubxml
new file mode 100644
index 000000000..a43797ef8
--- /dev/null
+++ b/Projects/Server/Properties/PublishProfiles/Windows-SelfContained.pubxml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishTrimmed>true</PublishTrimmed>
+  </PropertyGroup>
+</Project>
diff --git a/Projects/Server/Properties/PublishProfiles/Windows.pubxml b/Projects/Server/Properties/PublishProfiles/Windows.pubxml
index c74181459..c6a68c538 100644
--- a/Projects/Server/Properties/PublishProfiles/Windows.pubxml
+++ b/Projects/Server/Properties/PublishProfiles/Windows.pubxml
@@ -1,16 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <PublishDir>../</PublishDir>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
-    <_IsPortable>true</_IsPortable>
-  </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>
diff --git a/README.md b/README.md
index 103635f38..26e030d9d 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,50 @@
 ModernUO
 =====
 
-### Contacts
+Ultima Online Server Emulator for the modern era!
+
+### Join!
 [Join Discord Channel](https://discord.gg/VdyCpjQ)
 
 ### Goals
 - See [Goals](./GOALS.md)
 
-### Requirements
-- .NET Core 3.0 (Preview 7) or newer
+# Requirements to Compile
+- [.NET Core 3.0 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.0)
+- [System.IO.Pipelines 4.6.0](https://www.nuget.org/packages/System.IO.Pipelines/) (Restored automatically during publishing)
+
+### Requirements to Run
 - zlib (Linux only)
 
-### Building with Visual Studio 2019
-- Publish `Server` project
-- Build `Scripts` project
-
 ### Building with .NET Core 3.0 SDK
-`dotnet publish /p:PublishProfiles=<profile>`
-- Windows x64: `Windows`
-- Linux/MacOSX x64 w/ .NET Core 3 installed: `Unix-Portable`
-- Linux x64 w/ .NET Core 3: `Linux-SelfContained`
-- MacOSX x64 /wo .NET Core 3: `MacOSX-SelfContained`
+`dotnet publish /p:PublishProfile=[platform][-SelfContained]`
+- `platform` can be `Windows`, `Linux`, or `OSX` (capitalization matters)
+- Appending `-SelfContained` will export all .NET Core files required to run portably.
 
-#### Running on Windows
+### Running
 - Follow the build instructions
-- Run `Distribution\ModernUO.exe` or `dotnet ModernUO.dll`
+- Go to `Distribution` directory
 
-#### Running on MacOSX or Linux
-- Follow the build instructions
-- Run `Distribution\ModernUO` or `dotnet ModernUO.dll`
+##### Windows
+- Run `ModernUO.exe` or `dotnet ModernUO.dll`
 
-#### Running on Linux
-- Follow the build instructions
-- Run `Distribution\ModernUO` or `dotnet ModernUO.dll`
+##### OSX or Linux
+- Run `./ModernUO` or `dotnet ./ModernUO.dll`
+
+### Thanks
+- RunUO Team & Community
+- ServUO Team & Community
+- [Jaedan](https://github.com/jaedan) and the ClassicUO Community
 
 ### Troubleshooting / FAQ
+
+##### Where do I go to run ModernUO?
+Everything is run from the `Distribution` directory.
+This folder is portable, so it can be moved to the production server for deployments.
+
+##### My scripts folder is not compiling during runtime, what happened?
+NET Core does not support dynamic compiling. Scripts are now compiled separately and moved to the `Distribution/Assemblies` directory.
+This also allows us to divide content into packages that can be included by dropping in the DLL.
+
+##### Why can't I run ModernUO on a 32-bit operating system?
+ModernUO is optimized for performance and modern hardware.