From 908d4519c59e04b6b44181ce3faa1b921f4e499a Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 15 Nov 2021 18:15:28 +1000
Subject: [PATCH] Use <ContinuousIntegrationBuild/> prop

---
 Common.props                           | 1 +
 src/BizHawk.Tests/BizHawk.Tests.csproj | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Common.props b/Common.props
index c00533eb09..38622fc939 100644
--- a/Common.props
+++ b/Common.props
@@ -1,6 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<AnalysisLevel>5</AnalysisLevel>
+		<ContinuousIntegrationBuild Condition=" '$(GITLAB_CI)' != '' Or '$(APPVEYOR)' != '' ">true</ContinuousIntegrationBuild>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<ErrorReport>prompt</ErrorReport>
 		<IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework>
diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj
index 78f0e2666d..81032d0b63 100644
--- a/src/BizHawk.Tests/BizHawk.Tests.csproj
+++ b/src/BizHawk.Tests/BizHawk.Tests.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework Condition=" '$(APPVEYOR)' == '' ">net5.0</TargetFramework>
-		<TargetFramework Condition=" '$(APPVEYOR)' != '' ">netcoreapp3.1</TargetFramework>
+		<TargetFramework>net5.0</TargetFramework>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(APPVEYOR)' != '' ">
+		<TargetFramework>netcoreapp3.1</TargetFramework>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
-		<DefineConstants Condition=" '$(GITLAB_CI)' != '' Or '$(APPVEYOR)' != '' ">$(DefineConstants);SKIP_PLATFORM_TESTS</DefineConstants>
+		<DefineConstants Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">$(DefineConstants);SKIP_PLATFORM_TESTS</DefineConstants>
 		<OutputPath>$(ProjectDir)../../test_output</OutputPath>
 	</PropertyGroup>
 	<ItemGroup>