[Xamarin.Android.Build.Tasks] Better support for netstandard libraries. #1356
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -10,12 +10,15 @@ | |
| using MonoDroid.Tuner; | ||
| using System.IO; | ||
| using Xamarin.Android.Tools; | ||
| using NuGet.Common; | ||
| using NuGet.Frameworks; | ||
| using NuGet.ProjectModel; | ||
|
|
||
| using Java.Interop.Tools.Cecil; | ||
|
|
||
| namespace Xamarin.Android.Tasks | ||
| { | ||
| public class ResolveAssemblies : AsyncTask | ||
| { | ||
| // The user's assemblies to package | ||
| [Required] | ||
|
|
@@ -24,6 +27,12 @@ public class ResolveAssemblies : Task | |
| [Required] | ||
| public string ReferenceAssembliesDirectory { get; set; } | ||
|
|
||
| public string ProjectAssetFile { get; set; } | ||
|
|
||
| public string TargetMoniker { get; set; } | ||
|
|
||
| public string NuGetPackageRoot { get; set; } | ||
|
|
||
| public string I18nAssemblies { get; set; } | ||
| public string LinkMode { get; set; } | ||
|
|
||
|
|
@@ -45,25 +54,45 @@ public class ResolveAssemblies : Task | |
|
|
||
| public override bool Execute () | ||
| { | ||
| System.Threading.Tasks.Task.Run (() => { | ||
| using (var resolver = new DirectoryAssemblyResolver (this.CreateTaskLogger (), loadDebugSymbols: false)) { | ||
| return Execute (resolver); | ||
| } | ||
| }, Token).ContinueWith ((t) => { | ||
| if (t.Exception != null) { | ||
| var ex = t.Exception.GetBaseException (); | ||
| LogError (ex.Message + Environment.NewLine + ex.StackTrace); | ||
| } | ||
| Complete (); | ||
| }); | ||
| return base.Execute (); | ||
| } | ||
|
|
||
| bool Execute (DirectoryAssemblyResolver resolver) | ||
| { | ||
| LogDebugMessage ("ResolveAssemblies Task"); | ||
| LogDebugMessage (" ReferenceAssembliesDirectory: {0}", ReferenceAssembliesDirectory); | ||
| LogDebugMessage (" I18nAssemblies: {0}", I18nAssemblies); | ||
| LogDebugMessage (" LinkMode: {0}", LinkMode); | ||
| LogDebugTaskItems (" Assemblies:", Assemblies); | ||
| LogDebugMessage (" ProjectAssetFile: {0}", ProjectAssetFile); | ||
| LogDebugMessage (" NuGetPackageRoot: {0}", NuGetPackageRoot); | ||
| LogDebugMessage (" TargetMoniker: {0}", TargetMoniker); | ||
|
|
||
| foreach (var dir in ReferenceAssembliesDirectory.Split (new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) | ||
| resolver.SearchDirectories.Add (dir); | ||
|
|
||
| var assemblies = new HashSet<string> (); | ||
|
|
||
| var topAssemblyReferences = new List<AssemblyDefinition> (); | ||
| var logger = new NuGetLogger((s) => { | ||
| LogDebugMessage ("{0}", s); | ||
| }); | ||
|
|
||
| LockFile lockFile = null; | ||
| if (!string.IsNullOrEmpty (ProjectAssetFile) && File.Exists (ProjectAssetFile)) { | ||
| lockFile = LockFileUtilities.GetLockFile (ProjectAssetFile, logger); | ||
| } | ||
|
|
||
| try { | ||
| foreach (var assembly in Assemblies) { | ||
|
|
@@ -77,21 +106,26 @@ bool Execute (DirectoryAssemblyResolver resolver) | |
| if (assemblyDef == null) | ||
| throw new InvalidOperationException ("Failed to load assembly " + assembly.ItemSpec); | ||
| if (MonoAndroidHelper.IsReferenceAssembly (assemblyDef)) { | ||
| // Resolve "runtime" library | ||
| if (lockFile != null) | ||
| assemblyDef = ResolveRuntimeAssemblyForReferenceAssembly (lockFile, resolver, assemblyDef.Name); | ||
| if (lockFile == null || assemblyDef == null) { | ||
| LogWarning ($"Ignoring {assembly_path} as it is a Reference Assembly"); | ||
| continue; | ||
| } | ||
| } | ||
| topAssemblyReferences.Add (assemblyDef); | ||
| assemblies.Add (Path.GetFullPath (assemblyDef.MainModule.FullyQualifiedName)); | ||
| } | ||
| } catch (Exception ex) { | ||
| LogError ("Exception while loading assemblies: {0}", ex); | ||
| return false; | ||
| } | ||
| try { | ||
| foreach (var assembly in topAssemblyReferences) | ||
| AddAssemblyReferences (resolver, assemblies, assembly, true); | ||
| } catch (Exception ex) { | ||
| LogError ("Exception while loading assemblies: {0}", ex); | ||
| return false; | ||
| } | ||
|
|
||
|
|
@@ -109,17 +143,46 @@ bool Execute (DirectoryAssemblyResolver resolver) | |
| ResolvedUserAssemblies = ResolvedAssemblies.Where (p => !MonoAndroidHelper.IsFrameworkAssembly (p.ItemSpec, true)).ToArray (); | ||
| ResolvedDoNotPackageAttributes = do_not_package_atts.ToArray (); | ||
|
|
||
| LogDebugTaskItems (" [Output] ResolvedAssemblies:", ResolvedAssemblies); | ||
| LogDebugTaskItems (" [Output] ResolvedUserAssemblies:", ResolvedUserAssemblies); | ||
| LogDebugTaskItems (" [Output] ResolvedFrameworkAssemblies:", ResolvedFrameworkAssemblies); | ||
| LogDebugTaskItems (" [Output] ResolvedDoNotPackageAttributes:", ResolvedDoNotPackageAttributes); | ||
|
|
||
| return !Log.HasLoggedErrors; | ||
| } | ||
|
|
||
| readonly List<string> do_not_package_atts = new List<string> (); | ||
| int indent = 2; | ||
|
|
||
| AssemblyDefinition ResolveRuntimeAssemblyForReferenceAssembly (LockFile lockFile, DirectoryAssemblyResolver resolver, AssemblyNameDefinition assemblyNameDefinition) | ||
| { | ||
| if (string.IsNullOrEmpty(TargetMoniker) || string.IsNullOrEmpty (NuGetPackageRoot) || !Directory.Exists (NuGetPackageRoot)) | ||
| return null; | ||
|
|
||
| var framework = NuGetFramework.Parse (TargetMoniker); | ||
| if (framework == null) { | ||
| LogWarning ($"Could not parse '{TargetMoniker}'"); | ||
| return null; | ||
| } | ||
| var target = lockFile.GetTarget (framework, string.Empty); | ||
| if (target == null) { | ||
| LogWarning ($"Could not resolve target for '{TargetMoniker}'"); | ||
| return null; | ||
| } | ||
| var libraryPath = lockFile.Libraries.FirstOrDefault (x => x.Name == assemblyNameDefinition.Name); | ||
|
There was a problem hiding this comment. Library's name property is the package id - is it guaranteed that AssemblyNameDefninition.Name will have a matching package id? There was a problem hiding this comment. @rohit21agrawal that is a good point. I might have to rework this a bit then :( There was a problem hiding this comment. How about emitting AssemblyMetadataAttribute with the PackageId from msbuild, using something like https://mobile.twitter.com/kzu/status/977257467917819905 There was a problem hiding this comment. I reworked the code in #1459 :) |
||
| if (libraryPath == null) | ||
| return null; | ||
| var library = target.Libraries.FirstOrDefault (x => x.Name == assemblyNameDefinition.Name); | ||
| if (library == null) | ||
| return null; | ||
| var runtime = library.RuntimeAssemblies.FirstOrDefault (); | ||
| if (runtime == null) | ||
| return null; | ||
| var path = Path.Combine (NuGetPackageRoot, libraryPath.Path, runtime.Path); | ||
| LogDebugMessage ($"Attempting to load {path}"); | ||
| return resolver.Load (path, forceLoad: true); | ||
| } | ||
|
|
||
| void AddAssemblyReferences (DirectoryAssemblyResolver resolver, ICollection<string> assemblies, AssemblyDefinition assembly, bool topLevel) | ||
| { | ||
| var fqname = assembly.MainModule.FullyQualifiedName; | ||
|
|
@@ -132,11 +195,11 @@ void AddAssemblyReferences (DirectoryAssemblyResolver resolver, ICollection<stri | |
| foreach (var att in assembly.CustomAttributes.Where (a => a.AttributeType.FullName == "Java.Interop.DoNotPackageAttribute")) { | ||
| string file = (string) att.ConstructorArguments.First ().Value; | ||
| if (string.IsNullOrWhiteSpace (file)) | ||
| LogError ("In referenced assembly {0}, Java.Interop.DoNotPackageAttribute requires non-null file name.", assembly.FullName); | ||
| do_not_package_atts.Add (Path.GetFileName (file)); | ||
| } | ||
|
|
||
| LogMessage ("{0}Adding assembly reference for {1}, recursively...", new string (' ', indent), assembly.Name); | ||
| indent += 2; | ||
| // Add this assembly | ||
| if (!topLevel && assemblies.All (a => new AssemblyNameDefinition (a, null).Name != assembly.Name.Name)) | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| using System; | ||
| using NuGet.Common; | ||
| using Microsoft.Build.Utilities; | ||
| using TPL = System.Threading.Tasks; | ||
|
|
||
| namespace Xamarin.Android.Tasks { | ||
|
|
||
| class NuGetLogger : LoggerBase { | ||
| Action<string> log; | ||
|
|
||
| public NuGetLogger (Action<string> log) | ||
| { | ||
| this.log = log; | ||
| } | ||
|
|
||
| public override void Log (ILogMessage message) { | ||
| log (message.Message); | ||
| } | ||
|
|
||
| public override void Log (LogLevel level, string data) { | ||
| log (data); | ||
| } | ||
|
|
||
| public override TPL.Task LogAsync (ILogMessage message) { | ||
| Log (message); | ||
| return TPL.Task.FromResult(0); | ||
| } | ||
|
|
||
| public override TPL.Task LogAsync (LogLevel level, string data) { | ||
| Log (level, data); | ||
| return TPL.Task.FromResult(0); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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.
I'm assuming this method was cribbed from .NET Core? If that's the case, we should likewise mention that in
src/Xamarin.Android.Build.Tasks.tpnitems.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.
nope, it was written by me. I referenced the Nuget source code to see how the API Nuget.ProjectModel was used but none of this code was copied from .Net Core or Nuget.