From e387b719b9a187b8e811725b813f58759579b2c8 Mon Sep 17 00:00:00 2001
From: AliveDevil <AliveDevil@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:50:11 +0200
Subject: [PATCH] Update ikvmnet

---
 Directory.Build.targets                           | 4 +++-
 Packages.props                                    | 2 +-
 bonjour/dll/Cyberduck.Bonjour.msbuildproj         | 7 +------
 cli/dll/Cyberduck.Cli.msbuildproj                 | 7 +------
 core/dll/Cyberduck.Core.msbuildproj               | 7 +------
 cryptomator/dll/Cyberduck.Cryptomator.msbuildproj | 7 +------
 global.json                                       | 2 +-
 importer/dll/Cyberduck.Importer.msbuildproj       | 7 +------
 nuget.config                                      | 3 ++-
 protocols/dll/Cyberduck.Protocols.msbuildproj     | 7 +------
 src/main/msbuild/Cyberduck.Java.targets           | 5 -----
 11 files changed, 13 insertions(+), 45 deletions(-)
 delete mode 100644 src/main/msbuild/Cyberduck.Java.targets

diff --git a/Directory.Build.targets b/Directory.Build.targets
index bfbfcb3e830..fe3f6822912 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -69,7 +69,9 @@
     <ProjectReference Include="@(CyberduckProjectReference->'%(ProjectPath)')">
       <Name>Cyberduck.%(Identity)</Name>
     </ProjectReference>
-    <Reference Include="@(CyberduckAssemblyReference->'Cyberduck.%(Identity)')" />
+    <Reference Include="@(CyberduckAssemblyReference->'Cyberduck.%(Identity)')">
+      <JavaClasspath>\\?\</JavaClasspath>
+    </Reference>
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(NETCoreSdkVersion)'!='' ">
diff --git a/Packages.props b/Packages.props
index d392a8f8fae..77a8056aa82 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.171" />
+    <PackageReference Update="IKVM" Version="8.11.0-dev.50" />
     <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/bonjour/dll/Cyberduck.Bonjour.msbuildproj b/bonjour/dll/Cyberduck.Bonjour.msbuildproj
index 7f8172f6042..6c19d141024 100644
--- a/bonjour/dll/Cyberduck.Bonjour.msbuildproj
+++ b/bonjour/dll/Cyberduck.Bonjour.msbuildproj
@@ -1,7 +1,5 @@
-<Project>
+<Project Sdk="IKVM.NET.Sdk">
 
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.props" />
-  
   <PropertyGroup>
     <!--
       Only really used in Cyberduck.
@@ -18,7 +16,4 @@
     <Convert Include="$(TargetBuildDir)com.apple.dnssd.jar" />
   </ItemGroup>
 
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.targets" />
-  <Import Project="$(BuildSupportDir)Cyberduck.Java.targets" />
-  
 </Project>
\ No newline at end of file
diff --git a/cli/dll/Cyberduck.Cli.msbuildproj b/cli/dll/Cyberduck.Cli.msbuildproj
index b6d406c7f03..0dcd1e8f821 100644
--- a/cli/dll/Cyberduck.Cli.msbuildproj
+++ b/cli/dll/Cyberduck.Cli.msbuildproj
@@ -1,6 +1,4 @@
-<Project>
-
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.props" />
+<Project Sdk="IKVM.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
@@ -16,7 +14,4 @@
     <Convert Include="$(TargetBuildDir)org.fusesource.jansi.jansi.jar" />
   </ItemGroup>
 
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.targets" />
-  <Import Project="$(BuildSupportDir)Cyberduck.Java.targets" />
-
 </Project>
\ No newline at end of file
diff --git a/core/dll/Cyberduck.Core.msbuildproj b/core/dll/Cyberduck.Core.msbuildproj
index b71b3f4dbeb..722455779c9 100644
--- a/core/dll/Cyberduck.Core.msbuildproj
+++ b/core/dll/Cyberduck.Core.msbuildproj
@@ -1,6 +1,4 @@
-<Project>
-
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.props" />
+<Project Sdk="IKVM.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net472;net8.0</TargetFrameworks>
@@ -56,7 +54,4 @@
     <Convert Include="$(TargetBuildDir)org.slf4j.slf4j-api.jar" />
   </ItemGroup>
 
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.targets" />
-  <Import Project="$(BuildSupportDir)Cyberduck.Java.targets" />
-  
 </Project>
