Visual Studio test/debug mono runtime utility projects.

Added a couple of new/updated test/debug Visual Studio utility projects.
These projects can be used to quicker get up to speed when there is a need
to run/test/debug mono runtime tests inside Visual Studio debugger.

Added utility projects can be used to run mini regression tests using JIT as
well as compile/run full AOT:ed versions of mini regression tests or other assemblies.
The different .prop files are also organized so they can be reused when adding additional
run/test/debug projects going forward.

13 files changed, 391 insertions, 150 deletions

diff --git a/msvc/mono-mini-regression-aot-test.vcxproj b/msvc/mono-full-aot-compile-test.vcxproj
index 9dcde125998..7924eca87c7 100644
--- a/msvc/mono-mini-regression-aot-test.vcxproj
+++ b/msvc/mono-full-aot-compile-test.vcxproj
@@ -19,8 +19,8 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectGuid>{D632D664-C0F5-4B60-9375-BDDAD5C7A649}</ProjectGuid>

-    <RootNamespace>monominiregressionaottest</RootNamespace>

+    <ProjectGuid>{C7D83158-4EB6-4409-8730-612AD45FAF6A}</ProjectGuid>

+    <RootNamespace>monofullaotcompiletest</RootNamespace>

     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

@@ -58,30 +58,34 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="mono.props" />

-    <Import Project="mono-regression-test-Win32.props" />

-    <Import Project="mono-regression-test.props" />

-    <Import Project="mono-mini-regression-test-aot.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-Win32.props" />

+    <Import Project="mono-full-aot-test.props" />

+    <Import Project="mono-test-env.props" />

   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="mono.props" />

-    <Import Project="mono-regression-test-Win32.props" />

-    <Import Project="mono-regression-test.props" />

-    <Import Project="mono-mini-regression-test-aot.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-Win32.props" />

+    <Import Project="mono-full-aot-test.props" />

+    <Import Project="mono-test-env.props" />

   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="mono.props" />

-    <Import Project="mono-regression-test-x64.props" />

-    <Import Project="mono-regression-test.props" />

-    <Import Project="mono-mini-regression-test-aot.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-x64.props" />

+    <Import Project="mono-full-aot-test.props" />

+    <Import Project="mono-test-env.props" />

   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="mono.props" />

-    <Import Project="mono-regression-test-x64.props" />

-    <Import Project="mono-regression-test.props" />

-    <Import Project="mono-mini-regression-test-aot.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-x64.props" />

+    <Import Project="mono-full-aot-test.props" />

+    <Import Project="mono-test-env.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

@@ -102,8 +106,8 @@
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

-    <LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_AOT_ARGS)</LocalDebuggerCommandArguments>

-    <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>

+    <LocalDebuggerCommandArguments>$(MONO_FULL_AOT_COMPILE_ARGS)</LocalDebuggerCommandArguments>

+    <LocalDebuggerWorkingDirectory>$(MONO_FULL_AOT_TEST_DIR)</LocalDebuggerWorkingDirectory>

     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

 $(MONO_CFG_DIR_ENV)

@@ -114,8 +118,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

-    <LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_AOT_ARGS)</LocalDebuggerCommandArguments>

-    <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>

+    <LocalDebuggerCommandArguments>$(MONO_FULL_AOT_COMPILE_ARGS)</LocalDebuggerCommandArguments>

+    <LocalDebuggerWorkingDirectory>$(MONO_FULL_AOT_TEST_DIR)</LocalDebuggerWorkingDirectory>

     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

 $(MONO_CFG_DIR_ENV)

@@ -126,8 +130,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

-    <LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_AOT_ARGS)</LocalDebuggerCommandArguments>

-    <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>

+    <LocalDebuggerCommandArguments>$(MONO_FULL_AOT_COMPILE_ARGS)</LocalDebuggerCommandArguments>

+    <LocalDebuggerWorkingDirectory>$(MONO_FULL_AOT_TEST_DIR)</LocalDebuggerWorkingDirectory>

     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

 $(MONO_CFG_DIR_ENV)

@@ -138,8 +142,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

-    <LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_AOT_ARGS)</LocalDebuggerCommandArguments>

-    <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>

+    <LocalDebuggerCommandArguments>$(MONO_FULL_AOT_COMPILE_ARGS)</LocalDebuggerCommandArguments>

