Permalink
Browse files

Fixed use of ILMerge so that it doesn't make all DNOA types internal.

  • Loading branch information...
1 parent a9c11f7 commit dcf17d46520ee22d1ab3a9681a3de231c1534bf9 @AArnott AArnott committed Sep 20, 2011
Showing with 7 additions and 7 deletions.
  1. +1 −0 ILMergeInternalizeExceptions.txt
  2. +6 −7 src/DotNetOpenAuth/DotNetOpenAuth.proj
@@ -0,0 +1 @@
+DotNetOpenAuth.*
@@ -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"

0 comments on commit dcf17d4

Please sign in to comment.