diff options
| author | Jon Skeet <skeet@pobox.com> | 2010-12-14 18:43:32 +0000 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2010-12-14 18:43:32 +0000 |
| commit | f82a09da05e0650a1d532f42567686d4ba5a6106 (patch) | |
| tree | 1f09c31a134aed69b3cd508dc80335b35a5fc6cd /src/ProtocolBuffers | |
| parent | 1738462b7fbaf806a3bc28b52b61a037b45a73f4 (diff) | |
| parent | a66c2031f3d557b67f47196d7e68d085558e1e4d (diff) | |
| download | protobuf-f82a09da05e0650a1d532f42567686d4ba5a6106.tar.gz protobuf-f82a09da05e0650a1d532f42567686d4ba5a6106.tar.bz2 protobuf-f82a09da05e0650a1d532f42567686d4ba5a6106.zip | |
Merge from master
Diffstat (limited to 'src/ProtocolBuffers')
| -rw-r--r-- | src/ProtocolBuffers/ProtocolBuffers.csproj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ProtocolBuffers/ProtocolBuffers.csproj b/src/ProtocolBuffers/ProtocolBuffers.csproj index a5759668..715afe87 100644 --- a/src/ProtocolBuffers/ProtocolBuffers.csproj +++ b/src/ProtocolBuffers/ProtocolBuffers.csproj @@ -199,8 +199,10 @@ <Install>true</Install> </BootstrapperPackage> </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(Configuration)' != 'Silverlight2' " /> - <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" Condition=" '$(Configuration)' == 'Silverlight2' " /> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(Configuration)' == 'Debug' " /> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(Configuration)' == 'Release' " /> + <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" Condition=" '$(Configuration)' == 'Debug_Silverlight2' " /> + <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v2.0\Microsoft.Silverlight.CSharp.targets" Condition=" '$(Configuration)' == 'Release_Silverlight2' " /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> |