From 382b13aa927a2961691213928829e1a10dedd609 Mon Sep 17 00:00:00 2001
From: AliveDevil <AliveDevil@users.noreply.github.com>
Date: Tue, 6 Aug 2024 11:03:17 +0200
Subject: [PATCH] Requires AppDomainAssemblyClassLoader in ikvmc

---
 Directory.Build.Java.props | 8 ++++++--
 Packages.props             | 2 +-
 global.json                | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.Java.props b/Directory.Build.Java.props
index 945f2e59345..4a28cc6e15b 100644
--- a/Directory.Build.Java.props
+++ b/Directory.Build.Java.props
@@ -1,9 +1,13 @@
 <Project>
 
-  <PropertyGroup>
-    <LangVersion>1.8</LangVersion>
+  <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>
diff --git a/Packages.props b/Packages.props
index f044916f6ed..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.165" />
+    <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/global.json b/global.json
index f9e6253a056..acd7ab1365d 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "IKVM.NET.Sdk": "8.10.0-dev.165",
+    "IKVM.NET.Sdk": "8.10.0-dev.171",
     "Microsoft.Build.NoTargets": "3.3.0",
     "Microsoft.Build.Traversal": "3.1.6"
   }