stride
stride copied to clipboard
AssemblyProcessor multi-targeting fix
PR Details
This PR modifies the AssemblyProcessor project to build for both net6.0 and netstandard2.0, with the intention of allowing both the .NET Framework version of MSBuild (like the one used by Visual Studio) and the .NET 5+ version (like the one invoked by dotnet build or dotnet msbuild) to load the correct version of the Assembly Processor assembly.
Description
AssemblyProcessornow buildsnet6.0andnetstandard2.0.- Both versions are copied to
depsto their corresponding subdirectory. - Modified
Stride.Core.targetsto select the correct assembly based on the framework of MSBuild. - Made GameStudio always reference the
net6.0(or newer) variant of the Assembly Processor. This is because GameStudio is not multi-targeting anymore, so there's no need to choose. - Updated
Mono.Ceciland made its version the same for bothStride.Core.AssemblyProcessorandStride.GameStudio. - Fixed the Assembly Processor test project. It was not compiling correctly due to missing
Xunitreference.
Related Issue
This PR is based primarily in the PR #1480 by ericwj, but updated based on a recent conversation on Discord. The original issue that motivated that PR was #1479.
Motivation and Context
The Assembly Processor assemblies in deps were stale as the project wasn't compiling and updating the netstandard2.0 version anymore, which is the one used by the MSBuild invocations used by Visual Studio.
Types of changes
- [ ] Docs change / refactoring / dependency upgrade
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
Checklist
- [ ] My change requires a change to the documentation.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
@Ethereal77 please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.
@dotnet-policy-service agree [company="{your company}"]
Options:
- (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@dotnet-policy-service agree
- (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@dotnet-policy-service agree company="Microsoft"
Contributor License Agreement
Contribution License Agreement
This Contribution License Agreement ( “Agreement” ) is agreed to by the party signing below ( “You” ), and conveys certain license rights to the .NET Foundation ( “.NET Foundation” ) for Your contributions to .NET Foundation open source projects. This Agreement is effective as of the latest signature date below.
1. Definitions.
“Code” means the computer software code, whether in human-readable or machine-executable form, that is delivered by You to .NET Foundation under this Agreement.
“Project” means any of the projects owned or managed by .NET Foundation and offered under a license approved by the Open Source Initiative (www.opensource.org).
“Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any Project, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of discussing and improving that Project, but excluding communication that is conspicuously marked or otherwise designated in writing by You as “Not a Submission.”
“Submission” means the Code and any other copyrightable material Submitted by You, including any associated comments and documentation.
2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any Project. This Agreement covers any and all Submissions that You, now or in the future (except as described in Section 4 below), Submit to any Project.
3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
Should You wish to Submit materials that are not Your original work, You may Submit them separately to the Project if You (a) retain all copyright and license information that was in the materials as You received them, (b) in the description accompanying Your Submission, include the phrase “Submission containing materials of a third party:” followed by the names of the third party and any licenses or other restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your Submission is made in the course of Your work for an employer or Your employer has intellectual property rights in Your Submission by contract or applicable law, You must secure permission from Your employer to make the Submission before signing this Agreement. In that case, the term “You” in this Agreement will refer to You and the employer collectively. If You change employers in the future and desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement and secure permission from the new employer before Submitting those Submissions.
5. Licenses.
a. Copyright License. You grant .NET Foundation, and those who receive the Submission directly or indirectly from .NET Foundation, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable
license in the Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third parties.
b. Patent License. You grant .NET Foundation, and those who receive the Submission directly or indirectly from .NET Foundation, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under Your patent claims that are necessarily infringed by the Submission or the combination of the Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and import or otherwise dispose of the Submission alone or with the Project.
c. Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement. No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are granted by implication, exhaustion, estoppel or otherwise.
6. Representations and Warranties. You represent that You are legally entitled to grant the above licenses. You represent that each of Your Submissions is entirely Your original work (except as You may have disclosed under Section 3 ). You represent that You have secured permission from Your employer to make the Submission in cases where Your Submission is made in the course of Your work for Your employer or Your employer has intellectual property rights in Your Submission by contract or applicable law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You have the necessary authority to bind the listed employer to the obligations contained in this Agreement. You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES EXPRESSLY STATED IN SECTIONS 3, 4, AND 6 , THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
7. Notice to .NET Foundation. You agree to notify .NET Foundation in writing of any facts or circumstances of which You later become aware that would make Your representations in this Agreement inaccurate in any respect.
8. Information about Submissions. You agree that contributions to Projects and information about contributions may be maintained indefinitely and disclosed publicly, including Your name and other information that You submit with Your Submission.
9. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County, Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all defenses of lack of personal jurisdiction and forum non-conveniens.
10. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and supersedes any and all prior agreements, understandings or communications, written or oral, between the parties relating to the subject matter hereof. This Agreement may be assigned by .NET Foundation.
.NET Foundation dedicates this Contribution License Agreement to the public domain according to the Creative Commons CC0 1.
@dotnet-policy-service agree
A question about one of the commits:
As of this PR Stride.Core.AssemblyProcessor can be built both for net6.0 and netstandard2.0 and it will be copied to deps.
Should we delete the already compiled version we have in deps\AssemblyProcessor and instead compile it as a first step so it's fresh and up to date?
- If we should delete it (I've already done it in a commit, but can be undone), maybe it should be noted somewhere so people building Stride know it's a requirement to build first the Assembly Processor prior to building the main solution.
- If we shouldn't delete it, I can commit the updated assemblies in
deps.
from my understanding, the .netstandard2.0 could also just be dropped/deleted. With .NET 8 around the corner and the small community of contributors, the less complexity we have the better.
I'd tend to agree. But as I've written in the PR, I think netstandard2.0 is still needed by the .NET Framework version of MSBuild that Visual Studio uses. Whenever I've tried to use just a .NET Core AssemblyProcessor, it has compiled with dotnet build and dotnet msbuild, but failed in Visual Studio with messages like "Can't resolve assembly reference System.Runtime 6.0" or something like that.
The only reason it built up until now with just net6.0 is because there was a stale version of netstandard2.0 in the deps directory.
If / when Visual Studio can load .NET Core tasks in MSBuild, or replaces its version of MSBuild with a .NET Core one, then we can say goodbye to netstandard for good.
@Ethereal77 regarding your question, we could ask users to build that one first in the worst case scenario ... I understand that library has to process the other solutions to build them properly so I could see how that would be harder than expected, still, is there no way we could build it first as part of building the game studio / the whole solution ?
I could try to include the Assembly Processor project in the main solution, setting the order so every other project builds after it. It could also be set to build first in Stride.build I think.
However, I don't know the real reason Silicon / Xenko devs separated the Assembly Processor in its own solution, so don't know if it was to avoid some potential problem when building.
In theory, the assembly produced by compiling the Assembly Processor is not locked because it is first copied to deps, and then also copied to a temporary directory based on its computed hash.
If you build Stride and MSBuild invokes the Assembly Processor task, that assembly could become locked and unable to be overwritten until you terminate MSBuild or something.
But, if you modify the Assembly Processor, its hash should change, so the new assembly should be copied to a different place and shouldn't be any problem.
Maybe we could ask xen what was the reasoning for keeping it separate.
Sure, @xen2 if you could look into the above two messages.
Ok, then I may look at try what I wrote in my comment above. Or maybe it's better to merge this and try that in another PR?
Ok, then I may look at try what I wrote in my comment above. Or maybe it's better to merge this and try that in another PR?
Up to you (whatever is more convenient). If you want to merge this one now, some conflicts need to be fixed. If not merging now (merging everything at once later), could you make those new changes as a separate/new PR built on top of this one Ethereal77:assemblyprocessor-fix? I think it would make it easier to review only the new changes added on top of this.
Of course! Should I rebase this one for pulling the latest changes in master? To minimize conflicts, I mean.
Just letting you know that two other PRs were merged related to some of the files you're working on: https://github.com/stride3d/stride/pull/1860 https://github.com/stride3d/stride/pull/1854 I hope those conflicts aren't too hard to resolve.
I know. I've been following them closely. I'll rebase then and see what comes.
I've rebased to latest master and also corrected some performance warnings that were left from a previous change. Please review.
Thanks, tried it out on my end, it does work but there's an issue I want to discuss.
If the AssemblyProcessor is not built, opening the solution fails to load a couple of projects:
The project 'Stride.Graphics' ran into a problem during the last operation: The expression "[System.IO.File]::ReadAllText(J:\stride\deps\AssemblyProcessor\\netstandard2.0\Stride.Core.AssemblyProcessor.Packed.dll.hash)" cannot be evaluated.
Could not find file 'J:\stride\deps\AssemblyProcessor\netstandard2.0\Stride.Core.AssemblyProcessor.Packed.dll.hash'. J:\stride\sources\targets\Stride.Core.targets You may need to reload the solution after fixing the problem.
GameStudio cannot be loaded because of that issue, and building the solution itself fails with a similar error.
Going to the AssemblyProcessor solution and building it, then opening the main solution back does fix the issue of course.
I do remember we talked about asking users to manually build the processor before the main solution, did you not find a more elegant solution in the end, or is that just an unrelated issue ?
As I said above, I can try to integrate the AssemblyProcessor projects in the main solution. But was deciding if I should do it in this PR or make a new one.
I agree the experience to have to build first the Stride.AssemblyProcessor.sln is rough, although it is what I've always done. But for new users it's not evident (and it's not clearly documented) that they should do that.
What should I do?
- Continue in this PR with the "experimental" way I described in this comment?
- Or should I add the instructions to the
README,mdto build theStride.AssemblyProcessor.slnfirst, and leave the integration into the main solution for another PR?
Sorry if I wasn't clear before: I was suggesting to do a separate PR on top of this one (approach 1 as you mentioned in https://github.com/stride3d/stride/pull/1694#discussion_r1246670304?). Reason for separate PR is for easier review of that second part only. However, let's not merge this PR until the second PR is ready. I think lot of people would be confused if need to build another solution (esp. if it's temporary and will be fixed later).