+    <LocalDebuggerWorkingDirectory>$(MONO_FULL_AOT_TEST_DIR)</LocalDebuggerWorkingDirectory>

     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

 $(MONO_CFG_DIR_ENV)

diff --git a/msvc/mono-full-aot-run-test.vcxproj b/msvc/mono-full-aot-run-test.vcxproj
new file mode 100644
index 00000000000..bcf3cc3e6cb
--- /dev/null
+++ b/msvc/mono-full-aot-run-test.vcxproj
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{6C64262B-077B-4E12-AF91-9409ECCB75F6}</ProjectGuid>

+    <RootNamespace>monofullaotruntest</RootNamespace>

+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Utility</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v140</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Utility</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v140</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>Utility</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v140</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>Utility</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v140</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Label="Shared">

+  </ImportGroup>

+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="mono.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-Win32.props" />

+    <Import Project="mono-full-aot-test.props" />

+    <Import Project="mono-test-env.props" />

+  </ImportGroup>

+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="mono.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-Win32.props" />

+    <Import Project="mono-full-aot-test.props" />

+    <Import Project="mono-test-env.props" />

+  </ImportGroup>

+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="mono.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-x64.props" />

+    <Import Project="mono-full-aot-test.props" />

+    <Import Project="mono-test-env.props" />

+  </ImportGroup>

+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+	<Import Project="mono.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-x64.props" />

+    <Import Project="mono-full-aot-test.props" />

+    <Import Project="mono-test-env.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>

+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>

+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>

+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>

+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

+    <LocalDebuggerCommandArguments>$(MONO_FULL_AOT_RUN_ARGS)</LocalDebuggerCommandArguments>

+    <LocalDebuggerWorkingDirectory>$(MONO_FULL_AOT_TEST_DIR)</LocalDebuggerWorkingDirectory>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+    <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

+$(MONO_CFG_DIR_ENV)

+$(MONO_TOOLCHAIN_PATH_ENV)

+$(MONO_LOG_LEVEL_ENV)

+$(MONO_LOG_MASK_ENV)

+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

+    <LocalDebuggerCommandArguments>$(MONO_FULL_AOT_RUN_ARGS)</LocalDebuggerCommandArguments>

+    <LocalDebuggerWorkingDirectory>$(MONO_FULL_AOT_TEST_DIR)</LocalDebuggerWorkingDirectory>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+    <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

+$(MONO_CFG_DIR_ENV)

+$(MONO_TOOLCHAIN_PATH_ENV)

+$(MONO_LOG_LEVEL_ENV)

+$(MONO_LOG_MASK_ENV)

+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

+    <LocalDebuggerCommandArguments>$(MONO_FULL_AOT_RUN_ARGS)</LocalDebuggerCommandArguments>

+    <LocalDebuggerWorkingDirectory>$(MONO_FULL_AOT_TEST_DIR)</LocalDebuggerWorkingDirectory>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+    <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

+$(MONO_CFG_DIR_ENV)

+$(MONO_TOOLCHAIN_PATH_ENV)

+$(MONO_LOG_LEVEL_ENV)

+$(MONO_LOG_MASK_ENV)

+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

+    <LocalDebuggerCommandArguments>$(MONO_FULL_AOT_RUN_ARGS)</LocalDebuggerCommandArguments>

+    <LocalDebuggerWorkingDirectory>$(MONO_FULL_AOT_TEST_DIR)</LocalDebuggerWorkingDirectory>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+    <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

+$(MONO_CFG_DIR_ENV)

+$(MONO_TOOLCHAIN_PATH_ENV)

+$(MONO_LOG_LEVEL_ENV)

+$(MONO_LOG_MASK_ENV)

+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>Disabled</Optimization>

+      <SDLCheck>true</SDLCheck>

+    </ClCompile>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>Disabled</Optimization>

+      <SDLCheck>true</SDLCheck>

+    </ClCompile>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>MaxSpeed</Optimization>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <SDLCheck>true</SDLCheck>

+    </ClCompile>

+    <Link>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>MaxSpeed</Optimization>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <SDLCheck>true</SDLCheck>

+    </ClCompile>

+    <Link>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ProjectReference Include="mono.vcxproj">

