Fixed build breaks after code contract reference assembly generation removal.

Author: AArnott

lib/Ionic.Zip.Reduced.dll

@@ -21,7 +21,8 @@
 			<PrimaryProductOutput>true</PrimaryProductOutput>
 		</ProjectReference>
 		<SignDependsOn Include="BuildUnifiedProduct" />
-		<DelaySignedAssemblies Include="$(ILMergeOutputContractAssembly)" />
+		<DelaySignedAssemblies Include="$(ILMergeOutputContractAssembly)" 
+		                       Condition=" '$(BuildCodeContractsReferenceAssemblies)' == 'true' "/>
 	</ItemGroup>
 
 	<Target Name="BuildILMergeInputs" DependsOnTargets="ResolveReferences">
@@ -39,6 +40,7 @@
 	</Target>
 
 	<Target Name="BuildUnifiedContractAssembly"	 DependsOnTargets="BuildILMergeInputs"
+					Condition=" '$(BuildCodeContractsReferenceAssemblies)' == 'true' "
 					Inputs="@(ILMergeInputContractAssemblies)" Outputs="$(ILMergeOutputContractAssembly)">
 
 		<MakeDir Directories="$(ILMergeOutputContractAssemblyDirectory)" />

src/DotNetOpenAuth/DotNetOpenAuth.proj

@@ -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>

tools/DotNetOpenAuth.Product.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>