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

Merge branch 'dev' into V6

Browse Source
This commit is contained in:
Jordan Dominion
2023-08-09 22:24:45 -04:00
parent 7959b49aed 48b7e047c9
commit fa60174cb3
6 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/ControlPanelVersion.props
+1 -1
View File
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- This is in it's own file to help incremental building, changing it causes a complete rebuild of the web panel -->
<TgsControlPanelVersion>4.22.0</TgsControlPanelVersion>
<TgsControlPanelVersion>4.23.1</TgsControlPanelVersion>
</PropertyGroup>
</Project>
build/TestCommon.props
+9 -2
View File
@@ -2,17 +2,24 @@
<Import Project="Common.props" />
<ItemGroup>
<!-- Usage: Code coverage collection -->
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Usage: Logging specific for GitHub actions -->
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Moq" Version="4.18.4" />
<!-- Usage: Hard to say what exactly this is for, but not including it removes the test icon and breaks vstest.console.exe for some reason -->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<!-- Usage: Dependency mocking for tests -->
<!-- Pinned: Moq is OVER https://github.com/moq/moq/issues/1372 -->
<PackageReference Include="Moq" Version="4.20.2" />
<!-- Usage: MSTest execution -->
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<!-- Usage: MSTest asserts etc... -->
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
</ItemGroup>
build/Version.props
+1 -1
View File
@@ -19,7 +19,7 @@
<!-- Update this frequently with dotnet runtime patches. MAJOR MUST MATCH ABOVE! -->
<TgsDotnetRedistUrl>https://download.visualstudio.microsoft.com/download/pr/e5db48f5-99c6-42ca-804a-85b89ae09671/b5594181b347a9a77246e3645916bd0e/dotnet-hosting-8.0.0-preview.6.23329.11-win.exe</TgsDotnetRedistUrl>
<TgsMariaDBRedistVersion>11.0.2</TgsMariaDBRedistVersion>
<!-- The two versions must match above, this is referenced by scripts so we can't use an MSBuild property reference -->
<!-- The two versions must match above, this is referenced by XML readers in scripts so we can't use an MSBuild property reference -->
<TgsMariaDBRedistUrl>https://ftp.osuosl.org/pub/mariadb/mariadb-11.0.2/winx64-packages/mariadb-11.0.2-winx64.msi</TgsMariaDBRedistUrl>
</PropertyGroup>
</Project>
src/Tgstation.Server.Host/.config/dotnet-tools.json
+1 -1
View File
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "7.0.9",
"version": "7.0.10",
"commands": [
"dotnet-ef"
]
src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+7 -7
View File
@@ -65,7 +65,7 @@
<!-- Usage: IRC interop -->
<PackageReference Include="Cyberboss.SmartIrc4net.Standard" Version="0.4.7" />
<!-- Usage: Text formatter for Elasticsearch logging plugin -->
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.0" />
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
<!-- Usage: GitLab interop -->
<PackageReference Include="GitLabApiClient" Version="1.8.0" />
<!-- Usage: git interop -->
@@ -75,15 +75,15 @@
<!-- Usage: Support ""legacy"" Newotonsoft.Json in HTTP pipeline. The rest of our codebase uses Newtonsoft. -->
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-preview.6.23329.11" />
<!-- Usage: Database ORM -->
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<!-- Usage: Automatic migration generation using command line -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.10">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Usage: Sqlite ORM plugin -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
<!-- Usage: MSSQL ORM plugin -->
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
<!-- Usage: POSIX support for syscalls, signals, and symlinks -->
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<!-- Usage: YAML config plugin -->
@@ -91,7 +91,7 @@
<!-- Usage: PostgresSQL ORM plugin -->
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<!-- Usage: GitHub.com interop -->
<PackageReference Include="Octokit" Version="7.0.1" />
<PackageReference Include="Octokit" Version="7.1.0" />
<!-- Usage: MYSQL/MariaDB ORM plugin -->
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
<!-- Usage: Discord interop -->
@@ -113,7 +113,7 @@
<!-- Usage: Windows authentication plugin allowing searching for users by name -->
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.0-preview.6.23329.7" />
<!-- Usage: JWT plugin needed to undo some Microsoft meddling in the HTTP pipeline -->
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.32.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.32.1" />
<!-- Usage: Identifying owning user of Windows Process objects -->
<PackageReference Include="System.Management" Version="8.0.0-preview.6.23329.7" />
<!-- Usage: Temporary resolution to compatibility issues with EFCore 7 and .NET 8 -->
tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+3 -1
View File
@@ -7,7 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="octokit" Version="7.0.1" />
<!-- Usage: GitHub.com general interop -->
<PackageReference Include="Octokit" Version="7.1.0" />
<!-- Usage: GitHub Discussions interop -->
<PackageReference Include="Octokit.GraphQL" Version="0.2.1-beta" />
</ItemGroup>