cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-07-18 11:34:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some versions XML navigation issues

Browse Source
This commit is contained in:
Jordan Brown
2020-10-12 20:49:19 -04:00
parent 3e9b75a48f
commit e6fffdde39
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/VersionsTest.cs
+3 -3
View File
@@ -27,7 +27,7 @@ namespace Tgstation.Server.Tests
var doc = XDocument.Load("../../../../../build/Version.props");
var project = doc.Root;
xmlNamespace = project.GetDefaultNamespace();
versionsPropertyGroup = project.Elements().First();
versionsPropertyGroup = project.Elements().First(x => x.Name == xmlNamespace + "PropertyGroup");
Assert.IsNotNull(versionsPropertyGroup);
}
@@ -106,8 +106,8 @@ namespace Tgstation.Server.Tests
var doc = XDocument.Load("../../../../../build/ControlPanelVersion.props");
var project = doc.Root;
var controlPanelXmlNamespace = project.GetDefaultNamespace();
var controlPanelVersionsPropertyGroup = project.Elements().First();
var versionString = controlPanelVersionsPropertyGroup.Element(xmlNamespace + "TgsControlPanelVersion").Value;
var controlPanelVersionsPropertyGroup = project.Elements().First(x => x.Name == controlPanelXmlNamespace + "PropertyGroup");
var versionString = controlPanelVersionsPropertyGroup.Element(controlPanelXmlNamespace + "TgsControlPanelVersion").Value;
Assert.IsNotNull(versionString);
Assert.IsTrue(Version.TryParse(versionString, out var expected));
tools/ReleaseNotes/Program.cs
+3 -3
View File
@@ -1,4 +1,4 @@
using Octokit;
using Octokit;
using System;
using System.Collections.Generic;
using System.IO;
@@ -244,12 +244,12 @@ namespace ReleaseNotes
var doc = XDocument.Load(propsPath);
var project = doc.Root;
var xmlNamespace = project.GetDefaultNamespace();
var versionsPropertyGroup = project.Elements().First();
var versionsPropertyGroup = project.Elements().First(x => x.Name == xmlNamespace + "PropertyGroup");
var doc2 = XDocument.Load(controlPanelPropsPath);
var project2 = doc.Root;
var controlPanelXmlNamespace = project.GetDefaultNamespace();
var controlPanelVersionsPropertyGroup = project.Elements().First();
var controlPanelVersionsPropertyGroup = project.Elements().First(x => x.Name == controlPanelXmlNamespace + "PropertyGroup");
var coreVersion = Version.Parse(versionsPropertyGroup.Element(xmlNamespace + "TgsCoreVersion").Value);
if(coreVersion != version)