diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-09-19 08:00:30 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-09-19 08:00:30 -0700 |
| commit | a9c11f7b6d6fbe380ebcc2c038669ea923c23f97 (patch) | |
| tree | c8049e61d88ed46e23db47dc5de6f995cffabac0 /tools | |
| parent | 4d29768d38038ba6b9a0e7828c259a7f6fdc0158 (diff) | |
| download | DotNetOpenAuth-a9c11f7b6d6fbe380ebcc2c038669ea923c23f97.zip DotNetOpenAuth-a9c11f7b6d6fbe380ebcc2c038669ea923c23f97.tar.gz DotNetOpenAuth-a9c11f7b6d6fbe380ebcc2c038669ea923c23f97.tar.bz2 | |
Fixed build breaks after code contract reference assembly generation removal.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/DotNetOpenAuth.Product.props | 7 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.props | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/DotNetOpenAuth.Product.props b/tools/DotNetOpenAuth.Product.props index f5c919b..edb94e4 100644 --- a/tools/DotNetOpenAuth.Product.props +++ b/tools/DotNetOpenAuth.Product.props @@ -42,18 +42,19 @@ http://opensource.org/licenses/ms-pl.html <CodeContractsEmitXMLDocs>True</CodeContractsEmitXMLDocs> <CodeContractsRedundantAssumptions>False</CodeContractsRedundantAssumptions> <CodeContractsExtraRewriteOptions /> + + <CodeContractsReferenceAssembly Condition=" '$(BuildCodeContractsReferenceAssemblies)' == 'true' ">Build</CodeContractsReferenceAssembly> + <CodeContractsReferenceAssembly Condition=" '$(BuildCodeContractsReferenceAssemblies)' != 'true' ">DoNotBuild</CodeContractsReferenceAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(CodeContractsRewritingEnabled)' != 'true' "> <CodeContractsAssemblyMode>0</CodeContractsAssemblyMode> <CodeContractsEnableRuntimeChecking>False</CodeContractsEnableRuntimeChecking> - <CodeContractsReferenceAssembly Condition=" '$(Configuration)' == 'Release' ">Build</CodeContractsReferenceAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(CodeContractsRewritingEnabled)' == 'true' "> <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode> <CodeContractsEnableRuntimeChecking>True</CodeContractsEnableRuntimeChecking> - <CodeContractsReferenceAssembly>Build</CodeContractsReferenceAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> @@ -81,7 +82,7 @@ http://opensource.org/licenses/ms-pl.html <ItemGroup> <DelaySignedAssemblies Include="$(OutputPath)CodeContracts\$(AssemblyName).Contracts.dll" - Condition=" '$(AddContractsAssemblyForDelaySigning)' != 'false' "/> + Condition=" '$(BuildCodeContractsReferenceAssemblies)' == 'true' and '$(AddContractsAssemblyForDelaySigning)' != 'false' "/> </ItemGroup> <ItemGroup> diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index 33ba4c1..7c2203f 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -17,6 +17,7 @@ <ZipFormat Condition=" '$(ZipFormat)' == '' ">.7z</ZipFormat> <ClrVersion Condition=" '$(TargetFrameworkVersion)' == 'v4.0' ">4</ClrVersion> <ClrVersion Condition=" '$(TargetFrameworkVersion)' != 'v4.0' ">2</ClrVersion> + <BuildCodeContractsReferenceAssemblies>false</BuildCodeContractsReferenceAssemblies> <SignAssembly>true</SignAssembly> <PublicKeyFile Condition="'$(PublicKeyFile)' == ''">$(ProjectRoot)src\official-build-key.pub</PublicKeyFile> |