[mtouch/mmp] Simplify some code to add assemblies to a target.
This commit is contained in:
Родитель
29fd334456
Коммит
ebfc7e131c
|
@ -86,6 +86,13 @@ namespace Xamarin.Bundler {
|
|||
this.StaticRegistrar = new StaticRegistrar (this);
|
||||
}
|
||||
|
||||
public Assembly AddAssembly (AssemblyDefinition assembly)
|
||||
{
|
||||
var asm = new Assembly (this, assembly);
|
||||
Assemblies.Add (asm);
|
||||
return asm;
|
||||
}
|
||||
|
||||
// This will find the link context, possibly looking in container targets.
|
||||
public PlatformLinkContext GetLinkContext ()
|
||||
{
|
||||
|
|
|
@ -1609,9 +1609,8 @@ namespace Xamarin.Bundler {
|
|||
|
||||
Target.PrintAssemblyReferences (assembly);
|
||||
|
||||
var asm = new Assembly (BuildTarget, assembly);
|
||||
var asm = BuildTarget.AddAssembly (assembly);
|
||||
asm.ComputeSatellites ();
|
||||
BuildTarget.Assemblies.Add (asm);
|
||||
|
||||
resolved_assemblies.Add (fqname);
|
||||
|
||||
|
|
|
@ -336,9 +336,8 @@ namespace Xamarin.Bundler
|
|||
// Load all the assemblies in the cached list of assemblies
|
||||
foreach (var assembly in assemblies) {
|
||||
var ad = ManifestResolver.Load (assembly);
|
||||
var asm = new Assembly (this, ad);
|
||||
var asm = AddAssembly (ad);
|
||||
asm.ComputeSatellites ();
|
||||
this.Assemblies.Add (asm);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
@ -381,9 +380,8 @@ namespace Xamarin.Bundler
|
|||
PrintAssemblyReferences (assembly);
|
||||
assemblies.Add (fqname);
|
||||
|
||||
var asm = new Assembly (this, assembly);
|
||||
var asm = AddAssembly (assembly);
|
||||
asm.ComputeSatellites ();
|
||||
this.Assemblies.Add (asm);
|
||||
|
||||
var main = assembly.MainModule;
|
||||
foreach (AssemblyNameReference reference in main.AssemblyReferences) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче