From ef2c89fb1b37db0a1f976aac34cbbe7a89ca6c4e Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 20 Sep 2022 12:07:28 -0400 Subject: [PATCH 1/3] More ReleaseNotes fixes --- tools/ReleaseNotes/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ReleaseNotes/Program.cs b/tools/ReleaseNotes/Program.cs index 9e03e75193..ec094ca256 100644 --- a/tools/ReleaseNotes/Program.cs +++ b/tools/ReleaseNotes/Program.cs @@ -210,7 +210,7 @@ namespace ReleaseNotes continue; } - if (currentReleaseVersion.Major == version.Major && (highestReleaseVersion == null || currentReleaseVersion > highestReleaseVersion) && version != currentReleaseVersion) + if (currentReleaseVersion.Major > 3 && (highestReleaseVersion == null || currentReleaseVersion > highestReleaseVersion) && version != currentReleaseVersion) { highestReleaseVersion = currentReleaseVersion; highestRelease = I; @@ -219,7 +219,7 @@ namespace ReleaseNotes if (highestReleaseVersion == null) { - Console.WriteLine("Unable to determine highest release version for major version " + version.Major + "!"); + Console.WriteLine("Unable to determine highest release version!"); return 6; } From f26c151224ce99ebb2e258d60d8650ccb070744e Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 20 Sep 2022 12:10:24 -0400 Subject: [PATCH 2/3] Update Nuget copyrights --- src/Tgstation.Server.Api/Tgstation.Server.Api.csproj | 4 ++-- src/Tgstation.Server.Client/Tgstation.Server.Client.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj index 50dc84135f..a16a93ebed 100644 --- a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj +++ b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj @@ -1,4 +1,4 @@ - + @@ -14,7 +14,7 @@ tgs.png Git https://github.com/tgstation/tgstation-server - 2018 + 2018-2022 json web api tgstation-server tgstation ss13 byond See https://github.com/tgstation/tgstation-server/releases/tag/api-v$(TgsApiVersion) true diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj index a401b13200..b8a2277360 100644 --- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj +++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj @@ -14,7 +14,7 @@ tgs.png Git https://github.com/tgstation/tgstation-server - 2018 + 2018-2022 json web api tgstation-server tgstation ss13 byond client Added OAuth login methods to IServerClientFactory. true From 9939c3e129a9edabcf9e40df9a276c1d973175d3 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 20 Sep 2022 12:10:43 -0400 Subject: [PATCH 3/3] Switch to fork due to https://github.com/brandedoutcast/publish-nuget/issues/58 --- .github/workflows/ci-suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index 8dd7ccafb4..850ebd395a 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -659,7 +659,7 @@ jobs: uses: actions/checkout@v3 - name: Publish API to NuGet - uses: brandedoutcast/publish-nuget@v2 + uses: alirezanet/publish-nuget@v3.0.0 with: PROJECT_FILE_PATH: src/Tgstation.Server.Api/Tgstation.Server.Api.csproj TAG_COMMIT: false @@ -667,7 +667,7 @@ jobs: NUGET_KEY: ${{ secrets.NUGET_API_KEY }} - name: Publish Client to NuGet - uses: brandedoutcast/publish-nuget@v2 + uses: alirezanet/publish-nuget@v3.0.0 with: PROJECT_FILE_PATH: src/Tgstation.Server.Client/Tgstation.Server.Client.csproj TAG_COMMIT: false