From 27eebb03d1fc380d39eb6d28bace38db6ef65d47 Mon Sep 17 00:00:00 2001
From: AliveDevil <AliveDevil@users.noreply.github.com>
Date: Wed, 31 Jul 2024 09:55:19 +0200
Subject: [PATCH] Up IKVM

---
 Directory.Build.Java.props                          | 13 +++++++++----
 Packages.props                                      |  2 +-
 .../main/csharp/ch/cyberduck/cli/WindowsTerminal.cs |  4 ++++
 global.json                                         |  2 +-
 nuget.config                                        |  1 +
 windows/src/main/csharp/Properties/AssemblyInfo.cs  |  4 +++-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Directory.Build.Java.props b/Directory.Build.Java.props
index 89a3fea60d1..4a28cc6e15b 100644
--- a/Directory.Build.Java.props
+++ b/Directory.Build.Java.props
@@ -1,10 +1,15 @@
 <Project>
 
-  <PropertyGroup>
-    <LangVersion>1.8</LangVersion>
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <CompileStatically>true</CompileStatically>
+  <PropertyGroup Label="IKVM">
     <ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <LangVersion>1.8</LangVersion>
+    <Static>true</Static>
+  </PropertyGroup>
+
+  <PropertyGroup Label="MSBuild">
+    <!-- Skip EmittedNoClassDefFoundError & ClassFormatError -->
+    <NoWarn>IKVMC0101;IKVMC0111;$(NoWarn)</NoWarn>
   </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Packages.props b/Packages.props
index 8d2c73e854a..1e3979263f3 100644
--- a/Packages.props
+++ b/Packages.props
@@ -19,7 +19,7 @@
     <PackageReference Update="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Update="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.100" />
     <PackageReference Update="ExceptionReporter " Version="2.4.2" />
-    <PackageReference Update="IKVM" Version="8.10.0-dev.62" />
+    <PackageReference Update="IKVM" Version="8.10.0-dev.171" />
     <PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.1.0" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Update="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
diff --git a/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs b/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs
index 2c2e34950b4..22abe1d3b9e 100644
--- 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/global.json b/global.json
index 2e7a984995e..acd7ab1365d 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "IKVM.NET.Sdk": "8.10.0-dev.62",
+    "IKVM.NET.Sdk": "8.10.0-dev.171",
     "Microsoft.Build.NoTargets": "3.3.0",
     "Microsoft.Build.Traversal": "3.1.6"
   }
diff --git a/nuget.config b/nuget.config
index b9c4832f8c8..e9b94018d69 100644
--- a/nuget.config
+++ b/nuget.config
@@ -7,6 +7,7 @@
   </packageSources>
   <packageSourceMapping>
     <packageSource key="nuget.org">
+      <package pattern="IKVM.ByteCode" />
       <package pattern="*" />
     </packageSource>
     <packageSource key="gh-iterate-ch">
diff --git a/windows/src/main/csharp/Properties/AssemblyInfo.cs b/windows/src/main/csharp/Properties/AssemblyInfo.cs
index d630065294b..a45fedaa42e 100644
--- 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))]