From d6742644ab01d93f60cacf151ecc72c00ef79bd1 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 12 Oct 2023 13:15:14 +0200 Subject: [PATCH] Retarget net6.0 & IKVM 8.7.0-dev.533 --- Packages.props | 6 +++--- bonjour/dll/Cyberduck.Bonjour.msbuildproj | 2 +- cli/dll/Cyberduck.Cli.msbuildproj | 2 +- core/dll/Cyberduck.Core.msbuildproj | 8 ++++---- cryptomator/dll/Cyberduck.Cryptomator.msbuildproj | 2 +- global.json | 2 +- nuget.config | 1 + protocols/dll/Cyberduck.Protocols.msbuildproj | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Packages.props b/Packages.props index 8f41af9273a..31d3ef5f60d 100644 --- a/Packages.props +++ b/Packages.props @@ -18,9 +18,9 @@ - - - + + + diff --git a/bonjour/dll/Cyberduck.Bonjour.msbuildproj b/bonjour/dll/Cyberduck.Bonjour.msbuildproj index 63402a12888..680f2aac3a4 100644 --- a/bonjour/dll/Cyberduck.Bonjour.msbuildproj +++ b/bonjour/dll/Cyberduck.Bonjour.msbuildproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 false 1.8 ikvm.runtime.AppDomainAssemblyClassLoader diff --git a/cli/dll/Cyberduck.Cli.msbuildproj b/cli/dll/Cyberduck.Cli.msbuildproj index 9d9a21b849e..8271dd16f66 100644 --- a/cli/dll/Cyberduck.Cli.msbuildproj +++ b/cli/dll/Cyberduck.Cli.msbuildproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 false 1.8 ikvm.runtime.AppDomainAssemblyClassLoader diff --git a/core/dll/Cyberduck.Core.msbuildproj b/core/dll/Cyberduck.Core.msbuildproj index 05bbc55c330..81f0af9a70a 100644 --- a/core/dll/Cyberduck.Core.msbuildproj +++ b/core/dll/Cyberduck.Core.msbuildproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 false 1.8 ikvm.runtime.AppDomainAssemblyClassLoader @@ -14,9 +14,9 @@ - - - + + + diff --git a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj index 014389fee5d..45fd37732e4 100644 --- a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj +++ b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 false 1.8 ikvm.runtime.AppDomainAssemblyClassLoader diff --git a/global.json b/global.json index 5b0546cf462..3091a96b989 100644 --- 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-dev.533" } } diff --git a/nuget.config b/nuget.config index ae9f223d8fa..1824fab8e40 100644 --- a/nuget.config +++ b/nuget.config @@ -2,6 +2,7 @@ + \ No newline at end of file diff --git a/protocols/dll/Cyberduck.Protocols.msbuildproj b/protocols/dll/Cyberduck.Protocols.msbuildproj index 6748abf4536..b53332bdb35 100644 --- a/protocols/dll/Cyberduck.Protocols.msbuildproj +++ b/protocols/dll/Cyberduck.Protocols.msbuildproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 false 1.8 ikvm.runtime.AppDomainAssemblyClassLoader