diff --git a/UnitTests/UnitTests.sln b/UnitTests/UnitTests.sln
index e60c33af6..3999884ef 100644
--- a/UnitTests/UnitTests.sln
+++ b/UnitTests/UnitTests.sln
@@ -1,29 +1,29 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32126.315
+# Visual Studio Version 17
+VisualStudioVersion = 17.13.35919.96 d17.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests.vcxproj", "{9AFC377D-C32D-4D42-82C2-09FC818020A2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
+		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Debug|Win32.Build.0 = Debug|Win32
 		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Debug|x64.ActiveCfg = Debug|x64
 		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Debug|x64.Build.0 = Debug|x64
-		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Release|Win32.ActiveCfg = Release|Win32
-		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Release|Win32.Build.0 = Release|Win32
+		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Debug|x86.ActiveCfg = Debug|Win32
+		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Debug|x86.Build.0 = Debug|Win32
 		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Release|x64.ActiveCfg = Release|x64
 		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Release|x64.Build.0 = Release|x64
+		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Release|x86.ActiveCfg = Release|Win32
+		{9AFC377D-C32D-4D42-82C2-09FC818020A2}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = false
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BBDB843D-98C3-46EF-BDE8-0E80FD851852}
diff --git a/UnitTests/UnitTests.vcxproj b/UnitTests/UnitTests.vcxproj
index c7dbd766e..0508fc0dc 100644
--- a/UnitTests/UnitTests.vcxproj
+++ b/UnitTests/UnitTests.vcxproj
@@ -64,8 +64,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>$(SolutionDir).tmp\$(ShortProjectName)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir).tmp\$(ShortProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir).tmp\$(ShortProjectName)\$(PlatformTarget)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir).tmp\$(ShortProjectName)\$(PlatformTarget)\$(Configuration)\</IntDir>
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..c5d6ae937
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+version: master.{build}
+image:
+- Visual Studio 2022
+- Visual Studio 2019
+configuration:
+- Debug
+- Release
+platform:
+- x64
+- x86
+install:
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - git submodule update --init --recursive
+build:
+  project: UnitTests\UnitTests.sln
+  parallel: true
+  verbosity: minimal
+test_script:
+- cmd: vstest.console /logger:Appveyor UnitTests\.tmp\UnitTests\%platform%\%configuration%\UnitTests.dll