CryptorProvider requires ServiceLoader, which requires AppDomainAssem…

…blyClassLoader
iterate-ch · Aug 6, 2024 · ed4c31e · ed4c31e
1 parent 61cf55f
commit ed4c31e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Directory.Build.Java.props b/Directory.Build.Java.props
@@ -4,7 +4,6 @@
     <LangVersion>1.8</LangVersion>
     <EnableDefaultItems>false</EnableDefaultItems>
     <Static>true</Static>
-    <ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
     <!-- Skip EmittedNoClassDefFoundError & ClassFormatError -->
     <NoWarn>IKVMC0101;IKVMC0111;$(NoWarn)</NoWarn>
   </PropertyGroup>

diff --git a/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs b/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs
@@ -17,9 +17,13 @@
 // 
 
 using ch.cyberduck.cli;
+using ikvm.runtime;
+using IKVM.Attributes;
 using org.apache.commons.cli;
 using Console = System.Console;
 
+[assembly: CustomAssemblyClassLoader(typeof(AppDomainAssemblyClassLoader))]
+
 namespace Ch.Cyberduck.Cli
 {
     internal class WindowsTerminal : Terminal

diff --git a/windows/src/main/csharp/Properties/AssemblyInfo.cs b/windows/src/main/csharp/Properties/AssemblyInfo.cs
@@ -1,3 +1,5 @@
-using System.Runtime.InteropServices;
+using ikvm.runtime;
+using IKVM.Attributes;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
+[assembly: CustomAssemblyClassLoader(typeof(AppDomainAssemblyClassLoader))]