cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 14:06:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into InstallerInterfaceDLLErrors

Browse Source
This commit is contained in:
Jordan Brown
2017-10-30 11:00:55 -04:00
committed by GitHub
parent 01e5d8370c 029aa161e6
commit c78eb7d2a3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGInstallerWrapper/Main.cs
+3 -1
View File
@@ -18,7 +18,7 @@ namespace TGInstallerWrapper
const string InterfaceDLL = "TGServiceInterface.dll";
const string InterfaceNamespace = "TGServiceInterface";
const string InterfaceComponentsNamespace = InterfaceNamespace + ".Components";
const string InterfaceClass = InterfaceNamespace + ".Server";
const string InterfaceClass = InterfaceNamespace + ".Interface";
const string InterfaceServiceInterface = InterfaceComponentsNamespace + ".ITGSService"; //fuck this typo
const string InterfaceClassVerifyConnection = "VerifyConnection";
const string InterfaceClassGetComponent = "GetComponent";
@@ -95,6 +95,8 @@ namespace TGInstallerWrapper
try
{
VersionLabel.Text = (string)Version.Invoke(GetComponentITGSService.Invoke(null, null), null);
if (VersionLabel.Text.Contains("v3.0")) //OH GOD!!!!
MessageBox.Show("Warning! Upgrading from version 3.0 may trigger a bug that can delete /config and /data. IT IS STRONGLY RECCOMMENDED THAT YOU BACKUP THESE FOLDERS BEFORE UPDATING!");
}
catch
{
TGServiceInterface/Interface.cs
+1 -1
View File
@@ -141,7 +141,7 @@ namespace TGServiceInterface
var splits = Interface.GetComponent<ITGSService>().Version().Split(' ');
var theirs = new Version(splits[splits.Length - 1].Substring(1));
var ours = new Version(FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion);
if(theirs != ours)
if(theirs.Major != ours.Major || theirs.Minor != ours.Minor || theirs.Revision != ours.Revision) //don't care about the patch level
{
errorMessage = String.Format("Version mismatch between interface version ({0}) and service version ({1}). Some functionality may crash this program.", ours, theirs);
return true;