Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit dcf17d46520ee22d1ab3a9681a3de231c1534bf9 1 parent a9c11f7
@AArnott AArnott authored
View
1  ILMergeInternalizeExceptions.txt
@@ -0,0 +1 @@
+DotNetOpenAuth.*
View
13 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"
Please sign in to comment.
Something went wrong with that request. Please try again.