diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 09:13:00 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 09:13:00 -0800 |
| commit | 1e74844e63bd444b6848ca526a2c18b4d32e71cb (patch) | |
| tree | 0e801d5065957d2441a51ed37141eafdaa5aebff /tools/JavascriptPacker.targets | |
| parent | 7e774c857642f27c360ffab07cbbf66bf3d08eea (diff) | |
| parent | e30890023e669748386a43568cdba120e4d6f058 (diff) | |
| download | DotNetOpenAuth-1e74844e63bd444b6848ca526a2c18b4d32e71cb.zip DotNetOpenAuth-1e74844e63bd444b6848ca526a2c18b4d32e71cb.tar.gz DotNetOpenAuth-1e74844e63bd444b6848ca526a2c18b4d32e71cb.tar.bz2 | |
Merge branch 'master' into master-Dev10
Conflicts:
samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
src/DotNetOpenAuth/DotNetOpenAuth.csproj
Diffstat (limited to 'tools/JavascriptPacker.targets')
| -rw-r--r-- | tools/JavascriptPacker.targets | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/JavascriptPacker.targets b/tools/JavascriptPacker.targets index 2640fd5..2db13a8 100644 --- a/tools/JavascriptPacker.targets +++ b/tools/JavascriptPacker.targets @@ -1,12 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> - <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot> - </PropertyGroup> - - <Import Project="$(ProjectRoot)lib\DotNetOpenAuth.BuildTasks.targets" /> - - <PropertyGroup> <PackJs Condition="'$(PackJs)' == '' and '$(Configuration)' == 'Release'">true</PackJs> <PrepareResourcesDependsOn Condition="'$(PackJs)' == 'true'"> $(PrepareResourcesDependsOn); |