diff options
| -rw-r--r-- | lib/Ionic.Zip.Reduced.dll | bin | 0 -> 199680 bytes | |||
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.proj | 4 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.Product.props | 7 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.props | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/lib/Ionic.Zip.Reduced.dll b/lib/Ionic.Zip.Reduced.dll Binary files differnew file mode 100644 index 0000000..da07436 --- /dev/null +++ b/lib/Ionic.Zip.Reduced.dll diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.proj b/src/DotNetOpenAuth/DotNetOpenAuth.proj index 6b8ff16..ae1f999 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.proj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.proj @@ -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)" /> 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> |