summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2011-10-08 16:21:43 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2011-10-09 06:02:24 -0700
commit8d54af386194defdc1d26fded5b7c60ddd78904e (patch)
treee29b9006821797a749ca5aa4f3b462334ef31eb9 /tools
parent97293f3fdef0f4700a9eff2af1ae7d41b6ddee8e (diff)
downloadDotNetOpenAuth-8d54af386194defdc1d26fded5b7c60ddd78904e.zip
DotNetOpenAuth-8d54af386194defdc1d26fded5b7c60ddd78904e.tar.gz
DotNetOpenAuth-8d54af386194defdc1d26fded5b7c60ddd78904e.tar.bz2
Fixed handling of targeting .NET 4.5
Diffstat (limited to 'tools')
-rw-r--r--tools/DotNetOpenAuth.props4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
index 7c2203f..d23f5f2 100644
--- a/tools/DotNetOpenAuth.props
+++ b/tools/DotNetOpenAuth.props
@@ -15,8 +15,8 @@
<Zip7ToolPath>$(ToolsDir)7-Zip.x86\</Zip7ToolPath>
<NuGetToolPath>$(ToolsDir)NuGet\</NuGetToolPath>
<ZipFormat Condition=" '$(ZipFormat)' == '' ">.7z</ZipFormat>
- <ClrVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">4</ClrVersion>
- <ClrVersion Condition=" '$(TargetFrameworkVersion)' != 'v4.0' ">2</ClrVersion>
+ <ClrVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' or '$(TargetFrameworkVersion)' == 'v4.5' ">4</ClrVersion>
+ <ClrVersion Condition=" '$(ClrVersion)' == '' ">2</ClrVersion>
<BuildCodeContractsReferenceAssemblies>false</BuildCodeContractsReferenceAssemblies>
<SignAssembly>true</SignAssembly>