Adds .NET 5 & Ubuntu 20 LTS Targeting (#193)

.github/workflows/dotnet-core.yml

@@ -20,12 +20,12 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 3.1.401
     - name: Restore NuGet Packages
       run: dotnet restore --force-evaluate
     - name: Build Server
-      run: dotnet build -c Release --no-restore Projects/Server/Server.csproj
+      run: dotnet build -c Release -f netcoreapp3.1 --no-restore Projects/Server/Server.csproj
     - name: Build UO Content
-      run: dotnet build -c Release --no-restore Projects/UOContent/UOContent.csproj
+      run: dotnet build -c Release -f netcoreapp3.1 --no-restore Projects/UOContent/UOContent.csproj
     - name: Test
-      run: dotnet test --no-restore
+      run: dotnet test --no-restore -f netcoreapp3.1

Directory.Build.props

@@ -4,7 +4,7 @@
     <Authors>Kamron Batman</Authors>
     <Company>ModernUO</Company>
     <Copyright>2019-2020</Copyright>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <Platforms>x64</Platforms>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>8.0</LangVersion>
@@ -15,6 +15,6 @@
     <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;centos.7-x64;centos.8-x64;osx-x64</RuntimeIdentifiers>
+    <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>
   </PropertyGroup>
 </Project>

Projects/Server.Tests/Server.Tests.csproj

@@ -3,11 +3,11 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="coverlet.collector" Version="1.3.0" />
-    <PackageReference Include="Zlib.Bindings" Version="1.1.0" />
+    <PackageReference Include="Zlib.Bindings" Version="1.2.0" />
     <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
 </Project>

Projects/Server/Server.csproj

@@ -69,7 +69,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.5" />
     <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
-    <PackageReference Include="Zlib.Bindings" Version="1.1.0" />
+    <PackageReference Include="Zlib.Bindings" Version="1.2.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='Analyze'">
     <PackageReference Include="StyleCop.Analyzers">

Projects/Server/packages.lock.json

@@ -44,9 +44,9 @@
       },
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",
@@ -114,9 +114,9 @@
     ".NETCoreApp,Version=v3.1/centos.7-x64": {
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",
@@ -130,9 +130,9 @@
     ".NETCoreApp,Version=v3.1/centos.8-x64": {
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",
@@ -146,9 +146,9 @@
     ".NETCoreApp,Version=v3.1/debian.10-x64": {
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",
@@ -162,9 +162,9 @@
     ".NETCoreApp,Version=v3.1/debian.9-x64": {
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",
@@ -178,9 +178,9 @@
     ".NETCoreApp,Version=v3.1/osx-x64": {
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",
@@ -194,9 +194,9 @@
     ".NETCoreApp,Version=v3.1/ubuntu.16.04-x64": {
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",
@@ -210,9 +210,25 @@
     ".NETCoreApp,Version=v3.1/ubuntu.18.04-x64": {
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v3.1/ubuntu.20.04-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",
@@ -226,9 +242,263 @@
     ".NETCoreApp,Version=v3.1/win-x64": {
       "Zlib.Bindings": {
         "type": "Direct",
-        "requested": "[1.1.0, )",
+        "requested": "[1.2.0, )",
-        "resolved": "1.1.0",
+        "resolved": "1.2.0",
-        "contentHash": "hLmHUTlZR3rnJ95FboiyJdLR8MJbfHdmapnRZHWLvkxB48jDgRBBJG1w5NYRiNBteVY4uksacXM7/V8nu1byBw=="
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0": {
+      "Microsoft.AspNetCore.Connections.Abstractions": {
+        "type": "Direct",
+        "requested": "[3.1.5, )",
+        "resolved": "3.1.5",
+        "contentHash": "d9QNKLjOIb+O8fW+Xolhw0ZpOP1nzJi822qthXUhZqzb1PpL/xD4tmZfeE6IRXlRmQOAKDKg38mDEDTaMPGy1w==",
+        "dependencies": {
+          "Microsoft.AspNetCore.Http.Features": "3.1.5",
+          "System.IO.Pipelines": "4.7.1"
+        }
+      },
+      "Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv": {
+        "type": "Direct",
+        "requested": "[3.1.5, )",
+        "resolved": "3.1.5",
+        "contentHash": "RmWkwrdmpquJa3Tvui4AhNEy+LeqeDgd85RPNjamwKNjVSUW+Yaz8n1pKPz4IiqDJ+3XfdmaLjP9TSVnXSDNuA==",
+        "dependencies": {
+          "Libuv": "1.10.0",
+          "Microsoft.AspNetCore.Connections.Abstractions": "3.1.5",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.5",
+          "Microsoft.Extensions.Options": "3.1.5"
+        }
+      },
+      "Microsoft.Extensions.Hosting.Abstractions": {
+        "type": "Direct",
+        "requested": "[3.1.5, )",
+        "resolved": "3.1.5",
+        "contentHash": "e57iK9spITqHE7qNgC3IowzK+PK5NC2rmVY4Sz+ZoDNO24nIsgllIRbanSbt2wQz7Iy/N8Jm3C1sXqKc8zEOMQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.5",
+          "Microsoft.Extensions.FileProviders.Abstractions": "3.1.5",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.5"
+        }
+      },
+      "System.IO.Pipelines": {
+        "type": "Direct",
+        "requested": "[4.7.2, )",
+        "resolved": "4.7.2",
+        "contentHash": "rGIIhoY3lUdn9rWeuGdgeZZ0P+SpJ1wZI5g8TnXqgvuhFgUP7iP9Nt5FZebYInQZQxqnwjPxdYYBE5l/8PJmqQ=="
+      },
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      },
+      "Microsoft.AspNetCore.Http.Features": {
+        "type": "Transitive",
+        "resolved": "3.1.5",
+        "contentHash": "I+G1L5363H2oCdMxHv2vtbluRgb4e33Gv6zJd8Uj93bBRFbE4MZlb3cB9PvRAYpSB0xbK216/qRtHmQJBzWIcg==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "3.1.5",
+          "System.IO.Pipelines": "4.7.1"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Abstractions": {
+        "type": "Transitive",
+        "resolved": "3.1.5",
+        "contentHash": "VBcAk6s9izZr04WCzNqOh1Sxz2RbVSh0G79MfpHSDv16cUJtSEYEHody9ZnF71LBEktzdu6cvDFBOFMh43q0iA==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "3.1.5"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "3.1.5",
+        "contentHash": "2VSCj2TZPMdeEi279Lawi6qJQu4+sEWizSOYrhY6hapyS1jxn1jVUZT1Ugv68bya+x8+3lD4+RqhUZql9PhISQ=="
+      },
+      "Microsoft.Extensions.FileProviders.Abstractions": {
+        "type": "Transitive",
+        "resolved": "3.1.5",
+        "contentHash": "LrEQ97jhSWw84Y1m+CJfvh9qTUUswt27au54QYn2x5PCMPPgR+yAv/4VTJKMGSSI9T4scSLBXZ/fVhT4fPTCtA==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "3.1.5"
+        }
+      },
+      "Microsoft.Extensions.Logging.Abstractions": {
+        "type": "Transitive",
+        "resolved": "3.1.5",
+        "contentHash": "ZvwowjRSWXewdPI+whPFXgwF4Qme6Q9KV9SCPEITSGiqHLArct7q5hTBtTzj3GPsVLjTqehvTg6Bd/EQk9JS0A=="
+      },
+      "Microsoft.Extensions.Options": {
+        "type": "Transitive",
+        "resolved": "3.1.5",
+        "contentHash": "f+JT/7lkKBMp/Ak2tVjO+TD7o+UoCfjnExkZNn0PZIso8kIXrqNy6x42Lrxf4Q0pW3JMf9ExmL2EQlvk2XnFAg==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.5",
+          "Microsoft.Extensions.Primitives": "3.1.5"
+        }
+      },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "3.1.5",
+        "contentHash": "6bLdjSAQix82oP2tsuX9MM2yjgUFFOkSZYyRSKoUULilw2cg0Y0H+dnugwYlfj8Jd7yjd/+QSdNBqEyYhTYv0w=="
+      },
+      "Microsoft.NETCore.Platforms": {
+        "type": "Transitive",
+        "resolved": "1.0.1",
+        "contentHash": "2G6OjjJzwBfNOO8myRV/nFrbTw5iA+DEm0N+qUqhrOmaVtn4pC77h38I1jsXGw5VH55+dPfQsqHD0We9sCl9FQ=="
+      }
+    },
+    ".NETCoreApp,Version=v5.0/centos.7-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0/centos.8-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0/debian.10-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0/debian.9-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0/osx-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0/ubuntu.16.04-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0/ubuntu.18.04-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0/ubuntu.20.04-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v5.0/win-x64": {
+      "Zlib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.2.0, )",
+        "resolved": "1.2.0",
+        "contentHash": "z1/D7sNbpq3E6B+YLvV99vx9fa6cnOtxVLKMBVFJ8i/dGZG/y8bE+7lyOwLaDmQlTendwidPvjKfUKhLYgBryg=="
       },
       "Libuv": {
         "type": "Transitive",

Projects/UOContent.Tests/UOContent.Tests.csproj

@@ -3,9 +3,9 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="coverlet.collector" Version="1.3.0" />
     <ProjectReference Include="..\Server\Server.csproj" />
     <ProjectReference Include="..\UOContent\UOContent.csproj" />

Projects/UOContent/UOContent.csproj

@@ -67,9 +67,9 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.5" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.5" />
     <!-- Direct packages -->
-    <PackageReference Include="MailKit" Version="2.7.0" />
+    <PackageReference Include="MailKit" Version="2.8.0" />
-    <PackageReference Include="Zlib.Bindings" Version="1.1.0" />
+    <PackageReference Include="Zlib.Bindings" Version="1.2.0" />
-    <PackageReference Include="Argon2.Bindings" Version="1.5.1" />
+    <PackageReference Include="Argon2.Bindings" Version="1.6.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='Analyze'">
     <PackageReference Include="StyleCop.Analyzers">

README.md

@@ -2,7 +2,9 @@ ModernUO [![Discord](https://img.shields.io/discord/458277173208547350?logo=disc
 =====
 
 ##### Ultima Online Server Emulator for the modern era!
-[![.NET Core](https://img.shields.io/badge/.NET-Core%203.1-5C2D91)](https://dotnet.microsoft.com/download/dotnet-core/3.1)
+[![.NET](https://img.shields.io/badge/.NET-%205.0-5C2D91)](https://dotnet.microsoft.com/download/dotnet/5.0)
+[![.NET Core](https://img.shields.io/badge/.NET-Core%203.1.7-5C2D91)](https://dotnet.microsoft.com/download/dotnet-core/3.1)
+<br />
 ![Windows](https://img.shields.io/badge/-server%202019-0078D6?logo=windows)
 ![OSX](https://img.shields.io/badge/-catalina-222222?logo=apple&logoColor=white)
 ![Debian](https://img.shields.io/badge/-buster-A81D33?logo=debian)
@@ -12,6 +14,7 @@ ModernUO [![Discord](https://img.shields.io/discord/458277173208547350?logo=disc
 [![GitHub license](https://img.shields.io/github/license/modernuo/ModernUO?color=blue)](https://github.com/modernuo/ModernUO/blob/master/LICENSE)
 [![GitHub stars](https://img.shields.io/github/stars/modernuo/ModernUO?logo=github)](https://github.com/modernuo/ModernUO/stargazers)
 [![GitHub issues](https://img.shields.io/github/issues/modernuo/ModernUO?logo=github)](https://github.com/modernuo/ModernUO/issues)
+<br />
 [![GitHub build](https://img.shields.io/github/workflow/status/modernuo/ModernUO/Build?logo=github)](https://github.com/modernuo/ModernUO/actions)
 [![AzurePipelines build](https://dev.azure.com/modernuo/modernuo/_apis/build/status/Build?branchName=master)](https://dev.azure.com/modernuo/modernuo/_build/latest?definitionId=1&branchName=master)
 
@@ -20,24 +23,31 @@ ModernUO [![Discord](https://img.shields.io/discord/458277173208547350?logo=disc
 
 ## Publishing a build
 #### Requirements
-- [.NET Core 3.1.4 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1)
+- [.NET Core 3.1.7 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1)
+<br />or
+- [.NET 5.0 (Preview) SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
 
 #### Publishing Builds
-- `./Tools/publish.cmd [os] [Release|Debug (default: Release)]`
+- Using terminal or powershell: `./Tools/publish.cmd [os] [framework] [release|debug (default: release)]`
   - Supported `os`:
     - `win` for Windows 8/10/2019
     - `osx` for MacOS
-    - `ubuntu.16.04`, `ubuntu.18.04` for Ubuntu (20.04 will be supported in the next .NET Core Release)
+    - `ubuntu.16.04`, `ubuntu.18.04` `ubuntu.20.04` for Ubuntu LTS
     - `debian.9`, `debian.10` for Debian
     - `centos.7`, `centos.8` for CentOS
     - If blank, will use host operating system
+  - Supported `framework`:
+    - `core` for .NET Core 3.1.7
+    - `net` for .NET 5.0
 
 ## Deploying / Running Server
 - Follow the [publish](https://github.com/modernuo/ModernUO#publishing-a-build) instructions
 - Copy `Distribution` directory to the production server
 
 #### Requirements
-- [.NET Core 3.1 Runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1)
+- [.NET Core 3.1.7 Runtime](https://dotnet.microsoft.com/download/dotnet-core/3.1)
+<br />or
+- [.NET 5.0 (Preview) Runtime](https://dotnet.microsoft.com/download/dotnet/5.0)
 
 #### Running
 - `dotnet ModernUO.dll`

Tools/publish.cmd

@@ -1,20 +1,29 @@
+#!/usr/bin/env bash
+dotnet restore --force-evaluate
+
 :<<"::SHELLSCRIPT"
 @ECHO OFF
 GOTO :CMDSCRIPT
 
 ::SHELLSCRIPT
-if [[ -z $2 ]]
+if [[ -z $2 ]] || [[ ${2,,} = "core" ]]
+then
+  f="-f netcoreapp3.1"
+else
+  f="-f net5.0"
+fi
+
+if [[ -z $3 ]]
 then
   c="-c Release"
 else
-  c="-c $2"
+  c="-c ${3^}"
 fi
 
-dotnet restore --force-evaluate
-
 if [[ $1 ]]
 then
-  r="-r $1-x64"
+  runtime=${1,,}
+  r="-r $runtime-x64"
 else
   if [[ $(uname) = "Darwin" ]]
   then
@@ -24,18 +33,26 @@ else
   fi
 fi
 
-dotnet publish ${c} ${r} --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj
+echo dotnet publish ${c} ${r} ${f} --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj
-dotnet publish ${c} ${r} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
+dotnet publish ${c} ${r} ${f} --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj
+echo dotnet publish ${c} ${r} ${f} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
+dotnet publish ${c} ${r} ${f} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
 exit $?
 
 :CMDSCRIPT
 IF "%~2" == "" (
-  SET c=-c Release
+  SET f=-f netcoreapp3.1
+) ELSE IF "%~2" == "core" (
+  SET f=-f netcoreapp3.1
 ) ELSE (
-  SET c=-c %~2
+  SET f=-f net5.0
 )
 
-dotnet restore --force-evaluate
+IF "%~3" == "" or "%~3" == "release" (
+  SET c=-c Release
+) ELSE (
+  SET c=-c Debug
+)
 
 IF "%~1" == "" (
   SET r=-r win-x64
@@ -43,5 +60,7 @@ IF "%~1" == "" (
   SET r=-r %~1-x64
 )
 
-dotnet publish %c% %r% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
+echo dotnet publish %c% %r% %f% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
-dotnet publish %c% %r% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
+dotnet publish %c% %r% %f% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
+echo dotnet publish %c% %r% %f% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
+dotnet publish %c% %r% %f% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj

azure-pipelines.yml

@@ -1,53 +1,63 @@
-name: 'Build'
+name: 'Build'
-
+
-trigger:
+trigger:
-- master
+- master
-
+
-variables:
+variables:
-  buildConfiguration: 'Release'
+  buildConfiguration: 'Release'
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-
+
-jobs:
+jobs:
-- job: BuildWindows
+- job: BuildWindows
-  displayName: 'Windows Server 2019'
+  displayName: 'Windows Server 2019'
-  pool:
+  pool:
-    vmImage: 'windows-latest'
+    vmImage: 'windows-latest'
-
+
-  steps:
+  steps:
-  - task: NuGetAuthenticate@0
+  - task: UseDotNet@2
-  - script: dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
+    displayName: 'Install .NET Core'
-    displayName: 'Restore NuGet Packages'
+    inputs:
-  - script: dotnet build -c $(buildConfiguration) --no-restore Projects/Server/Server.csproj
+      packageType: sdk
-    displayName: 'Build Server'
+      version: '3.1.401'
-  - script: dotnet build -c $(buildConfiguration) --no-restore Projects/UOContent/UOContent.csproj
+  - task: NuGetAuthenticate@0
-    displayName: 'Build UO Content'
+  - script: dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
-  - script: dotnet test --no-restore
+    displayName: 'Restore NuGet Packages'
-    displayName: 'Test'
+  - script: dotnet build -c $(buildConfiguration) -f netcoreapp3.1 --no-restore Projects/Server/Server.csproj
-
+    displayName: 'Build Server'
-- job: BuildLinux
+  - script: dotnet build -c $(buildConfiguration) -f netcoreapp3.1 --no-restore Projects/UOContent/UOContent.csproj
-  strategy:
+    displayName: 'Build UO Content'
-    matrix:
+  - script: dotnet test --no-restore -f netcoreapp3.1
-      'Debian 10':
+    displayName: 'Test'
-        containerImage: mcr.microsoft.com/dotnet/core/sdk:3.1-buster
+
-      'Ubuntu 18':
+- job: BuildLinux
-        containerImage: mcr.microsoft.com/dotnet/core/sdk:3.1-bionic
+  strategy:
-      # 'Ubuntu 20':
+    matrix:
-      #   containerImage: mcr.microsoft.com/dotnet/core/sdk:3.1-focal
+      'Debian 10':
-
+        containerImage: mcr.microsoft.com/dotnet/core/sdk:3.1-buster
-  displayName: Linux
+      'Ubuntu 18':
-
+        containerImage: mcr.microsoft.com/dotnet/core/sdk:3.1-bionic
-  pool:
+      'Ubuntu 20':
-    vmImage: 'ubuntu-latest'
+        containerImage: mcr.microsoft.com/dotnet/core/sdk:3.1-focal
-
+
-  container: $[ variables['containerImage'] ]
+  displayName: Linux
-
+
-  steps:
+  pool:
-  - task: NuGetAuthenticate@0
+    vmImage: 'ubuntu-latest'
-  - script: dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
+
-    displayName: 'Restore NuGet Packages'
+  container: $[ variables['containerImage'] ]
-  - script: dotnet build -c $(buildConfiguration) --no-restore Projects/Server/Server.csproj
+
-    displayName: 'Build Server'
+  steps:
-  - script: dotnet build -c $(buildConfiguration) --no-restore Projects/UOContent/UOContent.csproj
+  - task: UseDotNet@2
-    displayName: 'Build UO Content'
+    displayName: 'Install .NET Core'
-  - script: dotnet test --no-restore
+    inputs:
-    displayName: 'Test'
+      packageType: sdk
+      version: '3.1.401'
+  - task: NuGetAuthenticate@0
+  - script: dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
+    displayName: 'Restore NuGet Packages'
+  - script: dotnet build -c $(buildConfiguration) -f netcoreapp3.1 --no-restore Projects/Server/Server.csproj
+    displayName: 'Build Server'
+  - script: dotnet build -c $(buildConfiguration) -f netcoreapp3.1 --no-restore Projects/UOContent/UOContent.csproj
+    displayName: 'Build UO Content'
+  - script: dotnet test --no-restore -f netcoreapp3.1
+    displayName: 'Test'