Add option to overwrite the source assembly in XBD #128
Conversation
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
With Android builds we are seeing a number of issues - Warnings that assemblies referenced from the NuGet can not be found (Not errors from what I can tell.) - Build time errors on first build because resources can not be found (Clean builds appear to fix this too, but yuck) - Slow VS experience when IDE is at idle. We believe this is because of design time builds that are running. Changing the reference list after references are resolved causes more processes to spawn. This patch avoids changing the reference list after the resolve assembly step runs. Instead the source assembly is updated and written back to the same location and not the intermediate directory. It appears to work in the cases I tested but we need to run a full set and have the community tell us how it is working. There is now a property on all of the resource restore tasks that allow the behavior to be configured. On Android we default to overwrite and on iOS we continue to use the intermediate folder by default. We need to add an optimization to know if we need to open the assembly in cecil. Right now we always open the file. It is taking a second in my tests. We could write out and check for a 'marker' file. This will buy us some more time as a temporary workaround. We are working on changes needed in Xamarin Android so that we can add aar files to the project build list and not require that we re-embed the aar or reference files.
Adding checks to not write out the dll when adding resources if the source dll is the same as the target dll location and the resources are already packed.
|
Keep an eye on the following when reviewing this PR. |
kentcb
reviewed
Mar 16, 2017
| @@ -104,9 +104,11 @@ public override bool Execute () | |||
| bool MergeResources (IAssemblyResolver resolver, string originalAsmPath, string mergedAsmPath, string assemblyName, List<ITaskItem> resourceItems) | |||
| { | |||
| var disposeList = new List<IDisposable> (); | |||
There was a problem hiding this comment.
Crying out for some CompositeDisposable goodness :)
There was a problem hiding this comment.
Nice suggestion! I would like to use that however I just found that it requires that I ship additional dlls in the NuGet just for a simple concept.
When merging resources into a .dll, we want to write out a marker file (`TheFile.dll.stamp` in this case) to indicate the .dll file has already been processed and we don’t need to inspect it (open it) to check to see if it needs processing. This should save some time in the process. I’ve also added more FileWrites outputs for the task (we’ll add the `obj/[Config]/XbdMerge` folder as well as any `.stamp` marker files we create here so that when a build is cleaned, everything is removed. Finally, fixed typo in OverwriteSourceAssembly property.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
With Android builds we are seeing a number of issues
(Not errors from what I can tell.)
(Clean builds appear to fix this too, but yuck)
design time builds that are running. Changing the reference list after
references are resolved causes more processes to spawn.
This patch avoids changing the reference list after the resolve assembly step runs.
Instead the source assembly is updated and written back to the same location and not
the intermediate directory. It appears to work in the cases I tested but we need to
run a full set and have the community tell us how it is working.
There is now a property on all of the resource restore tasks that allow the behavior to be configured.
On Android we default to overwrite and on iOS we continue to use the intermediate folder by default.
We need to add an optimization to know if we need to open the assembly in cecil. Right now we always
open the file. It is taking a second in my tests. We could write out and check for a 'marker' file.
This will buy us some more time as a temporary workaround. We are working on changes
needed in Xamarin Android so that we can add aar files to the project build list and not
require that we re-embed the aar or reference files.