From e172dc96616988f6c12660306deb191e54e91a89 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Thu, 19 May 2022 10:51:24 -0700
Subject: [PATCH] fix: Updates dependencies & adds Fedora 35/36 support (#1029)

---
 Directory.Build.props                           |  4 ++--
 Projects/Server.Tests/Server.Tests.csproj       |  7 +++----
 Projects/Server/Server.csproj                   |  4 +++-
 Projects/UOContent.Tests/UOContent.Tests.csproj |  6 +++---
 Projects/UOContent/UOContent.csproj             |  6 +++---
 README.md                                       |  2 +-
 azure-pipelines.yml                             | 12 ++++++------
 7 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 6f875b8d0..c0a882066 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -55,11 +55,11 @@
         <AnalysisLevel>latest</AnalysisLevel>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Serilog" Version="2.10.0" />
+        <PackageReference Include="Serilog" Version="2.11.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
         <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
-            <Version>3.4.255</Version>
+            <Version>3.5.104</Version>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <AdditionalFiles Include="..\..\Rules.ruleset" />
diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj
index b310c4f69..db30edf70 100644
--- a/Projects/Server.Tests/Server.Tests.csproj
+++ b/Projects/Server.Tests/Server.Tests.csproj
@@ -3,11 +3,10 @@
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-        <PackageReference Include="Moq" Version="4.17.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-        <PackageReference Include="Zlib.Bindings" Version="1.8.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
         <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 a77dac609..50866b6d6 100755
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -21,6 +21,8 @@
         <Delete Files="..\..\Distribution\$(AssemblyName).pdb" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.dev.json" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.json" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\ModernUO.Serialization.Annotations.dll" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\ModernUO.SerializationGenerator.dll" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\libz.dylib" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\libz.so" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\Microsoft.Toolkit.HighPerformance.dll" ContinueOnError="true" />
@@ -36,7 +38,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
         <PackageReference Include="PollGroup" Version="1.1.0" />
-        <PackageReference Include="Zlib.Bindings" Version="1.8.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.9.2" />
 
         <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.0.2" />
         <PackageReference Include="ModernUO.Serialization.Generator" Version="2.0.4" />
diff --git a/Projects/UOContent.Tests/UOContent.Tests.csproj b/Projects/UOContent.Tests/UOContent.Tests.csproj
index 38f0fc1bd..195cec9a4 100644
--- a/Projects/UOContent.Tests/UOContent.Tests.csproj
+++ b/Projects/UOContent.Tests/UOContent.Tests.csproj
@@ -3,10 +3,10 @@
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-        <PackageReference Include="Moq" Version="4.17.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
         <ProjectReference Include="..\Server\Server.csproj" />
         <ProjectReference Include="..\Server.Tests\Server.Tests.csproj" />
         <ProjectReference Include="..\UOContent\UOContent.csproj" />
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index 024d9bd98..cc056a51a 100755
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -41,9 +41,9 @@
         <PackageReference Include="MailKit" Version="3.2.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.8.0" />
-        <PackageReference Include="Argon2.Bindings" Version="1.12.0" />
-        <PackageReference Include="Zstd.Binaries" Version="1.3.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.9.2" />
+        <PackageReference Include="Argon2.Bindings" Version="1.13.0" />
+        <PackageReference Include="Zstd.Binaries" Version="1.4.0" />
 
         <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.0.2" />
         <PackageReference Include="ModernUO.Serialization.Generator" Version="2.0.4" />
diff --git a/README.md b/README.md
index 3f4af0244..b7a0230e7 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ ModernUO [![Discord](https://img.shields.io/discord/751317910504603701?logo=disc
 [![Ubuntu 16/18/20 LTS](https://img.shields.io/badge/-20LTS-E95420?logo=ubuntu&logoColor=white)](https://ubuntu.com/download/server)
 [![Linux Mint 17/18/19/20](https://img.shields.io/badge/-20-87CF3E?logo=linux%20mint&logoColor=white)](https://linuxmint.com/download.php)
 [![CentOS 7/8](https://img.shields.io/badge/-8.5-262577?logo=centos&logoColor=white)](https://www.centos.org/download/)
-[![Fedora 32/33/34](https://img.shields.io/badge/-34-51a2da?logo=fedora&logoColor=white)](https://getfedora.org/en/server/download/)
+[![Fedora 32/33/34/35/36](https://img.shields.io/badge/-36-51a2da?logo=fedora&logoColor=white)](https://getfedora.org/en/server/download/)
 [![RedHat 7/8](https://img.shields.io/badge/-8-BE0000?logo=red%20hat&logoColor=white)](https://access.redhat.com/downloads)
 
 #### Running the server
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8efb2abc9..51ad8fce0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -40,15 +40,15 @@ jobs:
       'Ubuntu 20':
         containerImage: mcr.microsoft.com/dotnet/sdk:6.0-focal
         os: ubuntu.20.04
-      'Fedora 32':
-        containerImage: fedora:32
-        os: fedora.32
-      'Fedora 33':
-        containerImage: fedora:33
-        os: fedora.33
       'Fedora 34':
         containerImage: fedora:34
         os: fedora.34
+      'Fedora 35':
+        containerImage: fedora:35
+        os: fedora.34
+      'Fedora 36':
+        containerImage: fedora:36
+        os: fedora.34
 
   displayName: Linux