From e6fffdde393e09ea3e1f99acbf183b0bc595039c Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 12 Oct 2020 20:49:19 -0400
Subject: [PATCH] Fix some versions XML navigation issues

---
 tests/Tgstation.Server.Tests/VersionsTest.cs | 6 +++---
 tools/ReleaseNotes/Program.cs                | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Tgstation.Server.Tests/VersionsTest.cs b/tests/Tgstation.Server.Tests/VersionsTest.cs
index 3216f5375d..bb9c7b4320 100644
--- a/tests/Tgstation.Server.Tests/VersionsTest.cs
+++ b/tests/Tgstation.Server.Tests/VersionsTest.cs
@@ -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));
 
diff --git a/tools/ReleaseNotes/Program.cs b/tools/ReleaseNotes/Program.cs
index c997c7cee8..c6be5059df 100644
--- a/tools/ReleaseNotes/Program.cs
+++ b/tools/ReleaseNotes/Program.cs
@@ -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)