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 /lib | |
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 'lib')
-rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.dll | bin | 57856 -> 60416 bytes | |||
-rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.pdb | bin | 144896 -> 153088 bytes | |||
-rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.targets | 1 |
3 files changed, 1 insertions, 0 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex 9dfd63e..402d176 100644 --- a/lib/DotNetOpenAuth.BuildTasks.dll +++ b/lib/DotNetOpenAuth.BuildTasks.dll diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb Binary files differindex b27ee26..2fb7f08 100644 --- a/lib/DotNetOpenAuth.BuildTasks.pdb +++ b/lib/DotNetOpenAuth.BuildTasks.pdb diff --git a/lib/DotNetOpenAuth.BuildTasks.targets b/lib/DotNetOpenAuth.BuildTasks.targets index 2b4aebb..fbfe69d 100644 --- a/lib/DotNetOpenAuth.BuildTasks.targets +++ b/lib/DotNetOpenAuth.BuildTasks.targets @@ -27,5 +27,6 @@ <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="AddProjectItems" /> <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="Purge" /> <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="FixupShippingToolSamples" /> + <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="Publicize" /> </Project> |