Merge pull request #2972 from lateralusX/jlorenss/vs2015-upgrade

[mono.git] / msvc / mono-mini-regression-test.vcxproj

diff --git a/msvc/mono-mini-regression-test.vcxproj b/msvc/mono-mini-regression-test.vcxproj
index 66d62f1584f5f4e410c1ef319fec8be16db461ee..6ad3801af37c89c980ed4b75941a5cd7b11eeb75 100644 (file)
--- a/msvc/mono-mini-regression-test.vcxproj
+++ b/msvc/mono-mini-regression-test.vcxproj
@@ -18,6 +18,11 @@
       <Platform>x64</Platform>\r
     </ProjectConfiguration>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="mono.vcxproj">\r
+      <Project>{a0eddcd9-940f-432c-a28f-7ef322437d79}</Project>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
     <ProjectGuid>{3E0D229E-C39F-4EDA-9A6A-A33ECEA0322D}</ProjectGuid>\r
     <RootNamespace>monoregressiontest</RootNamespace>\r
@@ -86,20 +91,20 @@
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <OutDir>$(Platform)\lib\$(Configuration)\</OutDir>\r
-    <IntDir>$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
+    <OutDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\lib\$(Configuration)\</OutDir>\r
+    <IntDir>$(MONO_BUILD_DIR_PREFIX)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>\r
@@ -108,6 +113,8 @@
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\r
   </PropertyGroup>\r
@@ -119,6 +126,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -129,6 +138,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
@@ -139,6 +150,8 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
     <LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
 $(MONO_CFG_DIR_ENV)\r
 $(MONO_TOOLCHAIN_PATH_ENV)\r
+$(MONO_LOG_LEVEL_ENV)\r
+$(MONO_LOG_MASK_ENV)\r
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
@@ -181,11 +194,6 @@ $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
   </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="build-all.vcxproj">\r
-      <Project>{5362490b-8516-44ee-9987-014c015a080a}</Project>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r