Added support for 64 toolchain + default log level masks.

msvc/.gitignore

@@ -5,6 +5,7 @@
 /*.sdf
 /*.opensdf
 /*.opendb
+mono.VC.db
 /ipch/
 /Win32/
 /x64/

msvc/mono-mini-regression-aot-test.vcxproj

@@ -27,28 +27,28 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -108,6 +108,8 @@
     <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'">
@@ -118,6 +120,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <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'">
@@ -128,6 +132,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <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'">
@@ -138,6 +144,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <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'">

msvc/mono-mini-regression-test.vcxproj

@@ -108,6 +108,8 @@
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)
 $(MONO_CFG_DIR_ENV)
 $(MONO_TOOLCHAIN_PATH_ENV)
+$(MONO_LOG_LEVEL_ENV)
+$(MONO_LOG_MASK_ENV)
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
@@ -119,6 +121,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <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'">
@@ -129,6 +133,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <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'">
@@ -139,6 +145,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <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'">

msvc/mono-regression-test-x64.props

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <MONO_TOOLCHAIN_PREFIX />
+    <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 />

msvc/mono-regression-test.props

@@ -12,6 +12,8 @@
     <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">
@@ -44,6 +46,12 @@
     <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>