\ No newline at end of file
diff --git a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj
index d8b4aa4d6cc..23713fb6da1 100644
--- a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj
+++ b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj
@@ -1,6 +1,4 @@
-<Project>
-
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.props" />
+<Project Sdk="IKVM.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net472;net8.0</TargetFrameworks>
@@ -16,7 +14,4 @@
     <Convert Include="$(TargetBuildDir)org.cryptomator.siv-mode.jar" />
   </ItemGroup>
 
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.targets" />
-  <Import Project="$(BuildSupportDir)Cyberduck.Java.targets" />
-
 </Project>
\ No newline at end of file
diff --git a/global.json b/global.json
index ebf9f43de3a..e50be3a20d4 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "msbuild-sdks": {
-    "IKVM.NET.Sdk": "8.10.0-dev.171",
+    "IKVM.NET.Sdk": "8.11.0-dev.50",
     "Microsoft.Build.NoTargets": "3.7.56",
     "Microsoft.Build.Traversal": "4.1.0"
   }
diff --git a/importer/dll/Cyberduck.Importer.msbuildproj b/importer/dll/Cyberduck.Importer.msbuildproj
index 1c88f0d1429..d14e5f87adf 100644
--- a/importer/dll/Cyberduck.Importer.msbuildproj
+++ b/importer/dll/Cyberduck.Importer.msbuildproj
@@ -1,6 +1,4 @@
-<Project>
-
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.props" />
+<Project Sdk="IKVM.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net472;net8.0</TargetFrameworks>
@@ -16,7 +14,4 @@
     <Convert Include="$(TargetBuildDir)org.rococoa.rococoa-core.jar" />
   </ItemGroup>
 
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.targets" />
-  <Import Project="$(BuildSupportDir)Cyberduck.Java.targets" />
-
 </Project>
\ No newline at end of file
diff --git a/nuget.config b/nuget.config
index e9b94018d69..fbdc165d002 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,13 +4,14 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="gh-iterate-ch" value="https://nuget.pkg.github.com/iterate-ch/index.json" protocolVersion="3" />
+    <add key="gh-ikvmnet" value="https://nuget.pkg.github.com/ikvmnet/index.json" protocolVersion="3" />
   </packageSources>
   <packageSourceMapping>
     <packageSource key="nuget.org">
       <package pattern="IKVM.ByteCode" />
       <package pattern="*" />
     </packageSource>
-    <packageSource key="gh-iterate-ch">
+    <packageSource key="gh-ikvmnet">
       <package pattern="IKVM*" />
     </packageSource>
   </packageSourceMapping>
diff --git a/protocols/dll/Cyberduck.Protocols.msbuildproj b/protocols/dll/Cyberduck.Protocols.msbuildproj
index fe4188ce05e..c9fb29a63e8 100644
--- a/protocols/dll/Cyberduck.Protocols.msbuildproj
+++ b/protocols/dll/Cyberduck.Protocols.msbuildproj
@@ -1,6 +1,4 @@
-<Project>
-
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.props" />
+<Project Sdk="IKVM.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net472;net8.0</TargetFrameworks>
@@ -140,7 +138,4 @@
     <Convert Include="$(TargetBuildDir)uk.com.robust-it.cloning.jar" />
   </ItemGroup>
 
-  <Import Sdk="IKVM.NET.Sdk" Project="Sdk.targets" />
-  <Import Project="$(BuildSupportDir)Cyberduck.Java.targets" />
-
 </Project>
\ No newline at end of file
diff --git a/src/main/msbuild/Cyberduck.Java.targets b/src/main/msbuild/Cyberduck.Java.targets
deleted file mode 100644
index 7a1fb84a44d..00000000000
--- a/src/main/msbuild/Cyberduck.Java.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-
-  <Target Name="_UpdateTargetPathWithTargetPlatformMonikerWithJavaMetadata" />
-
-</Project>
\ No newline at end of file