diff --git a/Flow.Launcher.Core/Plugin/PluginsLoader.cs b/Flow.Launcher.Core/Plugin/PluginsLoader.cs index b46b2c799..752174263 100644 --- a/Flow.Launcher.Core/Plugin/PluginsLoader.cs +++ b/Flow.Launcher.Core/Plugin/PluginsLoader.cs @@ -40,16 +40,6 @@ namespace Flow.Launcher.Core.Plugin var milliseconds = Stopwatch.Debug( $"|PluginsLoader.DotNetPlugins|Constructor init cost for {metadata.Name}", () => { -#if DEBUG - var assemblyLoader = new PluginAssemblyLoader(metadata.ExecuteFilePath); - var assembly = assemblyLoader.LoadAssemblyAndDependencies(); - var type = assemblyLoader.FromAssemblyGetTypeOfInterface(assembly, - typeof(IAsyncPlugin)); -#pragma warning disable IDE0019 // "Use Pattern Matching" - disabled because the pattern is useful for RELEASE - var plugin = Activator.CreateInstance(type) as IAsyncPlugin; -#pragma warning restore IDE0019 - -#else Assembly assembly = null; IAsyncPlugin plugin = null; @@ -63,6 +53,12 @@ namespace Flow.Launcher.Core.Plugin plugin = Activator.CreateInstance(type) as IAsyncPlugin; } +#if DEBUG + catch (Exception e) + { + throw; + } +#else catch (Exception e) when (assembly == null) { Log.Exception($"|PluginsLoader.DotNetPlugins|Couldn't load assembly for the plugin: {metadata.Name}", e); @@ -80,6 +76,7 @@ namespace Flow.Launcher.Core.Plugin Log.Exception($"|PluginsLoader.DotNetPlugins|The following plugin has errored and can not be loaded: <{metadata.Name}>", e); } #endif + if (plugin == null) { erroredPlugins.Add(metadata.Name); diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator_jxec3w3p_wpftmp.csproj b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator_jxec3w3p_wpftmp.csproj new file mode 100644 index 000000000..b82d45f12 --- /dev/null +++ b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator_jxec3w3p_wpftmp.csproj @@ -0,0 +1,445 @@ + + + Flow.Launcher.Plugin.Caculator + obj\Debug\ + obj\ + C:\oss\Flow\Flow.Launcher_temp\Plugins\Flow.Launcher.Plugin.Calculator\obj\ + <_TargetAssemblyProjectName>Flow.Launcher.Plugin.Calculator + + + + Library + net6.0-windows + {59BD9891-3837-438A-958D-ADC7F91F6F7E} + Properties + Flow.Launcher.Plugin.Caculator + Flow.Launcher.Plugin.Caculator + true + true + false + false + en + + + true + portable + false + ..\..\Output\Debug\Plugins\Flow.Launcher.Plugin.Caculator\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Output\Release\Plugins\Flow.Launcher.Plugin.Caculator\ + TRACE + prompt + 4 + false + + + + PreserveNewest + + + + + + + + MSBuild:Compile + Designer + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch_ihrotl52_wpftmp.csproj b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch_ihrotl52_wpftmp.csproj new file mode 100644 index 000000000..d77476937 --- /dev/null +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch_ihrotl52_wpftmp.csproj @@ -0,0 +1,438 @@ + + + Flow.Launcher.Plugin.WebSearch + obj\Debug\ + obj\ + C:\oss\Flow\Flow.Launcher_temp\Plugins\Flow.Launcher.Plugin.WebSearch\obj\ + <_TargetAssemblyProjectName>Flow.Launcher.Plugin.WebSearch + + + + Library + net6.0-windows + {403B57F2-1856-4FC7-8A24-36AB346B763E} + Properties + true + Flow.Launcher.Plugin.WebSearch + Flow.Launcher.Plugin.WebSearch + true + false + false + en + + + true + portable + false + ..\..\Output\Debug\Plugins\Flow.Launcher.Plugin.WebSearch\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Output\Release\Plugins\Flow.Launcher.Plugin.WebSearch\ + TRACE + prompt + 4 + false + + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file