From 0ff71b1b49edc46e279db1c00235f666907386e3 Mon Sep 17 00:00:00 2001 From: vnugent Date: Mon, 6 Nov 2023 23:48:57 -0500 Subject: mostly some cache stuff --- .../src/ExternServiceAttribute.cs | 43 ---------------------- .../src/LoadingExtensions.cs | 2 +- .../src/ServiceExportAttribute.cs | 43 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 lib/VNLib.Plugins.Extensions.Loading/src/ExternServiceAttribute.cs create mode 100644 lib/VNLib.Plugins.Extensions.Loading/src/ServiceExportAttribute.cs (limited to 'lib/VNLib.Plugins.Extensions.Loading/src') diff --git a/lib/VNLib.Plugins.Extensions.Loading/src/ExternServiceAttribute.cs b/lib/VNLib.Plugins.Extensions.Loading/src/ExternServiceAttribute.cs deleted file mode 100644 index 369b4bb..0000000 --- a/lib/VNLib.Plugins.Extensions.Loading/src/ExternServiceAttribute.cs +++ /dev/null @@ -1,43 +0,0 @@ -/* -* Copyright (c) 2023 Vaughn Nugent -* -* Library: VNLib -* Package: VNLib.Plugins.Extensions.Loading -* File: ExternServiceAttribute.cs -* -* ExternServiceAttribute.cs is part of VNLib.Plugins.Extensions.Loading which is part of the larger -* VNLib collection of libraries and utilities. -* -* VNLib.Plugins.Extensions.Loading is free software: you can redistribute it and/or modify -* it under the terms of the GNU Affero General Public License as -* published by the Free Software Foundation, either version 3 of the -* License, or (at your option) any later version. -* -* VNLib.Plugins.Extensions.Loading is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Affero General Public License for more details. -* -* You should have received a copy of the GNU Affero General Public License -* along with this program. If not, see https://www.gnu.org/licenses/. -*/ - -using System; - -namespace VNLib.Plugins.Extensions.Loading -{ - /// - /// Declares a class as an external service provider. - /// - /// If an assembly contains multiple classes that have the same - /// base type as a desired type, this attribute can be declared - /// to indicate the type takes precedence over other types. - /// - /// - [AttributeUsage(AttributeTargets.Class)] - public sealed class ExternServiceAttribute: Attribute - { - public ExternServiceAttribute() - { } - } -} diff --git a/lib/VNLib.Plugins.Extensions.Loading/src/LoadingExtensions.cs b/lib/VNLib.Plugins.Extensions.Loading/src/LoadingExtensions.cs index 554e40f..8432cde 100644 --- a/lib/VNLib.Plugins.Extensions.Loading/src/LoadingExtensions.cs +++ b/lib/VNLib.Plugins.Extensions.Loading/src/LoadingExtensions.cs @@ -383,7 +383,7 @@ namespace VNLib.Plugins.Extensions.Loading Type[] matchingTypes = manLib.TryGetAllMatchingTypes().ToArray(); //try to get the first type that has the extern attribute, or fall back to the first public & concrete type - Type? exported = matchingTypes.FirstOrDefault(t => t.GetCustomAttribute() != null) + Type? exported = matchingTypes.FirstOrDefault(t => t.GetCustomAttribute() != null) ?? matchingTypes.Where(t => !t.IsAbstract && t.IsPublic).FirstOrDefault(); _ = exported ?? throw new TypeLoadException($"The desired external asset type {typeof(T).Name} is not exported as part of the assembly {manLib.Assembly.FullName}"); diff --git a/lib/VNLib.Plugins.Extensions.Loading/src/ServiceExportAttribute.cs b/lib/VNLib.Plugins.Extensions.Loading/src/ServiceExportAttribute.cs new file mode 100644 index 0000000..023c68e --- /dev/null +++ b/lib/VNLib.Plugins.Extensions.Loading/src/ServiceExportAttribute.cs @@ -0,0 +1,43 @@ +/* +* Copyright (c) 2023 Vaughn Nugent +* +* Library: VNLib +* Package: VNLib.Plugins.Extensions.Loading +* File: ServiceExportAttribute.cs +* +* ServiceExportAttribute.cs is part of VNLib.Plugins.Extensions.Loading which is part of the larger +* VNLib collection of libraries and utilities. +* +* VNLib.Plugins.Extensions.Loading is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* VNLib.Plugins.Extensions.Loading is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. +*/ + +using System; + +namespace VNLib.Plugins.Extensions.Loading +{ + /// + /// Declares a class as an external service provider. + /// + /// If an assembly contains multiple classes that have the same + /// base type as a desired type, this attribute can be declared + /// to indicate the type takes precedence over other types. + /// + /// + [AttributeUsage(AttributeTargets.Class)] + public sealed class ServiceExportAttribute: Attribute + { + public ServiceExportAttribute() + { } + } +} -- cgit