Update ikvmnet

iterate-ch · Aug 28, 2024 · 9003815 · 9003815
1 parent 2328a84
commit 9003815
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 44 deletions.
diff --git 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
@@ -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.45" />
     <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
@@ -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>
diff --git 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>
diff --git 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>
diff --git 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>
diff --git 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.45",
     "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
@@ -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>
diff --git 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>
diff --git a/src/main/msbuild/Cyberduck.Java.targets b/src/main/msbuild/Cyberduck.Java.targets