Drop .NET Core 3.1 (#307)

- [X] Updates Zlib Bindings
- [X] Updates Argon2 Bindings
- [X] Drops .NET Core 3.1 support
- [X] Updates CI/CD

Bumps release version
Updates documentation

.github/workflows/build-test.yml

@@ -22,12 +22,12 @@ jobs:
     - name: Setup .NET 5
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-rc.2.20479.15
+        dotnet-version: 5.0.100
     - name: Restore NuGet Packages
       run: dotnet restore --force-evaluate
     - name: Build Server
-      run: dotnet build -c Release -f net5.0 --no-restore Projects/Server/Server.csproj
+      run: dotnet build -c Release --no-restore Projects/Server/Server.csproj
     - name: Build UO Content
-      run: dotnet build -c Release -f net5.0 --no-restore Projects/UOContent/UOContent.csproj
+      run: dotnet build -c Release --no-restore Projects/UOContent/UOContent.csproj
     - name: Test
-      run: dotnet test --no-restore -f net5.0
+      run: dotnet test --no-restore

.github/workflows/create-release.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET 5
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-rc.2.20479.15
+        dotnet-version: 5.0.100
     - uses: dotnet/nbgv@master
       id: nbgv
     - name: Create Release
@@ -53,7 +53,7 @@ jobs:
     - name: Setup .NET 5
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-rc.2.20479.15
+        dotnet-version: 5.0.100-
     - uses: dotnet/nbgv@master
       id: nbgv
     - name: Load Release URL File from release job

Directory.Build.props

@@ -4,7 +4,7 @@
         <Authors>Kamron Batman</Authors>
         <Company>ModernUO</Company>
         <Copyright>2019-2020</Copyright>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFramework>net5.0</TargetFramework>
         <Platforms>x64</Platforms>
         <PlatformTarget>x64</PlatformTarget>
         <LangVersion>9</LangVersion>

Projects/Server.Tests/Server.Tests.csproj

@@ -7,7 +7,7 @@
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
         <PackageReference Include="coverlet.collector" Version="1.3.0" />
-        <PackageReference Include="Zlib.Bindings" Version="1.3.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.4.0" />
         <ProjectReference Include="..\Server\Server.csproj" />
     </ItemGroup>
 </Project>

Projects/Server/Server.csproj

@@ -27,10 +27,10 @@
     </Target>
     <ItemGroup>
         <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
-          <PrivateAssets>all</PrivateAssets>
+            <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Zlib.Bindings" Version="1.3.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.4.0" />
     </ItemGroup>
     <ItemGroup Condition="'$(Configuration)'=='Analyze'">
         <AdditionalFiles Include="..\..\stylecop.json" />

Projects/UOContent/UOContent.csproj

@@ -30,11 +30,11 @@
         </ProjectReference>
         <PackageReference Include="MailKit" Version="2.8.0" />
         <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
-          <PrivateAssets>all</PrivateAssets>
+            <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Zlib.Bindings" Version="1.3.0" />
+        <PackageReference Include="Zlib.Bindings" Version="1.4.0" />
-        <PackageReference Include="Argon2.Bindings" Version="1.7.0" />
+        <PackageReference Include="Argon2.Bindings" Version="1.8.0" />
     </ItemGroup>
     <ItemGroup Condition="'$(Configuration)'=='Analyze'">
         <AdditionalFiles Include="..\..\stylecop.json" />

README.md

@@ -21,22 +21,19 @@ ModernUO [![Discord](https://img.shields.io/discord/751317910504603701?logo=disc
 [![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)
 
-## Goals
+## Building the server
-- See [Goals](./GOALS.md)
-
-## Publishing a build
 #### Requirements
 - [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0)
 
 #### Publishing Builds
 - Using terminal or powershell: `./publish.cmd [release|debug (default: release)] [os]`
-  - Supported `os`:
+  - `os` - [Supported operating systems](https://github.com/dotnet/core/blob/master/release-notes/5.0/5.0-supported-os.md)
-    - `win` for Windows 8/10/2019
+    - `win` - Windows 8.1/10/2016/2019
-    - `osx` for MacOS
+    - `osx` - MacOS
-    - `ubuntu.16.04`, `ubuntu.18.04` `ubuntu.20.04` for Ubuntu LTS
+    - `ubuntu.16.04`, `ubuntu.18.04` `ubuntu.20.04` - Ubuntu LTS
-    - `debian.9`, `debian.10` for Debian
+    - `debian.9`, `debian.10` - Debian
-    - `centos.7`, `centos.8` for CentOS
+    - `centos.7`, `centos.8` - CentOS
-    - If blank, the host operating system is used
+    - If blank, the operating system running the build is used
 
 ## Deploying / Running Server
 - Follow the [publish](https://github.com/modernuo/ModernUO#publishing-a-build) instructions

azure-pipelines.yml

@@ -4,7 +4,6 @@ trigger:
 - master
 
 variables:
-  buildConfiguration: 'Release'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1
 
@@ -19,15 +18,15 @@ jobs:
     displayName: 'Install .NET 5'
     inputs:
       packageType: sdk
-      version: '5.0.100-rc.2.20479.15'
+      version: '5.0.100'
   - task: NuGetAuthenticate@0
   - script: dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
     displayName: 'Restore NuGet Packages'
-  - script: dotnet build -r win-x64 -c $(buildConfiguration) -f net5.0 --no-restore Projects/Server/Server.csproj
+  - script: dotnet build -r win-x64 -c Release --no-restore Projects/Server/Server.csproj
     displayName: 'Build Server'
-  - script: dotnet build -r win-x64 -c $(buildConfiguration) -f net5.0 --no-restore Projects/UOContent/UOContent.csproj
+  - script: dotnet build -r win-x64 -c Release --no-restore Projects/UOContent/UOContent.csproj
     displayName: 'Build UO Content'
-  - script: dotnet test --no-restore -f net5.0
+  - script: dotnet test --no-restore
     displayName: 'Test'
 
 - job: BuildLinux
@@ -70,13 +69,13 @@ jobs:
     displayName: 'Install .NET 5'
     inputs:
       packageType: sdk
-      version: '5.0.100-rc.2.20479.15'
+      version: '5.0.100'
   - task: NuGetAuthenticate@0
   - script: dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
     displayName: 'Restore NuGet Packages'
-  - script: dotnet build -r $(os) -c $(buildConfiguration) -f net5.0 --no-restore Projects/Server/Server.csproj
+  - script: dotnet build -r $(os) -c Release --no-restore Projects/Server/Server.csproj
     displayName: 'Build Server'
-  - script: dotnet build -r $(os) -c $(buildConfiguration) -f net5.0 --no-restore Projects/UOContent/UOContent.csproj
+  - script: dotnet build -r $(os) -c Release --no-restore Projects/UOContent/UOContent.csproj
     displayName: 'Build UO Content'
-  - script: dotnet test --no-restore -f net5.0
+  - script: dotnet test --no-restore
     displayName: 'Test'

publish.cmd

@@ -30,10 +30,10 @@ fi
 echo dotnet restore --force-evaluate
 dotnet restore --force-evaluate
 
-echo dotnet publish ${config} ${os} -f net5.0 --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj
+echo dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj
-dotnet publish ${config} ${os} -f net5.0 --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj
+dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj
-echo dotnet publish ${config} ${os} -f net5.0 --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
+echo dotnet publish ${config} ${os} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
-dotnet publish ${config} ${os} -f net5.0 --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
 exit $?
 
 :CMDSCRIPT
@@ -53,7 +53,7 @@ IF "%~2" == "" (
 echo dotnet restore --force-evaluate
 dotnet restore --force-evaluate
 
-echo dotnet publish %config% %os% -f net5.0 --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
+echo dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
-dotnet publish %config% %os% -f net5.0 --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
+dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
-echo dotnet publish %config% %os% -f net5.0 --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
+echo dotnet publish %config% %os% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
-dotnet publish %config% %os% -f net5.0 --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