Skip to content

[XM] Add the option to ignore missing files during registration #1709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chamons merged 2 commits into from
Feb 22, 2017
+9 −5
Merged

[XM] Add the option to ignore missing files during registration #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f7e703
[XM] Add the option to ignore missing files during registration
alanmcgovern Feb 16, 2017
27b0080
Fix build
chamons Feb 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/AppKit/NSApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ namespace XamCore.AppKit {
public partial class NSApplication : NSResponder {
public static bool CheckForIllegalCrossThreadCalls = true;
public static bool CheckForEventAndDelegateMismatches = true;
public static bool IgnoreMissingAssembliesDuringRegistration = false;

private static Thread mainThread;

Expand Down
13 changes: 8 additions & 5 deletions src/ObjCRuntime/Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
using XamCore.Foundation;
using XamCore.Registrar;

#if MONOMAC
using XamCore.AppKit;
#endif

#if !COREBUILD && (XAMARIN_APPLETLS || XAMARIN_NO_TLS)
#if !MMP && !MTOUCH && !MTOUCH_TEST
using Mono.Security.Interface;
Expand Down Expand Up @@ -408,14 +412,13 @@ static void CollectReferencedAssemblies (List<Assembly> assemblies, Assembly ass
if (!assemblies.Contains (a))
CollectReferencedAssemblies (assemblies, a);
}
#if MONOMAC
catch {
catch (FileNotFoundException fefe) {
// that's more important for XI because device builds don't go thru this step
// and we can end up with simulator-only failures - bug #29211
throw;
#else
catch (FileNotFoundException fefe) {
NSLog ("Could not find `{0}` referenced by assembly `{1}`.", fefe.FileName, assembly.FullName);
#if MONOMAC
if (!NSApplication.IgnoreMissingAssembliesDuringRegistration)
throw;
#endif
}
}
Expand Down