Retarget net6.0 & IKVM 8.7.0-dev.533

AliveDevil · AliveDevil · commit 7451a2aec3cf · 2023-10-24T15:58:36.000+02:00
diff --git a/Packages.props b/Packages.props
@@ -18,9 +18,9 @@
   <ItemGroup>
     <PackageReference Update="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.100" />
     <PackageReference Update="ExceptionReporter " Version="2.4.2" />
-    <PackageReference Update="IKVM" Version="8.6.92" />
-    <PackageReference Update="IKVM.Image.JRE" Version="8.6.92" />
-    <PackageReference Update="IKVM.MSBuild" Version="8.6.92" />
+    <PackageReference Update="IKVM" Version="8.7.0-pre.2" />
+    <PackageReference Update="IKVM.Image.JRE" Version="8.7.0-pre.2" />
+    <PackageReference Update="IKVM.MSBuild" Version="8.7.0-pre.2" />
     <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,7 @@
 <Project Sdk="IKVM.Net.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <EnableDefaultItems>false</EnableDefaultItems>
         <LangVersion>1.8</LangVersion>
         <ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
diff --git a/cli/dll/Cyberduck.Cli.msbuildproj b/cli/dll/Cyberduck.Cli.msbuildproj
@@ -1,6 +1,6 @@
 <Project Sdk="IKVM.Net.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <EnableDefaultItems>false</EnableDefaultItems>
         <LangVersion>1.8</LangVersion>
         <ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
diff --git a/core/dll/Cyberduck.Core.msbuildproj b/core/dll/Cyberduck.Core.msbuildproj
@@ -1,6 +1,6 @@
 <Project Sdk="IKVM.Net.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <EnableDefaultItems>false</EnableDefaultItems>
         <LangVersion>1.8</LangVersion>
         <ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
@@ -14,9 +14,9 @@
     <ItemGroup>
         <Convert Include="$(TargetDir)activation.jar" />
         <Convert Include="$(TargetDir)base64.jar" />
-        <Convert Include="$(TargetDir)bcpkix-jdk15on.jar" />
-        <Convert Include="$(TargetDir)bcprov-jdk15on.jar" />
-        <Convert Include="$(TargetDir)bcutil-jdk15on.jar" />
+        <Convert Include="$(TargetDir)bcpkix-jdk18on.jar" />
+        <Convert Include="$(TargetDir)bcprov-jdk18on.jar" />
+        <Convert Include="$(TargetDir)bcutil-jdk18on.jar" />
         <Convert Include="$(TargetDir)checker-qual.jar" />
         <Convert Include="$(TargetDir)commons-codec.jar" />
         <Convert Include="$(TargetDir)commons-collections4.jar" />
diff --git a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj
@@ -1,6 +1,6 @@
 <Project Sdk="IKVM.Net.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <EnableDefaultItems>false</EnableDefaultItems>
         <LangVersion>1.8</LangVersion>
         <ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
diff --git a/global.json b/global.json
@@ -2,6 +2,6 @@
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.3.0",
     "Microsoft.Build.Traversal": "3.1.6",
-    "IKVM.Net.Sdk": "8.6.92.0"
+    "IKVM.Net.Sdk": "8.7.0-pre.2"
   }
 }
diff --git a/nuget.config b/nuget.config
@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <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" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/protocols/dll/Cyberduck.Protocols.msbuildproj b/protocols/dll/Cyberduck.Protocols.msbuildproj
@@ -1,6 +1,6 @@
 <Project Sdk="IKVM.Net.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <EnableDefaultItems>false</EnableDefaultItems>
         <LangVersion>1.8</LangVersion>
         <ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"msbuild-sdks": {`
`3`	`3`	`"Microsoft.Build.NoTargets": "3.3.0",`
`4`	`4`	`"Microsoft.Build.Traversal": "3.1.6",`
`5`		`- "IKVM.Net.Sdk": "8.6.92.0"`
	`5`	`+ "IKVM.Net.Sdk": "8.7.0-pre.2"`
`6`	`6`	`}`
`7`	`7`	`}`