Merge branch 'dev' into NiceExperiment

.github/workflows/ci-suite.yml

@@ -115,6 +115,9 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v1
+      
+    - name: Upgrade NPM
+      run: sudo npm install -g npm
 
     - name: Build Docker Image
       run: docker build . -f build/Dockerfile
@@ -126,11 +129,6 @@ jobs:
         configuration: [ 'Debug', 'Release' ]
     runs-on: ubuntu-latest
     steps:
-    - name: Install Node 12.X
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12.x
-
     - name: Setup dotnet
       uses: actions/setup-dotnet@v1
       with:
@@ -138,6 +136,9 @@ jobs:
 
     - name: Checkout
       uses: actions/checkout@v1
+      
+    - name: Upgrade NPM
+      run: sudo npm install -g npm
 
     - name: Build
       run: dotnet build -c ${{ matrix.configuration }}NoService
@@ -165,6 +166,9 @@ jobs:
 
     - name: Checkout
       uses: actions/checkout@v1
+      
+    - name: Upgrade NPM
+      run: npm install -g npm
 
     - name: Clean package cache as a temporary workaround for actions/setup-dotnet#155
       run: dotnet clean && dotnet nuget locals all --clear
@@ -197,6 +201,9 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ env.TGS_DOTNET_VERSION }}
+        
+    - name: Upgrade NPM
+      run: npm install -g npm
 
     - name: Set General__UseBasicWatchdog
       if: ${{ matrix.watchdog-type == 'Basic' }}
@@ -321,6 +328,9 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: 12.x
+        
+    - name: Upgrade NPM
+      run: npm install -g npm
 
     - name: Setup dotnet
       uses: actions/setup-dotnet@v1

.github/workflows/codeql-analysis.yml

@@ -21,6 +21,9 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: 12.x
+        
+    - name: Upgrade NPM
+      run: npm install -g npm
 
     - name: Checkout repository
       uses: actions/checkout@v2

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>2.3.0</TgsControlPanelVersion>
+    <TgsControlPanelVersion>2.4.0</TgsControlPanelVersion>
   </PropertyGroup>
 </Project>

build/Dockerfile

@@ -4,8 +4,11 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
 # replace shell with bash so we can source files
 RUN curl --silent -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.2/install.sh | sh
 
-ENV NODE_VERSION 10.13.0
+ENV NODE_VERSION 14.18.1
+
 ENV NVM_DIR /root/.nvm
+ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
+ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 
 RUN . $NVM_DIR/nvm.sh \
     && nvm install $NODE_VERSION \
@@ -13,10 +16,8 @@ RUN . $NVM_DIR/nvm.sh \
 	&& apt-get update \
 	&& apt-get install -y \
 		dos2unix \
-	&& rm -rf /var/lib/apt/lists/*
-
-ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
-ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
+	&& rm -rf /var/lib/apt/lists/* \
+	&& npm install -g npm
 
 # Build web control panel
 WORKDIR /repo/build

build/Version.props

@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>4.15.5</TgsCoreVersion>
+    <TgsCoreVersion>4.15.6</TgsCoreVersion>
     <TgsConfigVersion>4.0.0</TgsConfigVersion>
     <TgsApiVersion>9.3.0</TgsApiVersion>
     <TgsApiLibraryVersion>9.3.1</TgsApiLibraryVersion>

src/Tgstation.Server.Host/Tgstation.Server.Host.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <Import Project="../../build/Version.props" />
 
   <PropertyGroup>
@@ -68,7 +68,7 @@
     <PackageReference Include="Cyberboss.SmartIrc4net.Standard" Version="0.4.6" />
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="1.5.3" />
     <PackageReference Include="GitLabApiClient" Version="1.8.0" />
-    <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0034" />
+    <PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0119" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.18" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.18" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">