Fix | Find MainPlugin Typ

Author: kitUIN

ShadowPluginLoader.WinUI/Checkers/MetaDataChecker.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
@@ -59,23 +60,40 @@ public TMeta LoadMetaData(string zip)
 
     public void CheckMetaDataValid(TMeta meta)
     {
-        throw new NotImplementedException();
     }
 
+    /// <summary>
+    /// <inheritdoc />
+    /// </summary>
+    /// <exception cref="PluginImportException"></exception>
     public async Task<Type> GetMainPluginType(TMeta meta)
     {
         if (!DllFiles.TryGetValue(meta.Id, out var path))
         {
             throw new PluginImportException($"{meta.Id} Dll Path Not Found");
         }
 
-        var asm = await ApplicationExtensionHost.Current.LoadExtensionAsync(path);
-        if (!EntryPoints.TryGetValue("MainPlugin", out var mainTypeName) || mainTypeName == null)
+        var assemblyName = Path.GetFileNameWithoutExtension(path);
+        var assembly = AppDomain.CurrentDomain.GetAssemblies()
+            .FirstOrDefault(assembly => assembly.GetName().Name == assemblyName);
+        if (assembly == null)
+        {
+            var asm = await ApplicationExtensionHost.Current.LoadExtensionAsync(path);
+            assembly = asm.ForeignAssembly;
+        }
+
+        if (!EntryPoints.TryGetValue(meta.Id, out var entryPoints) || entryPoints == null)
+        {
+            throw new PluginImportException($"{meta.Id} EntryPoints Not Found");
+        }
+
+        if (!entryPoints.AsObject()
+                .TryGetPropertyValue("MainPlugin", out var mainTypeName) || mainTypeName == null)
         {
             throw new PluginImportException($"{meta.Id} MainPlugin(EntryPoint) Not Found");
         }
 
-        var mainType = asm.ForeignAssembly.GetType(mainTypeName.GetValue<string>());
+        var mainType = assembly.GetType(mainTypeName.GetValue<string>());
         if (mainType == null)
         {
             throw new PluginImportException($"{meta.Id} MainPlugin(Type) Not Found");

ShadowPluginLoader.WinUI/ShadowPluginLoader.WinUI.csproj

@@ -3,15 +3,15 @@
         <TargetFrameworks>net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0;net9.0-windows10.0.17763.0</TargetFrameworks>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <RootNamespace>ShadowPluginLoader.WinUI</RootNamespace>
-<!--        <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>-->
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
         <UseWinUI>true</UseWinUI>
         <Nullable>enable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>MSB3277</NoWarn>
 		<EnableMsixTooling>true</EnableMsixTooling>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <!-- Nuget -->
-        <Version>2.1.1</Version>
+        <Version>2.1.3</Version>
 		<PackageId>ShadowPluginLoader.WinUI</PackageId>
 		<Owner>kitUIN</Owner>
 		<Authors>kitUIN</Authors>
@@ -34,7 +34,7 @@
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
         <PackageReference Include="ShadowPluginLoader.SourceGenerator" Version="2.0.4" />
         <PackageReference Include="kitUIN.CustomExtensions.WinUI" Version="0.6.4" />
-        <PackageReference Include="ShadowPluginLoader.Tool" Version="2.1.5" />
+        <PackageReference Include="ShadowPluginLoader.Tool" Version="2.1.6" />
         <PackageReference Include="SharpCompress" Version="0.39.0" /> 
     </ItemGroup>
     <ItemGroup>