summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/DotNetOpenAuth.props6
-rw-r--r--tools/DotNetOpenAuth.targets2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
index 942a456..739c94b 100644
--- a/tools/DotNetOpenAuth.props
+++ b/tools/DotNetOpenAuth.props
@@ -21,10 +21,10 @@
<SignAssembly>true</SignAssembly>
<PublicKeyFile Condition="'$(PublicKeyFile)' == ''">$(ProjectRoot)src\official-build-key.pub</PublicKeyFile>
- <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' == ''">$(PublicKeyFile)</AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' == ''">$(ProjectRoot)src\official-build-key.snk</AssemblyOriginatorKeyFile>
<KeyPairContainer Condition="'$(KeyPairContainer)' == ''">DotNetOpenAuth</KeyPairContainer>
- <PublicKeyToken>2780CCD10D57B246</PublicKeyToken>
- <DelaySign>true</DelaySign>
+ <PublicKeyToken>d0acff3d13b42a9d</PublicKeyToken>
+ <DelaySign>false</DelaySign>
<SignedSubPath>signed\</SignedSubPath>
<ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory>
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets
index b09eb14..d9d666c 100644
--- a/tools/DotNetOpenAuth.targets
+++ b/tools/DotNetOpenAuth.targets
@@ -48,7 +48,7 @@
</Publicize>
</Target>
- <Target Name="Sign" DependsOnTargets="@(SignDependsOn)" Outputs="@(SignedDependencies);@(SignedAssemblyTargets)" Condition=" '@(DelaySignedAssemblies)' != '' ">
+ <Target Name="Sign" DependsOnTargets="@(SignDependsOn)" Outputs="@(SignedDependencies);@(SignedAssemblyTargets)" Condition=" '@(DelaySignedAssemblies)' != '' and '$(DelaySign)' == 'true' ">
<!-- Make sure that all dependencies are also signed. -->
<MSBuild Projects="@(ProjectReference)" Targets="Sign" BuildInParallel="$(BuildInParallel)">
<Output TaskParameter="TargetOutputs" ItemName="SignedDependencies"/>