summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2009-11-15 20:31:04 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2009-11-15 20:31:04 -0800
commitcb3d5ea631f5db26ea72c0783fe2f70c43d02aa5 (patch)
tree83330002bf9587f5f2696eb63090013adb038951
parent7090db5cb1f94870a566f1d77f74cb2258625b90 (diff)
downloadDotNetOpenAuth-cb3d5ea631f5db26ea72c0783fe2f70c43d02aa5.zip
DotNetOpenAuth-cb3d5ea631f5db26ea72c0783fe2f70c43d02aa5.tar.gz
DotNetOpenAuth-cb3d5ea631f5db26ea72c0783fe2f70c43d02aa5.tar.bz2
Fixed consumption of $(ILMergeOutputAssemblyDirectory).
-rw-r--r--build.proj8
1 files changed, 4 insertions, 4 deletions
diff --git a/build.proj b/build.proj
index bc182c5..62884e5 100644
--- a/build.proj
+++ b/build.proj
@@ -4,7 +4,7 @@
<AutomatedBuild>true</AutomatedBuild>
<SolutionPath>$(ProjectRoot)src\$(ProductName).sln</SolutionPath>
<ILMergeOutputAssemblyDirectory>$(OutputPath)\unified\</ILMergeOutputAssemblyDirectory>
- <ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)\$(ProductName).dll</ILMergeOutputAssembly>
+ <ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(ProductName).dll</ILMergeOutputAssembly>
<ProjectTemplatesLayoutPath>$(IntermediatePath)projecttemplates\</ProjectTemplatesLayoutPath>
</PropertyGroup>
@@ -184,7 +184,7 @@
<!-- Add external libraries -->
<!-- Include the unified, signed version of the library -->
<ProjectTemplateLibraries Include="$(ILMergeOutputAssembly)" />
- <ProjectTemplateLibraries Include="$(ILMergeOutputAssemblyDirectory)\$(ProductName).pdb" />
+ <ProjectTemplateLibraries Include="$(ILMergeOutputAssemblyDirectory)$(ProductName).pdb" />
<ProjectTemplateLibraries Include="$(OutputPath)\$(ProductName).Contracts.dll" />
<!-- ... and log4net -->
<ProjectTemplateLibraries Include="$(ProjectRoot)lib\log4net.dll" />
@@ -311,7 +311,7 @@
"
Exclude="$(ProjectRoot)Doc\README.*.html;" />
<DropBinSourceFiles Include="
- $(ILMergeOutputAssemblyDirectory)\$(ProductName).???;
+ $(ILMergeOutputAssemblyDirectory)$(ProductName).???;
$(OutputPath)\**\$(ProductName).resources.dll;
$(OutputPath)\$(ProductName).xml;
$(OutputPath)\$(ProductName).Contracts.???;
@@ -321,7 +321,7 @@
<DropLibSourceFiles Include="
$(ProjectRoot)Lib\log4net.*;
" />
- <DropProjectTemplatesSourceFiles Include="$(ProjectTemplatesLayoutPath)\*.zip" />
+ <DropProjectTemplatesSourceFiles Include="$(ProjectTemplatesLayoutPath)*.zip" />
<DropSamplesSourceFiles Include="$(ProjectRoot)Samples\**" Exclude="
$(ProjectRoot)**\obj\**;
$(ProjectRoot)**\*.sln.cache;