summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/DotNetOpenAuth/DotNetOpenAuth.proj13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.proj b/src/DotNetOpenAuth/DotNetOpenAuth.proj
index ae1f999..1c07144 100644
--- a/src/DotNetOpenAuth/DotNetOpenAuth.proj
+++ b/src/DotNetOpenAuth/DotNetOpenAuth.proj
@@ -21,7 +21,7 @@
<PrimaryProductOutput>true</PrimaryProductOutput>
</ProjectReference>
<SignDependsOn Include="BuildUnifiedProduct" />
- <DelaySignedAssemblies Include="$(ILMergeOutputContractAssembly)"
+ <DelaySignedAssemblies Include="$(ILMergeOutputContractAssembly)"
Condition=" '$(BuildCodeContractsReferenceAssemblies)' == 'true' "/>
</ItemGroup>
@@ -32,9 +32,9 @@
</PropertyGroup>
<ItemGroup>
- <ILMergeInputAssemblies Include="@(ReferencePath)"
- Condition=" '%(ReferencePath.PrimaryProductOutput)' == 'true' "/>
- <ILMergeInputContractAssemblies Include="@(ILMergeInputAssemblies->'%(RootDir)%(Directory)CodeContracts\%(FileName).Contracts%(Extension)')"
+ <ILMergeProductInputAssemblies Include="@(ReferencePath)"
+ Condition=" '%(ReferencePath.PrimaryProductOutput)' == 'true' "/>
+ <ILMergeInputContractAssemblies Include="@(ILMergeProductInputAssemblies->'%(RootDir)%(Directory)CodeContracts\%(FileName).Contracts%(Extension)')"
Condition=" '%(FileName)' != 'Microsoft.Contracts' "/>
</ItemGroup>
</Target>
@@ -58,12 +58,11 @@
</Target>
<Target Name="BuildUnifiedProductAssembly" DependsOnTargets="BuildILMergeInputs"
- Inputs="@(ILMergeInputAssemblies)" Outputs="$(ILMergeOutputAssembly);$(ILMergeOutputXmlDocs)">
+ Inputs="@(ILMergeProductInputAssemblies);@(ILMergeInputAssemblies)" Outputs="$(ILMergeOutputAssembly);$(ILMergeOutputXmlDocs)">
<MakeDir Directories="$(ILMergeOutputAssemblyDirectory)" />
-
<ILMerge
ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt"
- InputAssemblies="@(ILMergeInputAssemblies)"
+ InputAssemblies="@(ILMergeProductInputAssemblies);@(ILMergeInputAssemblies)"
OutputFile="$(ILMergeOutputAssembly)"
KeyFile="$(PublicKeyFile)"
DelaySign="true"