diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-02-16 08:15:24 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-02-16 08:15:24 -0800 |
| commit | 2013075bd0e9d4defc9bd90b64d59a85b4a05269 (patch) | |
| tree | 06706921363678bf2294a0d067940aa37208b904 /tools | |
| parent | 11f057aa2874a538b67d8d95811439a1c86ca2c0 (diff) | |
| download | DotNetOpenAuth-2013075bd0e9d4defc9bd90b64d59a85b4a05269.zip DotNetOpenAuth-2013075bd0e9d4defc9bd90b64d59a85b4a05269.tar.gz DotNetOpenAuth-2013075bd0e9d4defc9bd90b64d59a85b4a05269.tar.bz2 | |
Fixed builds of DotNetOpenAuth that target CLR4.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/DotNetOpenAuth.props | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index 3e826bc..85ae5b7 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -36,8 +36,9 @@ <ItemGroup> <SignDependsOn Include="Build" /> - <ILMergeInputAssemblies Include="$(OutputPath)$(ProductName).dll; - $(ProjectRoot)lib\Microsoft.Contracts.dll; "/> + <ILMergeInputAssemblies Include="$(OutputPath)$(ProductName).dll" /> + <ILMergeInputAssemblies Condition=" '$(ClrVersion)' == '2' " + Include="$(ProjectRoot)lib\Microsoft.Contracts.dll" /> </ItemGroup> <Import Project="$(ProjectRoot)lib\DotNetOpenAuth.BuildTasks.targets" /> |