From ba378fc5f279b71d91e2ebf6993f236dbc93480b Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Mon, 3 Jan 2022 14:19:39 -0800
Subject: [PATCH] fix: Adds Ubuntu 14 and Linux Mint 17/18/19 support
 specifically (#908)

---
 Directory.Build.props                     |  2 +-
 Projects/Server.Tests/Server.Tests.csproj |  2 +-
 Projects/Server/Server.csproj             |  2 +-
 Projects/UOContent/UOContent.csproj       |  8 ++++----
 publish.cmd                               | 16 +++++++++++-----
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index be723978b..d0e008643 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,7 +11,7 @@
         <PublicRelease>true</PublicRelease>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <NoWarn>NU1603</NoWarn>
-        <RuntimeIdentifiers>win-x64;debian.10-x64;debian.11-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;centos.7-x64;centos.8-x64;fedora.32-x64;fedora.33-x64;fedora.34-x64;rhel.7-x64;rhel.8-x64;osx-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x64;debian.10-x64;debian.11-x64;ubuntu.16.04-x64;ubuntu.18.04-x64;ubuntu.20.04-x64;centos.7-x64;centos.8-x64;fedora.32-x64;fedora.33-x64;fedora.34-x64;rhel.7-x64;rhel.8-x64;linuxmint.17-x64;linuxmint.18-x64;linuxmint.19-x64;osx-x64</RuntimeIdentifiers>
         <Configurations>Debug;Release;Analyze</Configurations>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj
index 6536e8cab..b33bf4c7d 100644
--- a/Projects/Server.Tests/Server.Tests.csproj
+++ b/Projects/Server.Tests/Server.Tests.csproj
@@ -7,7 +7,7 @@
         <PackageReference Include="Moq" Version="4.16.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-        <PackageReference Include="Zlib.Bindings" Version="1.7.2" />
+        <PackageReference Include="Zlib.Bindings" Version="1.8.0" />
         <ProjectReference Include="..\Server\Server.csproj" />
         <ProjectReference Include="..\UOContent\UOContent.csproj" />
         <DataFiles Include="$(SolutionDir)\Distribution\Data\**" />
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index 392fccc6f..5293d55e6 100755
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -36,7 +36,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
         <PackageReference Include="PollGroup" Version="1.1.0" />
-        <PackageReference Include="Zlib.Bindings" Version="1.7.2" />
+        <PackageReference Include="Zlib.Bindings" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj">
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index 06e297a52..f260b9a4c 100755
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -38,12 +38,12 @@
         <ProjectReference Include="..\Server\Server.csproj" Private="false" PrivateAssets="All" IncludeAssets="None">
             <IncludeInPackage>false</IncludeInPackage>
         </ProjectReference>
-        <PackageReference Include="MailKit" Version="2.15.0" />
+        <PackageReference Include="MailKit" Version="3.0.0" />
         <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0" />
         <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
-        <PackageReference Include="Zlib.Bindings" Version="1.7.2" />
-        <PackageReference Include="Argon2.Bindings" Version="1.11.0" />
-        <PackageReference Include="Zstd.Binaries" Version="1.2.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.8.0" />
+        <PackageReference Include="Argon2.Bindings" Version="1.12.0" />
+        <PackageReference Include="Zstd.Binaries" Version="1.3.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj">
diff --git a/publish.cmd b/publish.cmd
index e0f9fe6df..0490b16a8 100755
--- a/publish.cmd
+++ b/publish.cmd
@@ -12,7 +12,7 @@ elif [[ $(uname) = "Darwin" ]]; then
   os="-r osx-x64"
 elif [[ -f /etc/os-release ]]; then
   . /etc/os-release
-  NAME="$(tr '[:upper:]' '[:lower:]' <<< $NAME)"
+  NAME="$(tr '[:upper:]' '[:lower:]' <<< $NAME | tr -d [:blank:])"
   os="-r $NAME.$VERSION_ID-x64"
 fi
 
@@ -32,8 +32,11 @@ dotnet clean --verbosity quiet
 echo dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
 dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
 
-echo dotnet publish ${config} ${os} --framework net6.0 --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
-dotnet publish ${config} ${os} --framework net6.0 --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
+echo dotnet build -c Release Projects/SerializationGenerator/SerializationGenerator.csproj
+dotnet build -c Release Projects/SerializationGenerator/SerializationGenerator.csproj
+
+echo dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
+dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
 
 echo dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
 dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
@@ -65,8 +68,11 @@ dotnet clean --verbosity quiet
 echo dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
 dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
 
-echo dotnet publish %config% %os% --framework net6.0 --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
-dotnet publish %config% %os% --framework net6.0 --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
+echo dotnet build -c Release Projects/SerializationGenerator/SerializationGenerator.csproj
+dotnet build -c Release Projects/SerializationGenerator/SerializationGenerator.csproj
+
+echo dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
+dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
 
 echo dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj
 dotnet build -c Release Projects/SerializationSchemaGenerator/SerializationSchemaGenerator.csproj