diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2021-05-14 10:38:44 +0300 |
|---|---|---|
| committer | Lluis Sanchez <llsan@microsoft.com> | 2021-05-14 10:38:44 +0300 |
| commit | 29e1c84f34c53eff9f771de50b4b659efc05ad93 (patch) | |
| tree | af1766e58d57fa270575cee6208afd9f3aedf6d8 | |
| parent | 0d604eb2ddf4c06a5e34d6c53d095605738a9b57 (diff) | |
| -rw-r--r-- | Mono.Addins.Gui/Mono.Addins.Gui.csproj | 10 | ||||
| -rw-r--r-- | Mono.Addins/Mono.Addins/AddinEngine.cs | 17 |
2 files changed, 19 insertions, 8 deletions
diff --git a/Mono.Addins.Gui/Mono.Addins.Gui.csproj b/Mono.Addins.Gui/Mono.Addins.Gui.csproj index d5681ea..d2b3ed5 100644 --- a/Mono.Addins.Gui/Mono.Addins.Gui.csproj +++ b/Mono.Addins.Gui/Mono.Addins.Gui.csproj @@ -39,11 +39,11 @@ <NoWarn>1574;1591</NoWarn> </PropertyGroup> <ItemGroup> - <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/> - <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/> - <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/> - <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/> - <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL"/> + <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL" /> + <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL" /> + <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL" /> + <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL" /> + <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="Mono.Posix" /> <Reference Include="Mono.Cairo" /> diff --git a/Mono.Addins/Mono.Addins/AddinEngine.cs b/Mono.Addins/Mono.Addins/AddinEngine.cs index fe2c248..5a6c4ac 100644 --- a/Mono.Addins/Mono.Addins/AddinEngine.cs +++ b/Mono.Addins/Mono.Addins/AddinEngine.cs @@ -782,11 +782,22 @@ namespace Mono.Addins void OnAssemblyLoaded (object s, AssemblyLoadEventArgs a) { - if (a != null) { - lock (pendingRootChecks) { - pendingRootChecks.Add (a.LoadedAssembly); + try + { + if (a != null) + { + lock (pendingRootChecks) + { + pendingRootChecks.Add(a.LoadedAssembly); + } } } + catch (Exception ex) + { + Console.WriteLine("ASM: " + a?.LoadedAssembly); + Console.WriteLine(ex); + throw; + } } List<Assembly> pendingRootChecks = new List<Assembly> (); |