-
Notifications
You must be signed in to change notification settings - Fork 128
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use SDK-style projects #471
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
df2ffdf
Use SDK-style projects for linker and tests
sbomer b74ae7c
Clean up linker project file
sbomer 00ea6f1
Fix assembly title and description for illink
sbomer fe1938c
Fix debug and optimization info for illink configurations
sbomer e458007
Remove references to old illink solutions
sbomer 7f00a32
Update cecil submodule to latest mono/cecil
sbomer 59199d0
Fix typo
sbomer c36980c
Update cecil configurations in illink.sln
sbomer 784870a
Fix cecil strongname build failure with arcade
sbomer e894393
Remove unused configs from monolinker.sln
sbomer f1bca63
Set PublicKey and PublicKeyToken in cecil overrides
sbomer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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> | ||
| </Project> | ||
Submodule cecil
updated
from 8629bf to 11c6cd
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't modify the file here. It's submodule copy not actual location to make the changes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The contents of this file are purely to adapt the cecil project to our build (our directory layout, our use of arcade), which is the intended purpose of this import in cecil: https://github.com/jbevain/cecil/blob/master/Directory.Build.props#L24. I don't think any of these modifications belong in the cecil project.