up set deep find

Author: Coloryr

build/build-buildweb.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
-mkdir ./build_out
-
-dotnet restore ./src/ColorDesktop.sln
+dotnet restore ./src/Core/ColorDesktop.Web/ColorDesktop.Web.csproj
 
 cd ./src/Core/ColorDesktop.Web
 
@@ -13,7 +11,7 @@ dotnet msbuild -p:RuntimeIdentifier=linux-arm64
 dotnet msbuild -p:RuntimeIdentifier=osx-x64
 dotnet msbuild -p:RuntimeIdentifier=osx-arm64
 
-cd ./src/build_out/Debug/net8.0/
+cd ../../build_out/Debug/net8.0
 
 zip -r webplugin-linux-arm64.zip WebPlugin/Debug/net8.0/linux-arm64
 zip -r webplugin-linux-x64.zip WebPlugin/Debug/net8.0/linux-x64

src/ColorDesktop.Launcher/Manager/PluginAssembly.cs

@@ -148,6 +148,23 @@ void ReadList(string dir)
         return null;
     }
 
+    private static List<FileInfo> FindFiles(DirectoryInfo info, string name)
+    {
+        var list = new List<FileInfo>();
+        foreach (var item in info.GetFiles())
+        {
+            if (item.Name == name)
+            {
+                list.Add(item);
+            }
+        }
+        foreach (var dir in info.GetDirectories())
+        {
+            list.AddRange(FindFiles(dir, name));
+        }
+        return list;
+    }
+
     protected override nint LoadUnmanagedDll(string unmanagedDllName)
     {
         if (_natives.TryGetValue(unmanagedDllName, out var dir))
@@ -175,6 +192,27 @@ protected override nint LoadUnmanagedDll(string unmanagedDllName)
             return LoadUnmanagedDllFromPath(file);
         }
 
+        var list = FindFiles(new DirectoryInfo(Local), unmanagedDllName + ".dll");
+        var item = list.FirstOrDefault();
+        if (item != null)
+        {
+            return LoadUnmanagedDllFromPath(file);
+        }
+
+        list = FindFiles(new DirectoryInfo(Local), unmanagedDllName + ".so");
+        item = list.FirstOrDefault();
+        if (item != null)
+        {
+            return LoadUnmanagedDllFromPath(file);
+        }
+
+        list = FindFiles(new DirectoryInfo(Local), unmanagedDllName + ".dylib");
+        item = list.FirstOrDefault();
+        if (item != null)
+        {
+            return LoadUnmanagedDllFromPath(file);
+        }
+
         return base.LoadUnmanagedDll(unmanagedDllName);
     }
 

src/Core/ColorDesktop.Web/ColorDesktop.Web.csproj

@@ -144,23 +144,23 @@
 		<ItemGroup>
 			<PortFiles_1 Include="$(NuGetPackageRoot)microsoft.aspnetcore.app.runtime.linux-x64\8.0.11\runtimes\linux-x64\lib\net8.0\*.*" />
 			<PortFiles_2 Include="$(NuGetPackageRoot)microsoft.aspnetcore.app.runtime.linux-x64\8.0.11\runtimes\linux-x64\native\*.*" />
-			<PortFiles_3 Include="$(NuGetPackageRoot)cef.redist.linux64\120.1.8\CEF\**\*.*" />
+			<!--<PortFiles_3 Include="$(NuGetPackageRoot)cef.redist.linux64\120.1.8\CEF\**\*.*" />-->
 		</ItemGroup>
 		<Copy SourceFiles="@(PortFiles_1)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
 		<Copy SourceFiles="@(PortFiles_2)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
-		<Copy SourceFiles="@(PortFiles_3)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
+		<!--<Copy SourceFiles="@(PortFiles_3)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />-->
 	</Target>
 
 	<Target Name="CopySpecificNuGetDll_9" Condition="'$(BuildOutputSys)' == 'linux' and '$(BuildOutputArch)' == 'arm64'" AfterTargets="Build">
 		<Message Text="Copy linux arm64 lib" Importance="High" />
 		<ItemGroup>
 			<PortFiles_1 Include="$(NuGetPackageRoot)microsoft.aspnetcore.app.runtime.linux-arm64\8.0.11\runtimes\linux-arm64\lib\net8.0\*.*" />
 			<PortFiles_2 Include="$(NuGetPackageRoot)microsoft.aspnetcore.app.runtime.linux-arm64\8.0.11\runtimes\linux-arm64\native\*.*" />
-			<PortFiles_3 Include="$(NuGetPackageRoot)cef.redist.linuxarm64\120.1.8\CEF\**\*.*" />
+			<!--<PortFiles_3 Include="$(NuGetPackageRoot)cef.redist.linuxarm64\120.1.8\CEF\**\*.*" />-->
 		</ItemGroup>
 		<Copy SourceFiles="@(PortFiles_1)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
 		<Copy SourceFiles="@(PortFiles_2)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
-		<Copy SourceFiles="@(PortFiles_3)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />
+		<!--<Copy SourceFiles="@(PortFiles_3)" DestinationFolder="$(OutputPath)%(RecursiveDir)" />-->
 	</Target>
 
 	<ItemGroup>