diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-31 21:35:48 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-31 21:35:48 -0800 |
| commit | 6a1f0a2c033cbdd652aadafcbefbcc8cdbbf2186 (patch) | |
| tree | 976c28423d229e313e968fbf56d950411fc106df /tools/DotNetOpenAuth.targets | |
| parent | daf0b05fba9cae039ee631bbe008f8225c065ffc (diff) | |
| parent | 17e1e88e7f75c86a6d4494dd2cb59eb9a7e75280 (diff) | |
| download | DotNetOpenAuth-6a1f0a2c033cbdd652aadafcbefbcc8cdbbf2186.zip DotNetOpenAuth-6a1f0a2c033cbdd652aadafcbefbcc8cdbbf2186.tar.gz DotNetOpenAuth-6a1f0a2c033cbdd652aadafcbefbcc8cdbbf2186.tar.bz2 | |
Merged master back into v3.4 for VS2010 support.
Merge branch 'master' into v3.4
Diffstat (limited to 'tools/DotNetOpenAuth.targets')
| -rw-r--r-- | tools/DotNetOpenAuth.targets | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets index 235cf4b..9a2c6f9 100644 --- a/tools/DotNetOpenAuth.targets +++ b/tools/DotNetOpenAuth.targets @@ -1,12 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <Import Project="DotNetOpenAuth.Versioning.targets" /> <Import Project="JavascriptPacker.targets" /> <PropertyGroup> <DefineConstants Condition=" '$(SignAssembly)' == 'true' ">$(DefineConstants);StrongNameSigned</DefineConstants> + <DefineConstants Condition=" '$(ClrVersion)' == '4' ">$(DefineConstants);CLR4</DefineConstants> </PropertyGroup> + <ItemGroup Condition=" '$(ClrVersion)' != '4' "> + <Reference Include="Microsoft.Contracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\Microsoft.Contracts.dll</HintPath> + </Reference> + </ItemGroup> + <!-- This forces a build break when Code Contracts are not installed. --> <PropertyGroup> <CompileDependsOn>$(CompileDependsOn);CheckForCodeContracts</CompileDependsOn> @@ -27,7 +35,7 @@ <Target Name="CreatePublicAccessors"> <PropertyGroup> <VSVersionForTargetFramework>v10.0</VSVersionForTargetFramework> - <VSVersionForTargetFramework Condition=" '$(TargetFrameworkVersion)' != 'v4.0' ">v9.0</VSVersionForTargetFramework> + <VSVersionForTargetFramework Condition=" '$(ClrVersion)' != '4' ">v9.0</VSVersionForTargetFramework> </PropertyGroup> <Publicize Condition=" '%(ReferencePath.Shadow)' == 'true' " |