Skip to content

Commit 2bfd22c

Browse files
committed
Don't include designer BCL files in BuildItems on Windows
Windows, as a host, does NOT currently install any BCL files - it takes everything from the bundle produced on macOS. However, the code to populate designer BCL file sets also ran on Windows thus producing this, false negative, error: bin\Debug\lib\xamarin.android\xbuild\Xamarin\Android\Windows\bcl\I18N.dll missing, skipping the rest of bundle item file scan Some bundle files are missing, download/rebuild/reinstall forced Step Xamarin.Android.Prepare.Step_PrepareBundle failed System.InvalidOperationException: Step Xamarin.Android.Prepare.Step_PrepareBundle failed Fix the issue by not populating the designer BCL files on Windows.
1 parent eaaf6fe commit 2bfd22c

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

build-tools/xaprepare/xaprepare/ConfigAndData/Runtimes.Code.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ static T EnsureRuntimeType<T> (Runtime runtime, string typeName) where T: Runtim
141141
return runtime.As<T>() != null;
142142
}
143143

144+
static bool IsWindowsRuntime (Runtime runtime)
145+
{
146+
return String.Compare (runtime.ExeSuffix, Configurables.Defaults.WindowsExecutableSuffix, StringComparison.Ordinal) == 0;
147+
}
148+
144149
static bool IsAbi (Runtime runtime, string abiName, params string[] furtherAbiNames)
145150
{
146151
if (ExpectedAbi (abiName))
@@ -220,8 +225,6 @@ public Runtimes ()
220225
PopulateDesignerBclFiles (DesignerHostBclFilesToInstall, DesignerWindowsBclFilesToInstall);
221226
}
222227

223-
partial void PopulateDesignerBclFiles (List<BclFile> designerHostBclFilesToInstall, List<BclFile> designerWindowsBclFilesToInstall);
224-
225228
List<BclFile> BclToDesigner (BclFileTarget ignoreForTarget)
226229
{
227230
return BclFilesToInstall.Where (bf => ShouldIncludeDesignerBcl (bf)).Select (bf => new BclFile (bf.Name, bf.Type, excludeDebugSymbols: true, version: bf.Version, target: ignoreForTarget)).ToList ();
@@ -240,6 +243,8 @@ bool ShouldIncludeDesignerBcl (BclFile bf)
240243
}
241244
}
242245

246+
partial void PopulateDesignerBclFiles (List<BclFile> designerHostBclFilesToInstall, List<BclFile> designerWindowsBclFilesToInstall);
247+
243248
List<BundleItem> bundleItems;
244249
}
245250
}

0 commit comments

Comments
 (0)