diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-05-16 21:04:01 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-05-16 21:04:38 -0700 |
| commit | 93e60c1561522cbfd740b3bfb178a8ed082ea5f4 (patch) | |
| tree | d7da75aca8c47f3ecf3e72ca9d1ff943c68b705f | |
| parent | 8b21730d00b5c8393ef055ef49a5f5eca17e3e08 (diff) | |
| download | DotNetOpenAuth-93e60c1561522cbfd740b3bfb178a8ed082ea5f4.zip DotNetOpenAuth-93e60c1561522cbfd740b3bfb178a8ed082ea5f4.tar.gz DotNetOpenAuth-93e60c1561522cbfd740b3bfb178a8ed082ea5f4.tar.bz2 | |
Fixed up code contracts in toolset to be more resilient against the latest (installed) version.
| -rw-r--r-- | tools/DotNetOpenAuth.props | 6 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.targets | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index 9bc6c22..8bc59dd 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -26,8 +26,10 @@ <ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory> <ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(ProductName).dll</ILMergeOutputAssembly> - <!-- Always use our own toolset's copy of Code Contracts for reliably reproducible builds. --> - <CodeContractsInstallDir>$(ProjectRoot)tools\Contracts\</CodeContractsInstallDir> + <!-- Always use our own toolset's copy of Code Contracts for reliably reproducible builds. + Suppress the installed code contracts from importing itself. --> + <DontImportCodeContracts>true</DontImportCodeContracts> + <ImportCodeContractsFromToolset>true</ImportCodeContractsFromToolset> </PropertyGroup> <ItemGroup> diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets index ef93039..8081115 100644 --- a/tools/DotNetOpenAuth.targets +++ b/tools/DotNetOpenAuth.targets @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> - <Import Condition="'$(CodeContractsImported)' != 'true' AND '$(DontImportCodeContracts)' != 'true'" Project="$(CodeContractsInstallDir)\MsBuild\v4.0\Microsoft.CodeContracts.targets"/> <Import Project="DotNetOpenAuth.Versioning.targets" /> <Import Project="JavascriptPacker.targets" /> <UsingTask AssemblyFile="$(ProjectRoot)lib\MSBuild.Community.Tasks.dll" TaskName="ILMerge"/> @@ -16,6 +15,7 @@ </ItemDefinitionGroup> <PropertyGroup> + <CodeContractsInstallDir>$(ProjectRoot)tools\Contracts\</CodeContractsInstallDir> <DefineConstants Condition=" '$(SignAssembly)' == 'true' ">$(DefineConstants);StrongNameSigned</DefineConstants> <DefineConstants Condition=" '$(ClrVersion)' == '4' ">$(DefineConstants);CLR4</DefineConstants> <AssemblySearchPaths>$(AssemblySearchPaths);$(ProjectRoot)lib</AssemblySearchPaths> @@ -119,4 +119,6 @@ <Output TaskParameter="TargetOutputs" ItemName="ResignedAssembliesOutputs"/> </MSBuild> </Target> + + <Import Condition="'$(CodeContractsImported)' != 'true' AND ('$(DontImportCodeContracts)' != 'true' or '$(ImportCodeContractsFromToolset)' == 'true')" Project="$(CodeContractsInstallDir)\MsBuild\v4.0\Microsoft.CodeContracts.targets"/> </Project> |