From a060c4e6003d5ac49f42ad8605bba43edc7c7506 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 4 Dec 2020 06:12:01 +1000
Subject: [PATCH] Fix building on non-AppVeyor machines without breaking
 AppVeyor

hopefully
---
 global.json                            | 2 +-
 src/BizHawk.Tests/BizHawk.Tests.csproj | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 782c4f9748..03c3a44a3c 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
 	"sdk": {
-		"version": "3.1.100",
+		"version": "5.0.100",
 		"rollForward": "latestFeature"
 	}
 }
diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj
index 5bc322043d..087e90c569 100644
--- a/src/BizHawk.Tests/BizHawk.Tests.csproj
+++ b/src/BizHawk.Tests/BizHawk.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework Condition=" '$(APPVEYOR)' == '' ">net5.0</TargetFramework>
+		<TargetFramework Condition=" '$(APPVEYOR)' != '' ">netcoreapp3.1</TargetFramework>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<Import Project="../../CommonNullable.props" />