From ba8999993fe9fa5eb5156c57723b2c03621f3322 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Thu, 27 Jul 2023 17:30:42 -0400 Subject: [PATCH 1/2] Switch to using `Microsoft.Data.SqlClient` --- .../Database/DatabaseConnectionFactory.cs | 2 +- .../Database/SqlServerDatabaseContext.cs | 2 +- src/Tgstation.Server.Host/Setup/SetupWizard.cs | 2 +- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 -- .../Database/TestDatabaseConnectionFactory.cs | 8 ++++---- tests/Tgstation.Server.Tests/Live/TestLiveServer.cs | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Tgstation.Server.Host/Database/DatabaseConnectionFactory.cs b/src/Tgstation.Server.Host/Database/DatabaseConnectionFactory.cs index f3adcaf7f2..b118f346db 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseConnectionFactory.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseConnectionFactory.cs @@ -1,7 +1,7 @@ using System; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using Microsoft.Data.Sqlite; using MySqlConnector; diff --git a/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs b/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs index 33cab94dcf..a2b760b426 100644 --- a/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs @@ -1,6 +1,6 @@ using System; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using Microsoft.EntityFrameworkCore; using Tgstation.Server.Host.Configuration; diff --git a/src/Tgstation.Server.Host/Setup/SetupWizard.cs b/src/Tgstation.Server.Host/Setup/SetupWizard.cs index dcf5490971..3ea5f694f6 100644 --- a/src/Tgstation.Server.Host/Setup/SetupWizard.cs +++ b/src/Tgstation.Server.Host/Setup/SetupWizard.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Data.Common; -using System.Data.SqlClient; using System.Globalization; using System.IO; using System.Linq; @@ -11,6 +10,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; +using Microsoft.Data.SqlClient; using Microsoft.Data.Sqlite; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 559566784d..a09479058f 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -110,8 +110,6 @@ - - diff --git a/tests/Tgstation.Server.Host.Tests/Database/TestDatabaseConnectionFactory.cs b/tests/Tgstation.Server.Host.Tests/Database/TestDatabaseConnectionFactory.cs index 3ebd02a56c..b2964fd934 100644 --- a/tests/Tgstation.Server.Host.Tests/Database/TestDatabaseConnectionFactory.cs +++ b/tests/Tgstation.Server.Host.Tests/Database/TestDatabaseConnectionFactory.cs @@ -1,10 +1,10 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; + +using Microsoft.Data.SqlClient; +using Microsoft.VisualStudio.TestTools.UnitTesting; using MySqlConnector; -using System; -using System.Data.SqlClient; - using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database.Tests diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs index bbe7f8d1e1..9e13a2ca57 100644 --- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs +++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Data.SqlClient; using System.Diagnostics; using System.IO; using System.Linq; @@ -14,6 +13,7 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; +using Microsoft.Data.SqlClient; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.VisualStudio.TestTools.UnitTesting; From 1f8973c06804743b2c6a291db27486e882e4aa6f Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Thu, 27 Jul 2023 19:47:40 -0400 Subject: [PATCH 2/2] Add missing BYOND zip cache to unit test jobs --- .github/workflows/ci-pipeline.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index c6b420c33c..ba562b4b4d 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -264,6 +264,13 @@ jobs: - name: Build run: dotnet build -c ${{ matrix.configuration }}NoWindows + - name: Cache BYOND .zips + uses: actions/cache@v3 + id: cache-byond + with: + path: ~/byond-zips-cache + key: byond-zips + - name: Run Unit Tests run: sudo dotnet test --no-build --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --filter TestCategory!=RequiresDatabase -c ${{ matrix.configuration }}NoWindows --collect:"XPlat Code Coverage" --settings build/ci.runsettings --results-directory ./TestResults tgstation-server.sln @@ -307,6 +314,13 @@ jobs: - name: Build run: dotnet build -c ${{ matrix.configuration }}NoWix + - name: Cache BYOND .zips + uses: actions/cache@v3 + id: cache-byond + with: + path: ~/byond-zips-cache + key: byond-zips + - name: Run Unit Tests run: dotnet test --no-build --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --filter TestCategory!=RequiresDatabase -c ${{ matrix.configuration }}NoWix --collect:"XPlat Code Coverage" --settings build/ci.runsettings --results-directory ./TestResults tgstation-server.sln