From 66e6aa7eb8138593800c4712c5824517d5917f94 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Wed, 15 May 2024 10:34:44 +1000
Subject: [PATCH] Tell GitLab CI to continue running tests in .NET 8

fixes afc181c40
sort of defeats the purpose, but hey it was working before, and
compilation errors will still be caught automatically
---
 .gitlab-ci.yml         | 3 +--
 src/TestProjects.props | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9f226cbdb..02932b6d4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,8 +201,7 @@ run_tests:
   - job: build_asms_release
     artifacts: false
   script:
-  - Dist/BuildDebug.sh # populate output
-  - Dist/BuildTestRelease.sh -v normal
+  - Dist/BuildTestRelease.sh -v normal -p:TestProjTargetFrameworkOverride=net8.0
   stage: test
 
 .disabled_job_sast:
diff --git a/src/TestProjects.props b/src/TestProjects.props
index 60d1d8440d..8289c4af7e 100644
--- a/src/TestProjects.props
+++ b/src/TestProjects.props
@@ -5,6 +5,9 @@
 		<OutputPath>$(ProjectDir)../../test_output</OutputPath>
 		<OutputType>Exe</OutputType>
 	</PropertyGroup>
+	<PropertyGroup Condition=" '$(TestProjTargetFrameworkOverride)' != '' AND '$(TargetFramework)' == 'net48' ">
+		<TargetFramework>$(TestProjTargetFrameworkOverride)</TargetFramework>
+	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="MSTest" PrivateAssets="all" />
 		<PackageReference Include="JunitXml.TestLogger" PrivateAssets="all" />