diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-04-05 22:09:59 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-04-05 22:09:59 -0700 |
| commit | 37bd8e7e4e6212f47d3cb4e5b579d1325b3076c5 (patch) | |
| tree | eeb23ef312df13cdd9abbbb7d245bfb931b7234f /src | |
| parent | 3195a1eacfcfb3603ee41c7795ceb899491ed554 (diff) | |
| parent | a5b0f8aa3c456acb0add79f3a98129476e5171b5 (diff) | |
| download | DotNetOpenAuth-37bd8e7e4e6212f47d3cb4e5b579d1325b3076c5.zip DotNetOpenAuth-37bd8e7e4e6212f47d3cb4e5b579d1325b3076c5.tar.gz DotNetOpenAuth-37bd8e7e4e6212f47d3cb4e5b579d1325b3076c5.tar.bz2 | |
Merge branch 'v4.0'
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.proj | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.proj b/src/DotNetOpenAuth/DotNetOpenAuth.proj index 0ae9c17..1116119 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.proj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.proj @@ -57,14 +57,24 @@ Inputs="@(ILMergeProductInputAssemblies);@(ILMergeInputAssemblies)" Outputs="$(ILMergeOutputAssembly);$(ILMergeOutputXmlDocs)"> <MakeDir Directories="$(ILMergeOutputAssemblyDirectory)" /> <Message Text="Merging $(ILMergeOutputAssembly)" Importance="high" /> + + <!-- Arrange for DNOA.Core to appear *last* in the input assemblies list so that its assembly attributes overrides the rest. --> + <ItemGroup> + <ILMergeProductInputCoreAssembly Include="@(ILMergeProductInputAssemblies)" Condition=" '%(Filename)' == 'DotNetOpenAuth.Core' " /> + <ILMergeProductInputAssemblies Remove="@(ILMergeProductInputCoreAssembly)" /> + <ILMergeProductInputAssemblies Include="@(ILMergeProductInputCoreAssembly)" /> + </ItemGroup> + <ILMerge ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt" - InputAssemblies="@(ILMergeProductInputAssemblies);@(ILMergeInputAssemblies)" + InputAssemblies="@(ILMergeInputAssemblies);@(ILMergeProductInputAssemblies)" OutputFile="$(ILMergeOutputAssembly)" SearchDirectories="@(ILMergeSearchDirectories)" KeyFile="$(PublicKeyFile)" DelaySign="true" XmlDocumentation="true" + CopyAttributes="true" + AllowDuplicateAttributes="true" ToolPath="$(ProjectRoot)tools\ILMerge" TargetPlatformVersion="$(ClrVersion).0" TargetPlatformDirectory="$(ILMergeTargetPlatformDirectory)" /> |