From b28571bac300844336a2163e4560ffd22ea38d8f Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 9 Aug 2023 08:10:25 -0400
Subject: [PATCH 1/3] Dependency updates

- Add missing comments for some packages.
- Pin Moq due to bullshit e-mail scraping: https://github.com/moq/moq/issues/1374
---
 build/ControlPanelVersion.props                |  2 +-
 build/TestCommon.props                         | 10 ++++++++--
 build/Version.props                            |  4 ++--
 .../.config/dotnet-tools.json                  |  2 +-
 .../Tgstation.Server.Host.csproj               | 18 +++++++++---------
 tools/Tgstation.Server.ReleaseNotes/Program.cs |  1 -
 .../Tgstation.Server.ReleaseNotes.csproj       |  4 +++-
 7 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/build/ControlPanelVersion.props b/build/ControlPanelVersion.props
index e068787bba..fbfe1438e0 100644
--- a/build/ControlPanelVersion.props
+++ b/build/ControlPanelVersion.props
@@ -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>
diff --git a/build/TestCommon.props b/build/TestCommon.props
index e0485b3a76..fc25d230d0 100644
--- a/build/TestCommon.props
+++ b/build/TestCommon.props
@@ -2,17 +2,23 @@
   <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" />
+    <!-- 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>
 
diff --git a/build/Version.props b/build/Version.props
index 9a9b414cfe..7fbb04ccd2 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -17,9 +17,9 @@
     <TgsNugetNetFramework>netstandard2.0</TgsNugetNetFramework>
     <TgsNetMajorVersion>6</TgsNetMajorVersion>
     <!-- Update this frequently with dotnet runtime patches. MAJOR MUST MATCH ABOVE! -->
-    <TgsDotnetRedistUrl>https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.20/dotnet-hosting-6.0.20-win.exe</TgsDotnetRedistUrl>
+    <TgsDotnetRedistUrl>https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.21/dotnet-hosting-6.0.21-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>
diff --git a/src/Tgstation.Server.Host/.config/dotnet-tools.json b/src/Tgstation.Server.Host/.config/dotnet-tools.json
index eef9b429ca..236008e3ee 100644
--- a/src/Tgstation.Server.Host/.config/dotnet-tools.json
+++ b/src/Tgstation.Server.Host/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "7.0.9",
+      "version": "7.0.10",
       "commands": [
         "dotnet-ef"
       ]
diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index a09479058f..7808673608 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -65,25 +65,25 @@
     <!-- 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 -->
     <PackageReference Include="LibGit2Sharp" Version="0.27.2" />
     <!-- Usage: JWT injection into HTTP pipeline -->
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.20" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <!-- Usage: Support ""legacy"" Newotonsoft.Json in HTTP pipeline. The rest of our codebase uses Newtonsoft. -->
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.20" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.21" />
     <!-- 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="7.0.0" />
     <!-- 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="7.0.2" />
     <!-- Usage: .DeleteAsync() support for IQueryable<T>s -->
diff --git a/tools/Tgstation.Server.ReleaseNotes/Program.cs b/tools/Tgstation.Server.ReleaseNotes/Program.cs
index 10b207ad9a..ecf049b5f2 100644
--- a/tools/Tgstation.Server.ReleaseNotes/Program.cs
+++ b/tools/Tgstation.Server.ReleaseNotes/Program.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using System.Xml.Linq;
 
 using Octokit;
-using Octokit.GraphQL;
 
 namespace Tgstation.Server.ReleaseNotes
 {
diff --git a/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj b/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
index 4370c105a1..d95f0139e3 100644
--- a/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+++ b/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
@@ -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>
 

From 024ab92d25265d1610367930bd88d45d76c6fdeb Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 9 Aug 2023 08:27:21 -0400
Subject: [PATCH 2/3] Add missing `Usage` comment for Moq

---
 build/TestCommon.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/TestCommon.props b/build/TestCommon.props
index fc25d230d0..4e1b3add13 100644
--- a/build/TestCommon.props
+++ b/build/TestCommon.props
@@ -14,6 +14,7 @@
     </PackageReference>
     <!-- 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 -->

From e6522b0486f3f680b7fb917f889361ba490c75f5 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:32:46 -0400
Subject: [PATCH 3/3] Restore a `using` that was accidentally removed

---
 tools/Tgstation.Server.ReleaseNotes/Program.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/Tgstation.Server.ReleaseNotes/Program.cs b/tools/Tgstation.Server.ReleaseNotes/Program.cs
index ecf049b5f2..10b207ad9a 100644
--- a/tools/Tgstation.Server.ReleaseNotes/Program.cs
+++ b/tools/Tgstation.Server.ReleaseNotes/Program.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.Xml.Linq;
 
 using Octokit;
+using Octokit.GraphQL;
 
 namespace Tgstation.Server.ReleaseNotes
 {