Use SDK-style projects #471
Conversation
Until I can make more progress on SDK-style projects (see #471), I'll begin trying to set up a build of illink using arcade and the old-style projects. In this change I'm getting rid of the scattered linker.sln files in favor of monolinker.sln for monolinker, and illink.sln for the illink/ILLink.Tasks build.
sbomer
force-pushed
the
sdkProjects
branch
4 times, most recently
from
17202d8 to
7f8ea93
Compare
|
@marek-safar PTAL |
| @@ -1,13 +1,27 @@ | |||
| <Project> | |||
|
|
|||
| <!-- Cecil's Directory.Build.Props imports this file if it | |||
There was a problem hiding this comment.
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.
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.
| <AssemblyName Condition=" ! $(ILLinkBuild) ">monolinker</AssemblyName> | ||
| <AssemblyName Condition=" $(ILLinkBuild) ">illink</AssemblyName> | ||
| <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> | ||
| <Copyright>(C) 2006, Jb Evain</Copyright> |
There was a problem hiding this comment.
Please use .NET Foundation for the copyright
There was a problem hiding this comment.
I'm happy to change the copyright info, but I'd rather do it in a separate PR. Here my goal is just to use the new SDK while reproducing the original build as closely as possible.
|
@marek-safar @sbomer Would it be OK if we hold off merging this PR until after the PR's that I have open are merged? I suspect this change is going to cause me some issues I will have to work through. Getting the improvement PR's landed and pulled into our UnityLinker is a higher priority for me than patching our projects back together. If this PR lands first I'll have to start cherry picking around this change. Not the end of the world, but if there's no rush it will make my life easier. |
|
@mrvoorhe that's fine by me. Please let me know when would be a good time. |
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.
Also add a missing release config for cecil
|
@marek-safar PTAL |
|
Go for it. Thanks for checking. |
With the latest cecil update in dotnet#471, we are using SDK-style projects and building cecil for netstandard2.0, so the workaround for dotnet/sdk#3194 is no longer necessary.
With the latest cecil update in dotnet#471, we are using SDK-style projects and building cecil for netstandard2.0, so the workaround for dotnet/sdk#3194 is no longer necessary.
With the latest cecil update in #471, we are using SDK-style projects and building cecil for netstandard2.0, so the workaround for dotnet/sdk#3194 is no longer necessary.
Until I can make more progress on SDK-style projects (see dotnet/linker#471), I'll begin trying to set up a build of illink using arcade and the old-style projects. In this change I'm getting rid of the scattered linker.sln files in favor of monolinker.sln for monolinker, and illink.sln for the illink/ILLink.Tasks build. Commit migrated from dotnet/linker@1331119
* 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 dotnet/arcade#2321 * Remove unused configs from monolinker.sln Also add a missing release config for cecil * Set PublicKey and PublicKeyToken in cecil overrides Commit migrated from dotnet/linker@6280036
With the latest cecil update in dotnet/linker#471, we are using SDK-style projects and building cecil for netstandard2.0, so the workaround for dotnet/sdk#3194 is no longer necessary. Commit migrated from dotnet/linker@56ec756
This updates projects to use the new simplified format.
It depends on @jbevain's branch that I believe is a WIP: https://github.com/jbevain/cecil/tree/new-sdk.This change will not be ready to merge until the cecil change is ready, but I wanted to share what it's going to look like and get early feedback.Part of #452.
Edit: now that cecil has been updated to use SDK-style projects, this can move forward. Waiting on #489 to avoid merge conflicts in that PR.