<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
<ConfigurationType>Utility</ConfigurationType>\r
<UseDebugLibraries>true</UseDebugLibraries>\r
<PlatformToolset>v140</PlatformToolset>\r
- <CharacterSet>MultiByte</CharacterSet>\r
+ <CharacterSet>Unicode</CharacterSet>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
<ConfigurationType>Utility</ConfigurationType>\r
<UseDebugLibraries>false</UseDebugLibraries>\r
<PlatformToolset>v140</PlatformToolset>\r
<WholeProgramOptimization>true</WholeProgramOptimization>\r
- <CharacterSet>MultiByte</CharacterSet>\r
+ <CharacterSet>Unicode</CharacterSet>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
<ConfigurationType>Utility</ConfigurationType>\r
<UseDebugLibraries>true</UseDebugLibraries>\r
<PlatformToolset>v140</PlatformToolset>\r
- <CharacterSet>MultiByte</CharacterSet>\r
+ <CharacterSet>Unicode</CharacterSet>\r
</PropertyGroup>\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
<ConfigurationType>Utility</ConfigurationType>\r
<UseDebugLibraries>false</UseDebugLibraries>\r
<PlatformToolset>v140</PlatformToolset>\r
<WholeProgramOptimization>true</WholeProgramOptimization>\r
- <CharacterSet>MultiByte</CharacterSet>\r
+ <CharacterSet>Unicode</CharacterSet>\r
</PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
<ImportGroup Label="ExtensionSettings">\r
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
<Import Project="mono.props" />\r
- <Import Project="mono-regression-test-Win32.props" />\r
- <Import Project="mono-regression-test.props" />\r
+ <Import Project="mono-test.props" />\r
+ <Import Project="mono-test-Win32.props" />\r
<Import Project="mono-mini-regression-test.props" />\r
+ <Import Project="mono-test-env.props" />\r
</ImportGroup>\r
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
<Import Project="mono.props" />\r
- <Import Project="mono-regression-test-Win32.props" />\r
- <Import Project="mono-regression-test.props" />\r
+ <Import Project="mono-test.props" />\r
+ <Import Project="mono-test-Win32.props" />\r
<Import Project="mono-mini-regression-test.props" />\r
+ <Import Project="mono-test-env.props" />\r
</ImportGroup>\r
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
<Import Project="mono.props" />\r
- <Import Project="mono-regression-test-x64.props" />\r
- <Import Project="mono-regression-test.props" />\r
+ <Import Project="mono-test.props" />\r
+ <Import Project="mono-test-x64.props" />\r
<Import Project="mono-mini-regression-test.props" />\r
+ <Import Project="mono-test-env.props" />\r
</ImportGroup>\r
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
<Import Project="mono.props" />\r
- <Import Project="mono-regression-test-x64.props" />\r
- <Import Project="mono-regression-test.props" />\r
+ <Import Project="mono-test.props" />\r
+ <Import Project="mono-test-x64.props" />\r
<Import Project="mono-mini-regression-test.props" />\r
+ <Import Project="mono-test-env.props" />\r
</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
<LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_ARGS)</LocalDebuggerCommandArguments>\r
- <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>\r
+ <LocalDebuggerWorkingDirectory>$(MONO_MINI_REGRESSION_TEST_DIR)</LocalDebuggerWorkingDirectory>\r
<LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
$(MONO_CFG_DIR_ENV)\r
$(MONO_TOOLCHAIN_PATH_ENV)\r
<LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>\r
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\r
<LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_ARGS)</LocalDebuggerCommandArguments>\r
- <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>\r
+ <LocalDebuggerWorkingDirectory>$(MONO_MINI_REGRESSION_TEST_DIR)</LocalDebuggerWorkingDirectory>\r
<LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
$(MONO_CFG_DIR_ENV)\r
$(MONO_TOOLCHAIN_PATH_ENV)\r
<LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>\r
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\r
<LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_ARGS)</LocalDebuggerCommandArguments>\r
- <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>\r
+ <LocalDebuggerWorkingDirectory>$(MONO_MINI_REGRESSION_TEST_DIR)</LocalDebuggerWorkingDirectory>\r
<LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
$(MONO_CFG_DIR_ENV)\r
$(MONO_TOOLCHAIN_PATH_ENV)\r
<LocalDebuggerCommand>$(MONO_EXECUTABLE)</LocalDebuggerCommand>\r
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\r
<LocalDebuggerCommandArguments>$(MONO_MINI_REGRESSION_TEST_ARGS)</LocalDebuggerCommandArguments>\r
- <LocalDebuggerWorkingDirectory>$(MONO_EXECUTABLE_DIR)</LocalDebuggerWorkingDirectory>\r
+ <LocalDebuggerWorkingDirectory>$(MONO_MINI_REGRESSION_TEST_DIR)</LocalDebuggerWorkingDirectory>\r
<LocalDebuggerEnvironment>$(MONO_PATH_ENV)\r
$(MONO_CFG_DIR_ENV)\r
$(MONO_TOOLCHAIN_PATH_ENV)\r
<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