cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 23:17:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Jordan Brown
2022-09-20 12:11:13 -04:00
parent e645ecdde9 9939c3e129
commit 1ef19a4052
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-suite.yml
+2 -2
View File
@@ -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
src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
+2 -2
View File
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../../build/Version.props" />
<PropertyGroup>
@@ -14,7 +14,7 @@
<PackageIcon>tgs.png</PackageIcon>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
<Copyright>2018</Copyright>
<Copyright>2018-2022</Copyright>
<PackageTags>json web api tgstation-server tgstation ss13 byond</PackageTags>
<PackageReleaseNotes>See https://github.com/tgstation/tgstation-server/releases/tag/api-v$(TgsApiVersion)</PackageReleaseNotes>
<IncludeSymbols>true</IncludeSymbols>
src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+1 -1
View File
@@ -14,7 +14,7 @@
<PackageIcon>tgs.png</PackageIcon>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
<Copyright>2018</Copyright>
<Copyright>2018-2022</Copyright>
<PackageTags>json web api tgstation-server tgstation ss13 byond client</PackageTags>
<PackageReleaseNotes>Added OAuth login methods to IServerClientFactory.</PackageReleaseNotes>
<IncludeSymbols>true</IncludeSymbols>
tools/ReleaseNotes/Program.cs
+2 -2
View File
@@ -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;
}