Skip to content

Commit 2c49659

Browse files
committed
CryptorProvider requires ServiceLoader, which requires AppDomainAssemblyClassLoader
1 parent 633b704 commit 2c49659

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Directory.Build.Java.props

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<LangVersion>1.8</LangVersion>
55
<EnableDefaultItems>false</EnableDefaultItems>
66
<Static>true</Static>
7-
<ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
87
<!-- Skip EmittedNoClassDefFoundError & ClassFormatError -->
98
<NoWarn>IKVMC0101;IKVMC0111;$(NoWarn)</NoWarn>
109
</PropertyGroup>

cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs

+4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@
1717
//
1818

1919
using ch.cyberduck.cli;
20+
using ikvm.runtime;
21+
using IKVM.Attributes;
2022
using org.apache.commons.cli;
2123
using Console = System.Console;
2224

25+
[assembly: CustomAssemblyClassLoader(typeof(AppDomainAssemblyClassLoader))]
26+
2327
namespace Ch.Cyberduck.Cli
2428
{
2529
internal class WindowsTerminal : Terminal
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
using System.Runtime.InteropServices;
1+
using ikvm.runtime;
2+
using IKVM.Attributes;
23

34
[assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
5+
[assembly: CustomAssemblyClassLoader(typeof(AppDomainAssemblyClassLoader))]

0 commit comments

Comments
 (0)