Return DMAPI version in ServerInformation, version bumps across the board

This commit is contained in:
Jordan Brown
2020-05-18 12:33:20 -04:00
parent becb723b31
commit 3d70c346d2
3 changed files with 11 additions and 4 deletions
+4 -4
View File
@@ -2,10 +2,10 @@
<PropertyGroup>
<!-- This is the authorative version list -->
<!-- Integration tests will ensure they match across the board -->
<TgsCoreVersion>4.2.2</TgsCoreVersion>
<TgsApiVersion>6.3.0</TgsApiVersion>
<TgsClientVersion>6.2.0</TgsClientVersion>
<TgsDmapiVersion>5.1.1</TgsDmapiVersion>
<TgsCoreVersion>4.2.3</TgsCoreVersion>
<TgsApiVersion>6.4.0</TgsApiVersion>
<TgsClientVersion>6.3.0</TgsClientVersion>
<TgsDmapiVersion>5.2.0</TgsDmapiVersion>
<TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
<TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>
</PropertyGroup>
@@ -16,5 +16,10 @@ namespace Tgstation.Server.Api.Models
/// The <see cref="Api"/> version of the host
/// </summary>
public Version ApiVersion { get; set; }
/// <summary>
/// The DMAPI version of the host.
/// </summary>
public Version DMApiVersion { get; set; }
}
}
@@ -12,6 +12,7 @@ using System.Net.Mime;
using System.Threading;
using System.Threading.Tasks;
using Tgstation.Server.Api;
using Tgstation.Server.Host.Components.Interop;
using Tgstation.Server.Host.Configuration;
using Tgstation.Server.Host.Core;
using Tgstation.Server.Host.Database;
@@ -124,6 +125,7 @@ namespace Tgstation.Server.Host.Controllers
{
Version = assemblyInformationProvider.Version,
ApiVersion = ApiHeaders.Version,
DMApiVersion = DMApiConstants.Version,
MinimumPasswordLength = generalConfiguration.MinimumPasswordLength,
InstanceLimit = generalConfiguration.InstanceLimit,
UserLimit = generalConfiguration.UserLimit,