diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 5fed70160c7..290460f8ad9 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -1518,7 +1518,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
@@ -1660,6 +1662,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 32d88126872..9304b65d4b7 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
@@ -40,7 +36,7 @@ WORKDIR /repo
COPY . .
#run dos2unix on tgs.docker.sh so we can build without issue on windows
-RUN dos2unix build/tgs.docker.sh && dotnet restore
+RUN dos2unix build/tgs.docker.sh build/RemoveUnsupportedRuntimes.sh && dotnet restore
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 f18f42c419d..c08eccf5ff0 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -18,8 +18,7 @@
8
https://download.visualstudio.microsoft.com/download/pr/f0a627b7-bd46-4ed2-978d-00a445174074/182420f488062f1983fc392b2fb66967/dotnet-hosting-8.0.0-rc.2.23480.2-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 5f7032e3e52..827b40f156f 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 b2a5c6b4d7d..8e25606a9dd 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 00000000000..9c97a328789
--- /dev/null
+++ b/global.json
@@ -0,0 +1,7 @@
+{
+ "sdk": {
+ "version": "8.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 f0c75819fac..07b8b364a24 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 83d109c4250..6d819dfb337 100644
--- a/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs
+++ b/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs
@@ -47,7 +47,7 @@ public static void ConfigureWith(DbContextOptionsBuilder options, DatabaseConfig
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 f4d69b7189e..d42f52b825d 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -28,13 +28,13 @@
-
+
-
+