diff options
Diffstat (limited to 'src/DotNetOpenAuth/DotNetOpenAuth.proj')
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.proj | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.proj b/src/DotNetOpenAuth/DotNetOpenAuth.proj index 8c9610d..342f65c 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.proj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.proj @@ -4,7 +4,6 @@ <PropertyGroup> <SuppressBuildTarget>true</SuppressBuildTarget> - <AddContractsAssemblyForDelaySigning>false</AddContractsAssemblyForDelaySigning> </PropertyGroup> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.props" /> @@ -21,38 +20,15 @@ <PrimaryProductOutput Condition=" '%(MergeIntoUnifiedAssembly)' != 'false' ">true</PrimaryProductOutput> </ProjectReference> <SignDependsOn Include="BuildUnifiedProduct" /> - <DelaySignedAssemblies Include="$(ILMergeOutputContractAssembly)" - Condition=" '$(BuildCodeContractsReferenceAssemblies)' == 'true' "/> </ItemGroup> <Target Name="BuildILMergeInputs" DependsOnTargets="ResolveReferences"> <ItemGroup> <ILMergeProductInputAssemblies Include="@(ReferencePath)" Condition=" '%(ReferencePath.PrimaryProductOutput)' == 'true' "/> - <ILMergeInputContractAssemblies Include="@(ILMergeProductInputAssemblies->'%(RootDir)%(Directory)CodeContracts\%(FileName).Contracts%(Extension)')" - Condition=" '%(FileName)' != 'Microsoft.Contracts' "/> </ItemGroup> </Target> - <Target Name="BuildUnifiedContractAssembly" DependsOnTargets="BuildILMergeInputs" - Condition=" '$(BuildCodeContractsReferenceAssemblies)' == 'true' " - Inputs="@(ILMergeInputContractAssemblies)" Outputs="$(ILMergeOutputContractAssembly)"> - - <MakeDir Directories="$(ILMergeOutputContractAssemblyDirectory)" /> - - <Message Text="Merging $(ILMergeOutputContractAssembly)" Importance="high" /> - <ILMerge - ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt" - InputAssemblies="@(ILMergeInputContractAssemblies)" - OutputFile="$(ILMergeOutputContractAssembly)" - SearchDirectories="$(OutputPath);@(ILMergeSearchDirectories)" - KeyFile="$(PublicKeyFile)" - DelaySign="true" - ToolPath="$(ProjectRoot)tools\ILMerge" - TargetPlatformVersion="$(ClrVersion).0" - TargetPlatformDirectory="$(ILMergeTargetPlatformDirectory)" /> - </Target> - <Target Name="BuildUnifiedProductAssembly" DependsOnTargets="BuildILMergeInputs" Inputs="@(ILMergeProductInputAssemblies);@(ILMergeInputAssemblies)" Outputs="$(ILMergeOutputAssembly);$(ILMergeOutputXmlDocs)"> <MakeDir Directories="$(ILMergeOutputAssemblyDirectory)" /> @@ -83,7 +59,7 @@ TargetPlatformDirectory="$(ILMergeTargetPlatformDirectory)" /> </Target> - <Target Name="BuildUnifiedProduct" DependsOnTargets="BuildUnifiedProductAssembly;BuildUnifiedContractAssembly" /> + <Target Name="BuildUnifiedProduct" DependsOnTargets="BuildUnifiedProductAssembly" /> <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" /> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" /> |