diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 16:49:55 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 16:49:55 -0800 |
| commit | e60233062f0744249b00f8eb0e079851525a21f3 (patch) | |
| tree | cbc2a1a823df0d0696f79b045c7e834bb56037d8 /tools/JavascriptPacker.targets | |
| parent | 07c9f0a7b83d4399aeab5a57ea2ae57ac8459fb6 (diff) | |
| parent | 55e1ef5ec8417f33da4ff83d9083cf7369c8bfff (diff) | |
| download | DotNetOpenAuth-e60233062f0744249b00f8eb0e079851525a21f3.zip DotNetOpenAuth-e60233062f0744249b00f8eb0e079851525a21f3.tar.gz DotNetOpenAuth-e60233062f0744249b00f8eb0e079851525a21f3.tar.bz2 | |
Merge branch 'master' into mvcProjTemplate
Conflicts:
projecttemplates/RelyingPartyLogic/Utilities.cs
src/DotNetOpenAuth.sln
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); |