From 6532133f0761f3aca43619f03c457ac71278e2d2 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 7 Nov 2020 10:47:43 -0500 Subject: [PATCH] Actually debug the ReleaseNotes [TGSDeploy] --- .github/workflows/ci-suite.yml | 2 +- tools/ReleaseNotes/Program.cs | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index 0261024ac0..41b8340764 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -742,7 +742,7 @@ jobs: &"C:/Program Files/7-Zip/7z.exe" a ServerUpdatePackage.zip ./ServerUpdatePackage/* -tzip - name: Generate Release Notes - run: dotnet run -c Release -p tools/ReleaseNotes ${{ env.TGS_VERSION }} build/Version.props + run: dotnet run -c Release -p tools/ReleaseNotes ${{ env.TGS_VERSION }} - name: Create GitHub Release uses: actions/create-release@v1 diff --git a/tools/ReleaseNotes/Program.cs b/tools/ReleaseNotes/Program.cs index 91c5673eef..28cafa17a7 100644 --- a/tools/ReleaseNotes/Program.cs +++ b/tools/ReleaseNotes/Program.cs @@ -34,14 +34,6 @@ namespace ReleaseNotes var doNotCloseMilestone = args.Length > 1 && args[1].ToUpperInvariant() == "--NO-CLOSE"; - var propsPath = "build/Version.props"; - if (args.Length > 1 && !doNotCloseMilestone) - propsPath = args[1]; - - var controlPanelPropsPath = "build/ControlPanelVersion.props"; - if (args.Length > 2 && !doNotCloseMilestone) - propsPath = args[2]; - const string ReleaseNotesEnvVar = "TGS4_RELEASE_NOTES_TOKEN"; var githubToken = Environment.GetEnvironmentVariable(ReleaseNotesEnvVar); if (String.IsNullOrWhiteSpace(githubToken) && !doNotCloseMilestone) @@ -241,15 +233,18 @@ namespace ReleaseNotes switch (releasingSuite) { case 4: - var doc = XDocument.Load(propsPath); + const string PropsPath = "build/Version.props"; + const string ControlPanelPropsPath = "build/ControlPanelVersion.props"; + + var doc = XDocument.Load(PropsPath); var project = doc.Root; var xmlNamespace = project.GetDefaultNamespace(); 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(x => x.Name == controlPanelXmlNamespace + "PropertyGroup"); + var doc2 = XDocument.Load(ControlPanelPropsPath); + var project2 = doc2.Root; + var controlPanelXmlNamespace = project2.GetDefaultNamespace(); + var controlPanelVersionsPropertyGroup = project2.Elements().First(x => x.Name == controlPanelXmlNamespace + "PropertyGroup"); var coreVersion = Version.Parse(versionsPropertyGroup.Element(xmlNamespace + "TgsCoreVersion").Value); if(coreVersion != version)