Skip to content

Commit

Permalink
Fix cecil strongname build failure with arcade
Browse files Browse the repository at this point in the history
Work around dotnet/arcade#2321
  • Loading branch information
sbomer committed May 2, 2019
1 parent 3fc4e6d commit 3377e5e
Showing 1 changed file with 18 additions and 7 deletions.
25 changes: 18 additions & 7 deletions external/Mono.Cecil.overrides
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
<Project>

<!-- Cecil's Directory.Build.Props imports this file if it
exists. We use it to import our own Directory.Build.props. -->
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
<!-- Cecil sets PublicSign on windows, but we always want to
PublicSign. -->
<PublicSign>true</PublicSign>
</PropertyGroup>

<PropertyGroup Condition=" '$(ArcadeBuild)' == 'true' ">
<!-- Work around
https://github.com/dotnet/arcade/issues/2321. This disables
arcade's selection of AssemblyOriginatorKeyFile based on the
StrongNameKeyId, since we want to use cecil's key file. -->
<StrongNameKeyId></StrongNameKeyId>
<PublicKey>unknown</PublicKey>
<PublicKeyToken>unknown</PublicKeyToken>
<NoWarn>$(NoWarn);0618</NoWarn>
<!-- Signing properties from cecil are overridden by Arcade
because cecil imports the .NET SDK (and hence Arcade) in a
nonstandard way, so set them again here. -->
<SignAssembly>true</SignAssembly>
<PublicSign>true</PublicSign>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)cecil/cecil.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

</Project>
</Project>

0 comments on commit 3377e5e

Please sign in to comment.