+      <Project>{a0eddcd9-940f-432c-a28f-7ef322437d79}</Project>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/msvc/mono-full-aot-test.props b/msvc/mono-full-aot-test.props
new file mode 100644
index 00000000000..a3a6eb8b27b
--- /dev/null
+++ b/msvc/mono-full-aot-test.props
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+	<MONO_FULL_AOT_TEST_DIR>$(MONO_DIR)/mono/mini</MONO_FULL_AOT_TEST_DIR>
+	<MONO_PATH>$(MONO_PATH);$(MONO_FULL_AOT_TEST_DIR)</MONO_PATH>
+	<MONO_CFG_DIR>$(MONO_DIR)/runtime/etc</MONO_CFG_DIR>
+    <MONO_FULL_AOT_COMPILE_SYSTEM_TARGETS>mscorlib.dll,System.Core.dll,System.dll,Mono.Posix.dll,System.Configuration.dll,System.Security.dll,System.Xml.dll,Mono.Security.dll,Mono.Simd.dll,I18N.dll,I18N.West.dll</MONO_FULL_AOT_COMPILE_SYSTEM_TARGETS>
+    <MONO_FULL_AOT_COMPILE_TEST_SUPPORT_TARGETS>TestDriver.dll</MONO_FULL_AOT_COMPILE_TEST_SUPPORT_TARGETS>
+    <MONO_FULL_AOT_COMPILE_TARGETS>basic.exe</MONO_FULL_AOT_COMPILE_TARGETS>
+    <MONO_FULL_AOT_COMPILE_ARGS>--aot=full,tool-prefix="$(MONO_TOOLCHAIN_PREFIX)",print-skipped $(MONO_FULL_AOT_COMPILE_TARGETS)</MONO_FULL_AOT_COMPILE_ARGS>
+    <MONO_FULL_AOT_RUN_TARGET>basic.exe</MONO_FULL_AOT_RUN_TARGET>
+    <MONO_FULL_AOT_RUN_ADDITIONAL_ARGS>--exclude "!FULLAOT" --exclude "!FULLAOT-AMD64"</MONO_FULL_AOT_RUN_ADDITIONAL_ARGS>
+    <MONO_FULL_AOT_RUN_ARGS>--full-aot "$(MONO_FULL_AOT_RUN_TARGET)" $(MONO_FULL_AOT_RUN_ADDITIONAL_ARGS)</MONO_FULL_AOT_RUN_ARGS>
+  </PropertyGroup>
+  <ItemGroup>
+  	<BuildMacro Include="MONO_FULL_AOT_TEST_DIR">
+      <Value>$(MONO_FULL_AOT_TEST_DIR)</Value>
+    </BuildMacro>
+	<BuildMacro Include="MONO_PATH">
+      <Value>$(MONO_PATH)</Value>
+    </BuildMacro>
+	<BuildMacro Include="MONO_CFG_DIR">
+      <Value>$(MONO_CFG_DIR)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_FULL_AOT_COMPILE_SYSTEM_TARGETS">
+      <Value>$(MONO_FULL_AOT_COMPILE_SYSTEM_TARGETS)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_FULL_AOT_COMPILE_TEST_SUPPORT_TARGETS">
+      <Value>$(MONO_FULL_AOT_COMPILE_TEST_SUPPORT_TARGETS)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_FULL_AOT_COMPILE_TARGETS">
+      <Value>$(MONO_FULL_AOT_COMPILE_TARGETS)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_FULL_AOT_COMPILE_ARGS">
+      <Value>$(MONO_FULL_AOT_COMPILE_ARGS)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_FULL_AOT_RUN_TARGET">
+      <Value>$(MONO_FULL_AOT_RUN_TARGET)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_FULL_AOT_RUN_ADDITIONAL_ARGS">
+      <Value>$(MONO_FULL_AOT_RUN_ADDITIONAL_ARGS)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_FULL_AOT_RUN_ARGS">
+      <Value>$(MONO_FULL_AOT_RUN_ARGS)</Value>
+    </BuildMacro>
+  </ItemGroup>
+  <ItemDefinitionGroup />
+</Project>
\ No newline at end of file
diff --git a/msvc/mono-mini-regression-aot-test.vcxproj.filters b/msvc/mono-mini-regression-aot-test.vcxproj.filters
deleted file mode 100644
index f81daba046f..00000000000
--- a/msvc/mono-mini-regression-aot-test.vcxproj.filters
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

-    </Filter>

