summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/DotNetOpenAuth/DotNetOpenAuth.proj9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.proj b/src/DotNetOpenAuth/DotNetOpenAuth.proj
index 8f6d1bd..5b64e89 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.proj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.proj
@@ -44,13 +44,18 @@
<OrderedMergeInputAssemblies Include="@(ILMergeProductInputAssemblies)" Condition=" '%(ILMergeProductInputAssemblies.FileName)' == 'DotNetOpenAuth.Core' " />
</ItemGroup>
+ <PropertyGroup>
+ <ILMergeKeyFile Condition=" '$(DelaySign)' == 'true' ">$(PublicKeyFile)</ILMergeKeyFile>
+ <ILMergeKeyFile Condition=" '$(DelaySign)' != 'true' ">$(AssemblyOriginatorKeyFile)</ILMergeKeyFile>
+ </PropertyGroup>
+
<ILMerge
ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt"
InputAssemblies="@(OrderedMergeInputAssemblies)"
OutputFile="$(ILMergeOutputAssembly)"
SearchDirectories="@(ILMergeSearchDirectories)"
- KeyFile="$(PublicKeyFile)"
- DelaySign="true"
+ KeyFile="$(ILMergeKeyFile)"
+ DelaySign="$(DelaySign)"
XmlDocumentation="true"
CopyAttributes="true"
AllowDuplicateAttributes="true"