diff options
| author | Sven Boemer <sbomer@gmail.com> | 2019-05-03 10:20:04 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2019-05-03 10:20:04 +0300 |
| commit | 6280036e1f428c543445a638c22e5c2d8c744199 (patch) | |
| tree | cb93b327a43fda14747258688a764ec82efc6f68 /external | |
| parent | cb3c1e82f4b5de712257b3e3a8a31ed0ae4b9cc2 (diff) | |
Use SDK-style projects (#471)
* Use SDK-style projects for linker and tests
* Clean up linker project file
Separate out the illink build properties from the monolinker
properties. Also disable building illink for net46 on unix/core
msbuild, which doesn't work due to missing reference assemblies. This
check is more specific than what we used to have, so that illink can
potentially be built with the mono runtime.
Building this project with "nuget restore" and "msbuild" will only
work with the default configuration because nuget restore does not set
the configuration and would see a different target framework from msbuild.
* Fix assembly title and description for illink
* Fix debug and optimization info for illink configurations
* Remove references to old illink solutions
* Update cecil submodule to latest mono/cecil
* Fix typo
* Update cecil configurations in illink.sln
* Fix cecil strongname build failure with arcade
Work around https://github.com/dotnet/arcade/issues/2321
* Remove unused configs from monolinker.sln
Also add a missing release config for cecil
* Set PublicKey and PublicKeyToken in cecil overrides
Diffstat (limited to 'external')
| -rw-r--r-- | external/Mono.Cecil.overrides | 28 | ||||
| m--------- | external/cecil | 0 |
2 files changed, 21 insertions, 7 deletions
diff --git a/external/Mono.Cecil.overrides b/external/Mono.Cecil.overrides index 73e5fa4b4..d49a1bef8 100644 --- a/external/Mono.Cecil.overrides +++ b/external/Mono.Cecil.overrides @@ -1,13 +1,27 @@ <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>CecilStrongNameKey</StrongNameKeyId> + <!-- PublicKey and PublicKeyToken are only consumed by arcade's + InternalsVisibleTo generator. We don't use this, but we set + these properties anyway to avoid hitting an arcade check. --> + <PublicKey>00240000048000009400000006020000002400005253413100040000010001002b5c9f7f04346c324a3176f8d3ee823bbf2d60efdbc35f86fd9e65ea3e6cd11bcdcba3a353e55133c8ac5c4caaba581b2c6dfff2cc2d0edc43959ddb86b973300a479a82419ef489c3225f1fe429a708507bd515835160e10bc743d20ca33ab9570cfd68d479fcf0bc797a763bec5d1000f0159ef619e709d915975e87beebaf</PublicKey> + <PublicKeyToken>50cebf1cceb9d05e</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>
\ No newline at end of file +</Project> diff --git a/external/cecil b/external/cecil -Subproject 8629bf5014f3cbfaf3d72e9dda6f7c8f91209f8 +Subproject 11c6cd4cc737d0ac5abb4c4f72a24460a0d9b20 |