-  </ItemGroup>

-</Project>
\ No newline at end of file
diff --git a/msvc/mono-mini-regression-test-aot.props b/msvc/mono-mini-regression-test-aot.props
deleted file mode 100644
index e741e134551..00000000000
--- a/msvc/mono-mini-regression-test-aot.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--<ImportGroup Label="PropertySheets" />-->
-  <PropertyGroup Label="UserMacros">
-    <MONO_MINI_ALL_REGRESSION_TEST_AOT_ARG>--aot="tool-prefix=$(MONO_TOOLCHAIN_PREFIX)"  $(MONO_MINI_REGRESSION_TESTS)</MONO_MINI_ALL_REGRESSION_TEST_AOT_ARG>
-    <MONO_MINI_ONE_REGRESSION_TEST_AOT_ARG>--aot="tool-prefix=$(MONO_TOOLCHAIN_PREFIX)" basic.exe</MONO_MINI_ONE_REGRESSION_TEST_AOT_ARG>
-    <MONO_MINI_REGRESSION_TEST_AOT_ARGS>$(MONO_EXECUTABLE_CONFIG_ARG) $(MONO_MINI_ALL_REGRESSION_TEST_AOT_ARG)</MONO_MINI_REGRESSION_TEST_AOT_ARGS>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="MONO_MINI_ALL_REGRESSION_TEST_AOT_ARG">
-      <Value>$(MONO_MINI_ALL_REGRESSION_TEST_AOT_ARG)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_MINI_ONE_REGRESSION_TEST_AOT_ARG">
-      <Value>$(MONO_MINI_ONE_REGRESSION_TEST_AOT_ARG)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_MINI_REGRESSION_TEST_AOT_ARGS">
-      <Value>$(MONO_MINI_REGRESSION_TEST_AOT_ARGS)</Value>
-    </BuildMacro>
-  </ItemGroup>
-  <ItemDefinitionGroup />
-</Project>
\ No newline at end of file
diff --git a/msvc/mono-mini-regression-test.props b/msvc/mono-mini-regression-test.props
index b0003104b53..02d1f6f94c4 100644
--- a/msvc/mono-mini-regression-test.props
+++ b/msvc/mono-mini-regression-test.props
@@ -1,12 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--<ImportGroup Label="PropertySheets" />-->
   <PropertyGroup Label="UserMacros">
+	<MONO_MINI_REGRESSION_TEST_DIR>$(MONO_DIR)/mono/mini</MONO_MINI_REGRESSION_TEST_DIR>
+	<MONO_PATH>$(MONO_PATH);$(MONO_MINI_REGRESSION_TEST_DIR)</MONO_PATH>
+	<MONO_CFG_DIR>$(MONO_DIR)/runtime/etc</MONO_CFG_DIR>
+    <MONO_CONFIG_ARG>--config "$(MONO_CFG_DIR)/mono/config"</MONO_CONFIG_ARG>
+    <MONO_MINI_REGRESSION_TESTS>basic.exe basic-float.exe basic-long.exe basic-calls.exe objects.exe arrays.exe basic-math.exe exceptions.exe iltests.exe devirtualization.exe generics.exe basic-simd.exe</MONO_MINI_REGRESSION_TESTS>
     <MONO_MINI_ALL_REGRESSION_TEST_ARG>--regression $(MONO_MINI_REGRESSION_TESTS)</MONO_MINI_ALL_REGRESSION_TEST_ARG>
     <MONO_MINI_ONE_REGRESSION_TEST_ARG>--regression basic.exe</MONO_MINI_ONE_REGRESSION_TEST_ARG>
-    <MONO_MINI_REGRESSION_TEST_ARGS>$(MONO_EXECUTABLE_CONFIG_ARG) $(MONO_MINI_ALL_REGRESSION_TEST_ARG)</MONO_MINI_REGRESSION_TEST_ARGS>
+    <MONO_MINI_REGRESSION_TEST_ARGS>$(MONO_CONFIG_ARG) $(MONO_MINI_ALL_REGRESSION_TEST_ARG)</MONO_MINI_REGRESSION_TEST_ARGS>
   </PropertyGroup>
   <ItemGroup>
