projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2707 from lambdageek/dev/monoerror-mono_image_load_module_dynamic
[mono.git]
/
msvc
/
test-metadata.vcxproj
diff --git
a/msvc/test-metadata.vcxproj
b/msvc/test-metadata.vcxproj
index 51e48f432a89758fd09c8da677f5e0e150c1354a..42a5bd68e092bd3c059328a98257b833996cd210 100644
(file)
--- a/
msvc/test-metadata.vcxproj
+++ b/
msvc/test-metadata.vcxproj
@@
-1,5
+1,5
@@
<?xml version="1.0" encoding="utf-8"?>
\r
<?xml version="1.0" encoding="utf-8"?>
\r
-<Project DefaultTargets="Build" ToolsVersion="
4
.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
\r
+<Project DefaultTargets="Build" ToolsVersion="
12
.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
\r
<ItemGroup Label="ProjectConfigurations">
\r
<ProjectConfiguration Include="Debug|Win32">
\r
<Configuration>Debug</Configuration>
\r
<ItemGroup Label="ProjectConfigurations">
\r
<ProjectConfiguration Include="Debug|Win32">
\r
<Configuration>Debug</Configuration>
\r
@@
-27,22
+27,22
@@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
\r
<ConfigurationType>Application</ConfigurationType>
\r
<CharacterSet>Unicode</CharacterSet>
\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
\r
<ConfigurationType>Application</ConfigurationType>
\r
<CharacterSet>Unicode</CharacterSet>
\r
- <PlatformToolset>v1
1
0</PlatformToolset>
\r
+ <PlatformToolset>v1
2
0</PlatformToolset>
\r
</PropertyGroup>
\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
\r
<ConfigurationType>Application</ConfigurationType>
\r
<CharacterSet>Unicode</CharacterSet>
\r
</PropertyGroup>
\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
\r
<ConfigurationType>Application</ConfigurationType>
\r
<CharacterSet>Unicode</CharacterSet>
\r
- <PlatformToolset>v1
1
0</PlatformToolset>
\r
+ <PlatformToolset>v1
2
0</PlatformToolset>
\r
</PropertyGroup>
\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
\r
<ConfigurationType>Application</ConfigurationType>
\r
<CharacterSet>Unicode</CharacterSet>
\r
</PropertyGroup>
\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
\r
<ConfigurationType>Application</ConfigurationType>
\r
<CharacterSet>Unicode</CharacterSet>
\r
- <PlatformToolset>v1
1
0</PlatformToolset>
\r
+ <PlatformToolset>v1
2
0</PlatformToolset>
\r
</PropertyGroup>
\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
\r
<ConfigurationType>Application</ConfigurationType>
\r
<CharacterSet>Unicode</CharacterSet>
\r
</PropertyGroup>
\r
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
\r
<ConfigurationType>Application</ConfigurationType>
\r
<CharacterSet>Unicode</CharacterSet>
\r
- <PlatformToolset>v1
1
0</PlatformToolset>
\r
+ <PlatformToolset>v1
2
0</PlatformToolset>
\r
</PropertyGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
\r
<ImportGroup Label="ExtensionSettings">
\r
</PropertyGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
\r
<ImportGroup Label="ExtensionSettings">
\r
@@
-62,23
+62,23
@@
<PropertyGroup Label="UserMacros" />
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
<PropertyGroup Label="UserMacros" />
\r
<PropertyGroup>
\r
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)
_$(Configuration)/bin
\</OutDir>
\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)
_$(Configuration)/obj/$(ProjectName
)\</IntDir>
\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)
\bin\$(Configuration)
\</OutDir>
\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)
\obj\$(ProjectName)\$(Configuration
)\</IntDir>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)
_$(Configuration)/bin
\</OutDir>
\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)
_$(Configuration)/obj/$(ProjectName
)\</IntDir>
\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)
\bin\$(Configuration)
\</OutDir>
\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)
\obj\$(ProjectName)\$(Configuration
)\</IntDir>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)
_$(Configuration)/bin
\</OutDir>
\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)
_$(Configuration)/obj/$(ProjectName
)\</IntDir>
\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)
\bin\$(Configuration)
\</OutDir>
\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)
\obj\$(ProjectName)\$(Configuration
)\</IntDir>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
\r
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)
_$(Configuration)/bin
\</OutDir>
\r
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)
_$(Configuration)/obj/$(ProjectName
)\</IntDir>
\r
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)
\bin\$(Configuration)
\</OutDir>
\r
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)
\obj\$(ProjectName)\$(Configuration
)\</IntDir>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
\r
</PropertyGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
\r
<ClCompile>
\r
<Optimization>Disabled</Optimization>
\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
\r
</PropertyGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
\r
<ClCompile>
\r
<Optimization>Disabled</Optimization>
\r
- <AdditionalIncludeDirectories>
..\..;..\..\VSDependancies\include\glib-2.0\glib;..\..\VSDependancies\include;C:\cygwin\opt\mono\
include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>
$(SolutionDir)..\eglib\src;$(SolutionDir)
include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<MinimalRebuild>true</MinimalRebuild>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<MinimalRebuild>true</MinimalRebuild>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
@@
-97,7
+97,7
@@
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
</ProjectReference>
\r
<Link>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
</ProjectReference>
\r
<Link>
\r
- <AdditionalDependencies>
glib-2.0.lib;gmodule-2.0.lib;ws2_32.lib;gthread-2.0.lib;gobject-2.0.lib;libmono
.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
+ <AdditionalDependencies>
ws2_32
.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
\r
<AdditionalLibraryDirectories>$(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
<GenerateDebugInformation>true</GenerateDebugInformation>
\r
<SubSystem>Console</SubSystem>
\r
<AdditionalLibraryDirectories>$(Platform)_$(Configuration)/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
<GenerateDebugInformation>true</GenerateDebugInformation>
\r
<SubSystem>Console</SubSystem>
\r
@@
-117,6
+117,7
@@
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
+ <AdditionalIncludeDirectories>$(SolutionDir)..\eglib\src;$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
</ClCompile>
\r
<ProjectReference>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
</ClCompile>
\r
<ProjectReference>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
@@
-139,7
+140,7
@@
</Midl>
\r
<ClCompile>
\r
<Optimization>Disabled</Optimization>
\r
</Midl>
\r
<ClCompile>
\r
<Optimization>Disabled</Optimization>
\r
- <AdditionalIncludeDirectories>
..\..;..\..\VSDependancies\include\glib-2.0\glib;..\..\VSDependancies\include;C:\cygwin\opt\mono\
include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>
$(SolutionDir)..\eglib\src;$(SolutionDir)
include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<MinimalRebuild>true</MinimalRebuild>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<MinimalRebuild>true</MinimalRebuild>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
@@
-178,6
+179,7
@@
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
</PrecompiledHeader>
\r
<WarningLevel>Level3</WarningLevel>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
+ <AdditionalIncludeDirectories>$(SolutionDir)..\eglib\src;$(SolutionDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
</ClCompile>
\r
<ProjectReference>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
</ClCompile>
\r
<ProjectReference>
\r
<LinkLibraryDependencies>false</LinkLibraryDependencies>
\r
@@
-198,6
+200,10
@@
<ProjectReference Include="libmono.vcxproj">
\r
<Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
<ProjectReference Include="libmono.vcxproj">
\r
<Project>{cb0d9e92-293c-439c-9ac7-c5f59b6e0771}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
+ <Private>false</Private>
\r
+ <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
\r
+ <LinkLibraryDependencies>true</LinkLibraryDependencies>
\r
+ <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
\r
</ProjectReference>
\r
</ItemGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r
</ProjectReference>
\r
</ItemGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
\r