summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2009-06-25 00:22:36 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2009-06-25 00:22:36 -0700
commitf3ce247dfaa965011c7f8417d00e0fa3dfad4a35 (patch)
tree1e25cc04c3b061ec0a62209d8c7b8103b8692403 /tools
parentd42868ba3e29c50b47d98995bab376cb2ad1d574 (diff)
downloadDotNetOpenAuth-f3ce247dfaa965011c7f8417d00e0fa3dfad4a35.zip
DotNetOpenAuth-f3ce247dfaa965011c7f8417d00e0fa3dfad4a35.tar.gz
DotNetOpenAuth-f3ce247dfaa965011c7f8417d00e0fa3dfad4a35.tar.bz2
We now delay-sign DNOA and the test assembly. We sign the product .dll when building layouts.
Diffstat (limited to 'tools')
-rw-r--r--tools/DotNetOpenAuth.Common.Settings.targets25
-rw-r--r--tools/DotNetOpenAuth.Versioning.targets5
2 files changed, 22 insertions, 8 deletions
diff --git a/tools/DotNetOpenAuth.Common.Settings.targets b/tools/DotNetOpenAuth.Common.Settings.targets
index 3257583..951366e 100644
--- a/tools/DotNetOpenAuth.Common.Settings.targets
+++ b/tools/DotNetOpenAuth.Common.Settings.targets
@@ -1,11 +1,24 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="InitializeProps">
<PropertyGroup>
<ProductName>DotNetOpenAuth</ProductName>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)</ProjectRoot>
- <OutputPath>$(ProjectRoot)\bin\$(Configuration)</OutputPath>
- <DocOutputPath>$(ProjectRoot)\doc</DocOutputPath>
- <IntermediatePath>$(ProjectRoot)\obj\$(Configuration)</IntermediatePath>
- <ToolsDir>$(ProjectRoot)\tools</ToolsDir>
+ <DropsRoot>$(ProjectRoot)\drops\$(Configuration)\</DropsRoot>
+ <OutputPath>$(ProjectRoot)\bin\$(Configuration)\</OutputPath>
+ <DocOutputPath>$(ProjectRoot)\doc\</DocOutputPath>
+ <IntermediatePath>$(ProjectRoot)\obj\$(Configuration)\</IntermediatePath>
+ <ToolsDir>$(ProjectRoot)\tools\</ToolsDir>
+ <PublicKeyFile>$(ProjectRoot)\src\official-build-key.pub</PublicKeyFile>
+ <KeyPairContainer>DotNetOpenAuth</KeyPairContainer>
+ <PublicKeyToken>2780CCD10D57B246</PublicKeyToken>
</PropertyGroup>
-</Project> \ No newline at end of file
+
+ <Import Project="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.targets" />
+
+ <Target Name="InitializeProps">
+ <CheckAdminRights>
+ <Output TaskParameter="IsElevated" PropertyName="IsElevated" />
+ </CheckAdminRights>
+ <Message Importance="High" Text="IsElevated = $(IsElevated)" />
+ </Target>
+</Project>
diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets
index f4b12b0..2ffcb82 100644
--- a/tools/DotNetOpenAuth.Versioning.targets
+++ b/tools/DotNetOpenAuth.Versioning.targets
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
- <!-- Import this .targets file to automaticaly generate AssemblyVersion
+ <!-- Import this .targets file to automatically generate AssemblyVersion
attribute according to DotNetOpenAuth convention. -->
<PropertyGroup>
<ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..</ProjectRoot>
<VersionCsFile>$(ProjectRoot)\obj\$(Configuration)\$(AssemblyName).Version.cs</VersionCsFile>
</PropertyGroup>
- <Import Project="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.targets" />
+ <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="GetBuildVersion" />
+ <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="CompareFiles" />
<UsingTask AssemblyFile="$(ProjectRoot)\lib\MSBuild.Community.Tasks.dll" TaskName="AssemblyInfo"/>
<Target Name="GetBuildVersion">