From d5fa4a7b88ff94b0da66d478456ee5cb7a667aa4 Mon Sep 17 00:00:00 2001
From: stakx <stakx@eml.cc>
Date: Thu, 18 Jun 2020 22:19:23 +0200
Subject: [PATCH 1/2] Upgrade test projects to `netcoreapp3.1`

(The current .NET Core target `netcoreapp2.2` was not an LTS release.)
---
 tests/Moq.Tests.FSharpTypes/Moq.Tests.FSharpTypes.fsproj | 2 +-
 tests/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj | 2 +-
 tests/Moq.Tests/Moq.Tests.csproj                         | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Moq.Tests.FSharpTypes/Moq.Tests.FSharpTypes.fsproj b/tests/Moq.Tests.FSharpTypes/Moq.Tests.FSharpTypes.fsproj
index e4c1f210b..a1eef0532 100644
--- a/tests/Moq.Tests.FSharpTypes/Moq.Tests.FSharpTypes.fsproj
+++ b/tests/Moq.Tests.FSharpTypes/Moq.Tests.FSharpTypes.fsproj
@@ -4,7 +4,7 @@
 	<Import Project="$(BuildDirectory)SignAssembly.props" />
 
 	<PropertyGroup>
-		<TargetFrameworks>net472;netcoreapp2.2</TargetFrameworks>
+		<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
 		<DebugSymbols>True</DebugSymbols>
 		<DebugType>portable</DebugType>
 		<IsPackable>False</IsPackable>
diff --git a/tests/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj b/tests/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj
index b24595d7f..9206d4053 100644
--- a/tests/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj
+++ b/tests/Moq.Tests.VisualBasic/Moq.Tests.VisualBasic.vbproj
@@ -5,7 +5,7 @@
 	<Import Project="$(BuildDirectory)xUnit.props" />
 
 	<PropertyGroup>
-		<TargetFrameworks>net472;netcoreapp2.2</TargetFrameworks>
+		<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
 		<DebugSymbols>True</DebugSymbols>
 		<DebugType>portable</DebugType>
 		<IsPackable>False</IsPackable>
diff --git a/tests/Moq.Tests/Moq.Tests.csproj b/tests/Moq.Tests/Moq.Tests.csproj
index 6ecc4058f..0bd2443f3 100644
--- a/tests/Moq.Tests/Moq.Tests.csproj
+++ b/tests/Moq.Tests/Moq.Tests.csproj
@@ -5,7 +5,7 @@
 	<Import Project="$(BuildDirectory)xUnit.props" />
 
 	<PropertyGroup>
-		<TargetFrameworks>net472;netcoreapp2.2</TargetFrameworks>
+		<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
 		<AssemblyName>Moq.Tests</AssemblyName>
 		<DebugSymbols>True</DebugSymbols>
 		<DebugType>portable</DebugType>
@@ -17,7 +17,7 @@
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
 		<DefineConstants>$(DefineConstants);FEATURE_CAS;FEATURE_DYNAMICPROXY_SERIALIZABLE_PROXIES;FEATURE_COM;FEATURE_EF;FEATURE_SYSTEM_WEB;FEATURE_SYSTEM_WINDOWS_FORMS</DefineConstants>
 	</PropertyGroup>
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
+	<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
 		<DefineConstants>$(DefineConstants)</DefineConstants>
 	</PropertyGroup>
 
@@ -41,7 +41,7 @@
 	<ItemGroup Condition=" $([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants)', 'FEATURE_SYSTEM_WINDOWS_FORMS'))">
 		<Reference Include="System.Windows.Forms" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
 		<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
 		<PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
 		<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />

From 79ad364856c5b935c29faa82474016eb3226014e Mon Sep 17 00:00:00 2001
From: stakx <stakx@eml.cc>
Date: Thu, 18 Jun 2020 22:21:37 +0200
Subject: [PATCH 2/2] Use VS2019 image & toolchain for Appveyor CI build

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index a1b4cf995..d76d02b5a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 init:
   - git config --global core.autocrlf input