From b67d57d806c4dc2ced928992eb4ee8a9f5a989e5 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sat, 4 Dec 2021 23:40:38 -0800
Subject: [PATCH] fix: Adds Debian 11 and fixes Fedora 34 support (#875)

* Adds Debian 11 support
* Fixes Fedora 34 support
* Updates CentOS8 support
---
 Directory.Build.props                     |  2 +-
 Projects/Server.Tests/Server.Tests.csproj |  2 +-
 Projects/Server/Server.csproj             |  2 +-
 Projects/UOContent/UOContent.csproj       |  6 +++---
 azure-pipelines.yml                       | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c48855eab..aa4172a54 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.9-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;rhel.7-x64;rhel.8-x64;osx-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x64;debian.9-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>
         <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 2a47a0de7..6536e8cab 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.6.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.7.2" />
         <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 5694a4e65..4efc9e1a9 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.6.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.7.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj">
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index a6094ec12..c5561de3d 100755
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -41,9 +41,9 @@
         <PackageReference Include="MailKit" Version="2.15.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.6.0" />
-        <PackageReference Include="Argon2.Bindings" Version="1.10.0" />
-        <PackageReference Include="Zstd.Binaries" Version="1.1.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.7.2" />
+        <PackageReference Include="Argon2.Bindings" Version="1.11.0" />
+        <PackageReference Include="Zstd.Binaries" Version="1.2.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj">
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 01b7d413d..38df04622 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,12 +34,9 @@ jobs:
       'CentOS 7':
         containerImage: centos:7
         os: centos.7
-      'Debian 10':
-        containerImage: mcr.microsoft.com/dotnet/sdk:5.0-buster-slim
-        os: debian.10
-      # 'Debian 11':
-      #   containerImage: amd64/buildpack-deps:bullseye
-      #   os: debian.11-x64
+      'Debian 11':
+        containerImage: mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim
+        os: debian.11
       'Ubuntu 20':
         containerImage: mcr.microsoft.com/dotnet/sdk:6.0-focal
         os: ubuntu.20.04
@@ -49,6 +46,9 @@ jobs:
       'Fedora 33':
         containerImage: fedora:33
         os: fedora.33
+      'Fedora 34':
+        containerImage: fedora:34
+        os: fedora.34
 
   displayName: Linux