+	<BuildMacro Include="MONO_MINI_REGRESSION_TEST_DIR">
+      <Value>$(MONO_MINI_REGRESSION_TEST_DIR)</Value>
+    </BuildMacro>
+	<BuildMacro Include="MONO_PATH">
+      <Value>$(MONO_PATH)</Value>
+    </BuildMacro>
+	<BuildMacro Include="MONO_CFG_DIR">
+      <Value>$(MONO_CFG_DIR)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_CONFIG_ARG">
+      <Value>$(MONO_CONFIG_ARG)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_MINI_REGRESSION_TESTS">
+      <Value>$(MONO_MINI_REGRESSION_TESTS)</Value>
+    </BuildMacro>
     <BuildMacro Include="MONO_MINI_ALL_REGRESSION_TEST_ARG">
       <Value>$(MONO_MINI_ALL_REGRESSION_TEST_ARG)</Value>
     </BuildMacro>
diff --git a/msvc/mono-mini-regression-test.vcxproj b/msvc/mono-mini-regression-test.vcxproj
index 6ad3801af37..8d8537e2467 100644
--- a/msvc/mono-mini-regression-test.vcxproj
+++ b/msvc/mono-mini-regression-test.vcxproj
@@ -64,30 +64,34 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="mono.props" />

-    <Import Project="mono-regression-test-Win32.props" />

-    <Import Project="mono-regression-test.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-Win32.props" />

     <Import Project="mono-mini-regression-test.props" />

+    <Import Project="mono-test-env.props" />

   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="mono.props" />

-    <Import Project="mono-regression-test-Win32.props" />

-    <Import Project="mono-regression-test.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-Win32.props" />

     <Import Project="mono-mini-regression-test.props" />

+    <Import Project="mono-test-env.props" />

   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="mono.props" />

-    <Import Project="mono-regression-test-x64.props" />

-    <Import Project="mono-regression-test.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-x64.props" />

     <Import Project="mono-mini-regression-test.props" />

+    <Import Project="mono-test-env.props" />

   </ImportGroup>

   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

     <Import Project="mono.props" />

-    <Import Project="mono-regression-test-x64.props" />

-    <Import Project="mono-regression-test.props" />

+    <Import Project="mono-test.props" />

+    <Import Project="mono-test-x64.props" />

     <Import Project="mono-mini-regression-test.props" />

+    <Import Project="mono-test-env.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

@@ -109,7 +113,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

     <LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_ARGS)</LocalDebuggerCommandArguments>

-    <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>

+    <LocalDebuggerWorkingDirectory>$(MONO_MINI_REGRESSION_TEST_DIR)</LocalDebuggerWorkingDirectory>

     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

 $(MONO_CFG_DIR_ENV)

 $(MONO_TOOLCHAIN_PATH_ENV)

@@ -122,7 +126,7 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

     <LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_ARGS)</LocalDebuggerCommandArguments>

-    <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>

+    <LocalDebuggerWorkingDirectory>$(MONO_MINI_REGRESSION_TEST_DIR)</LocalDebuggerWorkingDirectory>

     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

 $(MONO_CFG_DIR_ENV)

 $(MONO_TOOLCHAIN_PATH_ENV)

@@ -134,7 +138,7 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

     <LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_ARGS)</LocalDebuggerCommandArguments>

-    <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>

+    <LocalDebuggerWorkingDirectory>$(MONO_MINI_REGRESSION_TEST_DIR)</LocalDebuggerWorkingDirectory>

     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

 $(MONO_CFG_DIR_ENV)

 $(MONO_TOOLCHAIN_PATH_ENV)

@@ -146,7 +150,7 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>

     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

     <LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_ARGS)</LocalDebuggerCommandArguments>

-    <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>

+    <LocalDebuggerWorkingDirectory>$(MONO_MINI_REGRESSION_TEST_DIR)</LocalDebuggerWorkingDirectory>

     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)

 $(MONO_CFG_DIR_ENV)

 $(MONO_TOOLCHAIN_PATH_ENV)

