summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-01-07 22:27:28 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2010-01-07 22:30:31 -0800
commit285b3f200e133c9e917bf92e42050aa327e6bcf0 (patch)
treec2de667b53dd7ed7e077b94666ea472fa588d1f4
parent187459a79ff25431a29f64470f7d9e84be87f156 (diff)
downloadDotNetOpenAuth-285b3f200e133c9e917bf92e42050aa327e6bcf0.zip
DotNetOpenAuth-285b3f200e133c9e917bf92e42050aa327e6bcf0.tar.gz
DotNetOpenAuth-285b3f200e133c9e917bf92e42050aa327e6bcf0.tar.bz2
Added a product-wide .props and .targets file.
-rw-r--r--src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln2
-rw-r--r--src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj7
-rw-r--r--src/DotNetOpenAuth/DotNetOpenAuth.csproj11
-rw-r--r--tools/DotNetOpenAuth.props4
-rw-r--r--tools/DotNetOpenAuth.targets13
5 files changed, 25 insertions, 12 deletions
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
index fca41e8..0d0900b 100644
--- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
+++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
@@ -8,6 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\..\build.proj = ..\..\build.proj
..\..\lib\DotNetOpenAuth.BuildTasks.targets = ..\..\lib\DotNetOpenAuth.BuildTasks.targets
..\..\tools\DotNetOpenAuth.Common.Settings.targets = ..\..\tools\DotNetOpenAuth.Common.Settings.targets
+ ..\..\tools\DotNetOpenAuth.props = ..\..\tools\DotNetOpenAuth.props
+ ..\..\tools\DotNetOpenAuth.targets = ..\..\tools\DotNetOpenAuth.targets
..\..\tools\DotNetOpenAuth.Versioning.targets = ..\..\tools\DotNetOpenAuth.Versioning.targets
EndProjectSection
EndProject
diff --git a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
index 7fc479d..d15897b 100644
--- a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
+++ b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
@@ -1,4 +1,5 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\tools\DotNetOpenAuth.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -334,6 +335,6 @@
<ItemGroup>
<Folder Include="OpenId\UI\" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <Import Project="..\..\tools\DotNetOpenAuth.Versioning.targets" />
-</Project> \ No newline at end of file
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="..\..\tools\DotNetOpenAuth.targets" />
+</Project>
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
index 2995374..6f9da18 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\tools\DotNetOpenAuth.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -688,13 +689,5 @@ http://opensource.org/licenses/ms-pl.html
<Content Include="DotNetOpenAuth.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="..\..\tools\DotNetOpenAuth.Versioning.targets" />
- <Import Project="..\..\tools\JavascriptPacker.targets" />
- <PropertyGroup>
- <CompileDependsOn>$(CompileDependsOn);CheckForCodeContracts</CompileDependsOn>
- </PropertyGroup>
- <Target Name="CheckForCodeContracts">
- <Error Condition=" '$(CodeContractsImported)' != 'true' "
- Text="This project requires Code Contracts. Please install from: http://msdn.microsoft.com/en-us/devlabs/dd491992.aspx"/>
- </Target>
+ <Import Project="..\..\tools\DotNetOpenAuth.targets" />
</Project>
diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props
new file mode 100644
index 0000000..1b6d859
--- /dev/null
+++ b/tools/DotNetOpenAuth.props
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+
+</Project> \ No newline at end of file
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets
new file mode 100644
index 0000000..1c831b7
--- /dev/null
+++ b/tools/DotNetOpenAuth.targets
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <Import Project="DotNetOpenAuth.Versioning.targets" />
+ <Import Project="JavascriptPacker.targets" />
+
+ <!-- This forces a build break when Code Contracts are not installed. -->
+ <PropertyGroup>
+ <CompileDependsOn>$(CompileDependsOn);CheckForCodeContracts</CompileDependsOn>
+ </PropertyGroup>
+ <Target Name="CheckForCodeContracts">
+ <Error Condition=" '$(CodeContractsImported)' != 'true' " Text="This project requires Code Contracts. Please install from: http://msdn.microsoft.com/en-us/devlabs/dd491992.aspx" />
+ </Target>
+</Project>