diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 87f48f09a1..d6df684904 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -1515,7 +1515,9 @@ jobs:
run: |
[XML]$versionXML = Get-Content build/Version.props
$tgsVersion = $versionXML.Project.PropertyGroup.TgsCoreVersion
+ $mariaDBVerison = $versionXML.Project.PropertyGroup.TgsMariaDBRedistVersion
echo "TGS_VERSION=$tgsVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+ echo "MARIADB_VERSION=$mariaDBVerison" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
- name: Upload .msi
uses: actions/upload-artifact@v3
@@ -1657,6 +1659,16 @@ jobs:
asset_name: tgstation-server-v${{ env.TGS_VERSION }}.debian.packaging.tar.xz
asset_content_type: application/x-tar
+ - name: Upload MariaDB .msi
+ uses: actions/upload-release-asset@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }}
+ with:
+ upload_url: ${{ steps.create_release.outputs.upload_url }}
+ asset_path: ./build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/bin/Release/mariadb.msi
+ asset_name: mariadb-${{ env.MARIADB_VERSION }}-winx64.msi
+ asset_content_type: application/octet-stream
+
- name: Upload Installer .exe
uses: actions/upload-release-asset@v1
env:
diff --git a/build/Dockerfile b/build/Dockerfile
index 8762089d0a..5c7c7bd05a 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -16,11 +16,7 @@ RUN . $NVM_DIR/nvm.sh \
&& apt-get update \
&& apt-get install -y \
dos2unix \
- && rm -rf /var/lib/apt/lists/* \
- && npm install -g npm
-
-#You may wonder why this needs to be in a seperate step. I don't know... It just works(tm)
-RUN npm install -g yarn
+ && rm -rf /var/lib/apt/lists/*
# Build web control panel
WORKDIR /repo/build
@@ -55,7 +51,7 @@ RUN dotnet restore -nowarn:MSB3202,nu1503 -p:RestoreUseSkipNonexistentTargets=fa
COPY . .
#run dos2unix on tgs.docker.sh so we can build without issue on windows
-RUN dos2unix build/tgs.docker.sh
+RUN dos2unix build/tgs.docker.sh build/RemoveUnsupportedRuntimes.sh
WORKDIR /repo/src/Tgstation.Server.Host.Console
RUN dotnet publish -c Release -o /app \
diff --git a/build/Version.props b/build/Version.props
index a0e852bce2..0f6cb5b904 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -18,8 +18,7 @@
6
https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.24/dotnet-hosting-6.0.24-win.exe
- 10.11.5
-
- https://atl.mirrors.knownhost.com/mariadb//mariadb-10.11.5/winx64-packages/mariadb-10.11.5-winx64.msi
+ 10.11.6
+ 1.22.19
diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj
index 5f7032e3e5..827b40f156 100644
--- a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj
+++ b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj
@@ -1,7 +1,7 @@
- ProductVersion=$(TgsCoreVersion);NetMajorVersion=$(TgsNetMajorVersion);DotnetRedistUrl=$(TgsDotnetRedistUrl);MariaDBRedistUrl=$(TgsMariaDBRedistUrl)
+ ProductVersion=$(TgsCoreVersion);NetMajorVersion=$(TgsNetMajorVersion);DotnetRedistUrl=$(TgsDotnetRedistUrl);MariaDBRedistUrl=https://github.com/tgstation/tgstation-server/releases/download/tgstation-server-v$(TgsCoreVersion)/mariadb-$(TgsMariaDBRedistVersion)-winx64.msi
Bundle
x86
tgstation-server-installer
diff --git a/build/package/winget/prepare_installer_input_artifacts.ps1 b/build/package/winget/prepare_installer_input_artifacts.ps1
index b2a5c6b4d7..8e25606a9d 100644
--- a/build/package/winget/prepare_installer_input_artifacts.ps1
+++ b/build/package/winget/prepare_installer_input_artifacts.ps1
@@ -13,7 +13,21 @@ try
[XML]$versionXML = Get-Content build/Version.props -ErrorAction Stop
$redistUrl = $versionXML.Project.PropertyGroup.TgsDotnetRedistUrl
- $dbRedistUrl = $versionXML.Project.PropertyGroup.TgsMariaDBRedistUrl
+
+ $dbRedistVersion = $versionXML.Project.PropertyGroup.TgsMariaDBRedistVersion
+
+ $dbRedistMinorVersion = $dbRedistVersion.Substring(0, $dbRedistVersion.LastIndexOf("."))
+
+ $ProgressPreference = 'SilentlyContinue'
+ try
+ {
+ $json=Invoke-RestMethod -Uri "https://downloads.mariadb.org/rest-api/mariadb/${dbRedistMinorVersion}/"
+ } finally {
+ $ProgressPreference = $previousProgressPreference
+ }
+
+ $msiFile = $json.releases.$dbRedistVersion.files | Where-Object { $_.package_type -eq "MSI Package" } | Select-Object -First 1
+ $dbRedistUrl = $msiFile.file_download_url
mkdir artifacts
$previousProgressPreference = $ProgressPreference
diff --git a/global.json b/global.json
new file mode 100644
index 0000000000..e866df76d5
--- /dev/null
+++ b/global.json
@@ -0,0 +1,7 @@
+{
+ "sdk": {
+ "version": "6.0.0",
+ "rollForward": "latestMajor",
+ "allowPrerelease": false
+ }
+}
diff --git a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
index f0c75819fa..07b8b364a2 100644
--- a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
+++ b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs b/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs
index 83d109c425..6d819dfb33 100644
--- a/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs
+++ b/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs
@@ -47,7 +47,7 @@ namespace Tgstation.Server.Host.Database
databaseConfiguration.ServerVersion,
databaseConfiguration.DatabaseType == DatabaseType.MariaDB
? ServerType.MariaDb
- : ServerType.MySql);
+ : ServerType.MySql);
}
else
serverVersion = ServerVersion.AutoDetect(databaseConfiguration.ConnectionString);
diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index d3373cd28e..3c5ace62ae 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -28,13 +28,13 @@
-
+
-
+