diff --git a/msvc/mono-regression-test.props b/msvc/mono-regression-test.props
deleted file mode 100644
index d4e6bf6e28b..00000000000
--- a/msvc/mono-regression-test.props
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--<ImportGroup Label="PropertySheets" />-->
-  <PropertyGroup Label="UserMacros">
-    <MONO_PATH>$(MONO_DIR)/mcs/class/lib/net_4_x</MONO_PATH>
-    <MONO_CFG_DIR>$(MONO_DIR)/runtime/etc</MONO_CFG_DIR>
-    <MONO_CONFIG_ARG>--config "$(MONO_DIR)/runtime/etc/mono/config"</MONO_CONFIG_ARG>
-    <MONO_MINI_REGRESSION_TEST_DIR>$(MONO_DIR)/mono/mini</MONO_MINI_REGRESSION_TEST_DIR>
-    <MONO_MINI_REGRESSION_TESTS>basic.exe basic-float.exe basic-long.exe basic-calls.exe objects.exe arrays.exe basic-math.exe exceptions.exe iltests.exe devirtualization.exe generics.exe basic-simd.exe</MONO_MINI_REGRESSION_TESTS>
-    <MONO_EXECUTABLE>$(MONO_BUILD_DIR_PREFIX)$(Platform)/bin/$(Configuration)/mono$(MONO_TARGET_SUFFIX).exe</MONO_EXECUTABLE>
-    <MONO_EXECUTABLE_DIR>$(MONO_MINI_REGRESSION_TEST_DIR)</MONO_EXECUTABLE_DIR>
-    <MONO_PATH_ENV>MONO_PATH=$(MONO_PATH)</MONO_PATH_ENV>
-    <MONO_CFG_DIR_ENV>MONO_CFG_DIR=$(MONO_CFG_DIR)</MONO_CFG_DIR_ENV>
-    <MONO_TOOLCHAIN_PATH_ENV>PATH=$(MONO_TOOLCHAIN_PATH)</MONO_TOOLCHAIN_PATH_ENV>
-    <MONO_LOG_LEVEL_ENV>MONO_LOG_LEVEL=debug</MONO_LOG_LEVEL_ENV>
-    <MONO_LOG_MASK_ENV>MONO_LOG_MASK=asm,aot</MONO_LOG_MASK_ENV>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="MONO_PATH">
-      <Value>$(MONO_PATH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_CFG_DIR">
-      <Value>$(MONO_CFG_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_CONFIG_ARG">
-      <Value>$(MONO_CONFIG_ARG)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_MINI_REGRESSION_TEST_DIR">
-      <Value>$(MONO_MINI_REGRESSION_TEST_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_MINI_REGRESSION_TESTS">
-      <Value>$(MONO_MINI_REGRESSION_TESTS)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_EXECUTABLE">
-      <Value>$(MONO_EXECUTABLE)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_EXECUTABLE_DIR">
-      <Value>$(MONO_EXECUTABLE_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_PATH_ENV">
-      <Value>$(MONO_PATH_ENV)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_CFG_DIR_ENV">
-      <Value>$(MONO_CFG_DIR_ENV)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_TOOLCHAIN_PATH_ENV">
-      <Value>$(MONO_TOOLCHAIN_PATH_ENV)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_LOG_LEVEL_ENV">
-      <Value>$(MONO_LOG_LEVEL_ENV)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MONO_LOG_MASK_ENV">
-      <Value>$(MONO_LOG_MASK_ENV)</Value>
-    </BuildMacro>
-  </ItemGroup>
-  <ItemDefinitionGroup />
-</Project>
\ No newline at end of file
diff --git a/msvc/mono-regression-test-Win32.props b/msvc/mono-test-Win32.props
index c74e5c807a3..c289e0f3a9d 100644
--- a/msvc/mono-regression-test-Win32.props
+++ b/msvc/mono-test-Win32.props
@@ -3,7 +3,6 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <MONO_TOOLCHAIN_PREFIX>i686-w64-mingw32-</MONO_TOOLCHAIN_PREFIX>
-    <MONO_TOOLCHAIN_PATH>C:/ProgramData/chocolatey/lib/Cygwin/tools/cygwin/bin</MONO_TOOLCHAIN_PATH>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />
@@ -11,8 +10,5 @@
     <BuildMacro Include="MONO_TOOLCHAIN_PREFIX">
       <Value>$(MONO_TOOLCHAIN_PREFIX)</Value>
     </BuildMacro>
-    <BuildMacro Include="MONO_TOOLCHAIN_PATH">
-      <Value>$(MONO_TOOLCHAIN_PATH)</Value>
-    </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/mono-test-env.props b/msvc/mono-test-env.props
new file mode 100644
index 00000000000..b298ce3a35b
--- /dev/null
+++ b/msvc/mono-test-env.props
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <MONO_PATH_ENV>MONO_PATH=$(MONO_PATH)</MONO_PATH_ENV>
+    <MONO_CFG_DIR_ENV>MONO_CFG_DIR=$(MONO_CFG_DIR)</MONO_CFG_DIR_ENV>
+    <MONO_TOOLCHAIN_PATH_ENV>PATH=$(MONO_TOOLCHAIN_PATH)</MONO_TOOLCHAIN_PATH_ENV>
+    <MONO_LOG_LEVEL_ENV>MONO_LOG_LEVEL=debug</MONO_LOG_LEVEL_ENV>
+    <MONO_LOG_MASK_ENV>MONO_LOG_MASK=all</MONO_LOG_MASK_ENV>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="MONO_PATH_ENV">
+      <Value>$(MONO_PATH_ENV)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_CFG_DIR_ENV">
+      <Value>$(MONO_CFG_DIR_ENV)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_TOOLCHAIN_PATH_ENV">
+      <Value>$(MONO_TOOLCHAIN_PATH_ENV)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_LOG_LEVEL_ENV">
+      <Value>$(MONO_LOG_LEVEL_ENV)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_LOG_MASK_ENV">
+      <Value>$(MONO_LOG_MASK_ENV)</Value>
+    </BuildMacro>
+  </ItemGroup>
+  <ItemDefinitionGroup />
+</Project>
\ No newline at end of file
diff --git a/msvc/mono-regression-test-x64.props b/msvc/mono-test-x64.props
index a2724a9ca5e..8b105eab064 100644
--- a/msvc/mono-regression-test-x64.props
+++ b/msvc/mono-test-x64.props
@@ -3,7 +3,6 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <MONO_TOOLCHAIN_PREFIX>x86_64-w64-mingw32-</MONO_TOOLCHAIN_PREFIX>
-    <MONO_TOOLCHAIN_PATH>C:/ProgramData/chocolatey/lib/Cygwin/tools/cygwin/bin</MONO_TOOLCHAIN_PATH>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />
@@ -11,8 +10,5 @@
     <BuildMacro Include="MONO_TOOLCHAIN_PREFIX">
       <Value>$(MONO_TOOLCHAIN_PREFIX)</Value>
     </BuildMacro>
-    <BuildMacro Include="MONO_TOOLCHAIN_PATH">
-      <Value>$(MONO_TOOLCHAIN_PATH)</Value>
-    </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/mono-test.props b/msvc/mono-test.props
new file mode 100644
index 00000000000..b6179b1d2fb
--- /dev/null
+++ b/msvc/mono-test.props
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+	<MONO_TOOLCHAIN_PATH>C:/tools/cygwin/bin</MONO_TOOLCHAIN_PATH>
+    <MONO_PATH>$(MONO_DIR)/mcs/class/lib/net_4_x</MONO_PATH>
+	<MONO_EXECUTABLE_DIR>$(MONO_BUILD_DIR_PREFIX)$(Platform)/bin/$(Configuration)</MONO_EXECUTABLE_DIR>
+    <MONO_EXECUTABLE>$(MONO_EXECUTABLE_DIR)/mono$(MONO_TARGET_SUFFIX).exe</MONO_EXECUTABLE>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="MONO_TOOLCHAIN_PATH">
+      <Value>$(MONO_TOOLCHAIN_PATH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_PATH">
+      <Value>$(MONO_PATH)</Value>
+    </BuildMacro>
+	<BuildMacro Include="MONO_EXECUTABLE_DIR">
+      <Value>$(MONO_EXECUTABLE_DIR)</Value>
+    </BuildMacro>
+    <BuildMacro Include="MONO_EXECUTABLE">
+      <Value>$(MONO_EXECUTABLE)</Value>
+    </BuildMacro>
+  </ItemGroup>
+  <ItemDefinitionGroup />
+</Project>
\ No newline at end of file
diff --git a/msvc/mono.sln b/msvc/mono.sln
index 0861cda5405..9ab545de689 100644
--- a/msvc/mono.sln
+++ b/msvc/mono.sln
@@ -157,12 +157,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgcmonosgen", "libgcmonos
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mono-mini-regression-test", "mono-mini-regression-test.vcxproj", "{3E0D229E-C39F-4EDA-9A6A-A33ECEA0322D}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mono-mini-regression-aot-test", "mono-mini-regression-aot-test.vcxproj", "{D632D664-C0F5-4B60-9375-BDDAD5C7A649}"

-EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "regression", "regression", "{A0068765-334B-414C-8E21-8376CD2EC9F6}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmono-static", "libmono-static.vcxproj", "{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}"

 EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "full-aot", "full-aot", "{BACF489E-EAEB-42BF-9E0A-C54D7CF455B4}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mono-full-aot-compile-test", "mono-full-aot-compile-test.vcxproj", "{C7D83158-4EB6-4409-8730-612AD45FAF6A}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mono-full-aot-run-test", "mono-full-aot-run-test.vcxproj", "{6C64262B-077B-4E12-AF91-9409ECCB75F6}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -345,14 +349,6 @@ Global
 		{3E0D229E-C39F-4EDA-9A6A-A33ECEA0322D}.Release|Win32.Build.0 = Release|Win32

 		{3E0D229E-C39F-4EDA-9A6A-A33ECEA0322D}.Release|x64.ActiveCfg = Release|x64

 		{3E0D229E-C39F-4EDA-9A6A-A33ECEA0322D}.Release|x64.Build.0 = Release|x64

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649}.Debug|Win32.Build.0 = Debug|Win32

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649}.Debug|x64.ActiveCfg = Debug|x64

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649}.Debug|x64.Build.0 = Debug|x64

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649}.Release|Win32.ActiveCfg = Release|Win32

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649}.Release|Win32.Build.0 = Release|Win32

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649}.Release|x64.ActiveCfg = Release|x64

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649}.Release|x64.Build.0 = Release|x64

 		{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}.Debug|Win32.ActiveCfg = Debug|Win32

 		{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}.Debug|Win32.Build.0 = Debug|Win32

 		{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}.Debug|x64.ActiveCfg = Debug|x64

