diff options
| author | csharptest <roger@csharptest.net> | 2011-10-01 15:10:05 -0500 |
|---|---|---|
| committer | rogerk <devnull@localhost> | 2011-10-01 15:10:05 -0500 |
| commit | b5a7ed241127412d4d9c22c79b3961239bef49e8 (patch) | |
| tree | 4ce8fc01ec3208751050c347d54c41eef8e545b3 /src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj | |
| parent | 4ad552692f737dc27e0ea7829eb8f771b852013c (diff) | |
| download | protobuf-b5a7ed241127412d4d9c22c79b3961239bef49e8.tar.gz protobuf-b5a7ed241127412d4d9c22c79b3961239bef49e8.tar.bz2 protobuf-b5a7ed241127412d4d9c22c79b3961239bef49e8.zip | |
Conditional extensions in serialization, Removed usages of extensions methods from unit tests
Diffstat (limited to 'src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj')
| -rw-r--r-- | src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj index afd66a9f..457b1667 100644 --- a/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj +++ b/src/ProtocolBuffers.Serialization/ProtocolBuffers.Serialization.csproj @@ -34,6 +34,7 @@ <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <DefineConstants>TRACE;NET20;</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -42,7 +43,7 @@ <OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>$(DefineConstants)DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoStdLib>true</NoStdLib>
@@ -54,7 +55,7 @@ <OutputPath>bin\Release\</OutputPath>
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>$(DefineConstants)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoStdLib>true</NoStdLib>
@@ -67,7 +68,7 @@ <OutputPath>bin\Debug_Silverlight2\</OutputPath>
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
- <DefineConstants>DEBUG;TRACE;SILVERLIGHT2</DefineConstants>
+ <DefineConstants>$(DefineConstants)DEBUG;SILVERLIGHT2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoStdLib>true</NoStdLib>
@@ -79,7 +80,7 @@ <OutputPath>bin\Release_Silverlight2\</OutputPath>
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591, 1570, 1571, 1572, 1573, 1574</NoWarn>
- <DefineConstants>TRACE;SILVERLIGHT2</DefineConstants>
+ <DefineConstants>$(DefineConstants)SILVERLIGHT2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoStdLib>true</NoStdLib>
@@ -89,12 +90,7 @@ <Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Xml" />
- <!-- Only for 2.x compatibility of extension methods -->
- <Reference Include="System.Core">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\lib\System.Core\System.Core.dll</HintPath>
- <Private>False</Private>
- </Reference>
+ <Reference Include="System.Core" Condition="'$(TargetFrameworkVersion)' != 'v2.0'" />
</ItemGroup>
<ItemGroup>
<Compile Include="Extensions.cs" />
|