@@ -361,6 +357,22 @@ Global
 		{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}.Release|Win32.Build.0 = Release|Win32

 		{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}.Release|x64.ActiveCfg = Release|x64

 		{CB0D9E92-293C-439C-9AC7-C5F59B6E0772}.Release|x64.Build.0 = Release|x64

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A}.Debug|Win32.Build.0 = Debug|Win32

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A}.Debug|x64.ActiveCfg = Debug|x64

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A}.Debug|x64.Build.0 = Debug|x64

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A}.Release|Win32.ActiveCfg = Release|Win32

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A}.Release|Win32.Build.0 = Release|Win32

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A}.Release|x64.ActiveCfg = Release|x64

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A}.Release|x64.Build.0 = Release|x64

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6}.Debug|Win32.Build.0 = Debug|Win32

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6}.Debug|x64.ActiveCfg = Debug|x64

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6}.Debug|x64.Build.0 = Debug|x64

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6}.Release|Win32.ActiveCfg = Release|Win32

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6}.Release|Win32.Build.0 = Release|Win32

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6}.Release|x64.ActiveCfg = Release|x64

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -390,9 +402,11 @@ Global
 		{B6E563B8-7F57-4F7F-9439-F2405D4E2522} = {DC782E23-920A-4873-82A7-37F195FB92C1}

 		{C36612BD-22D3-4B95-85E2-7FDC4FC5D740} = {21DF4C80-0EC9-4BFE-8552-2D47FCEF419A}

 		{3E0D229E-C39F-4EDA-9A6A-A33ECEA0322D} = {A0068765-334B-414C-8E21-8376CD2EC9F6}

-		{D632D664-C0F5-4B60-9375-BDDAD5C7A649} = {A0068765-334B-414C-8E21-8376CD2EC9F6}

 		{A0068765-334B-414C-8E21-8376CD2EC9F6} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}

 		{CB0D9E92-293C-439C-9AC7-C5F59B6E0772} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F}

+		{BACF489E-EAEB-42BF-9E0A-C54D7CF455B4} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}

+		{C7D83158-4EB6-4409-8730-612AD45FAF6A} = {BACF489E-EAEB-42BF-9E0A-C54D7CF455B4}

+		{6C64262B-077B-4E12-AF91-9409ECCB75F6} = {BACF489E-EAEB-42BF-9E0A-C54D7CF455B4}

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 		AMDCaProjectFile = C:\Users\Owner\Development\monogit\mono\msvc\CodeAnalyst\mono.caw