diff --git a/Cyberduck.sln b/Cyberduck.sln index 02942a3531a..b55bfada89b 100644 --- a/Cyberduck.sln +++ b/Cyberduck.sln @@ -52,6 +52,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "i18n-gen", "core\i18n-gen\i EndProject Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "package", "windows\src\main\package\package.wapproj", "{55CDD736-9A8A-4091-AC99-60E2F9C73269}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{700080FF-8673-400D-8E0A-80F5B9ECC6A1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9EC33FB0-4334-403D-9E69-0586F7E6695F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{C5D057E6-48B7-48C5-A7E2-66A21258BD04}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{82651949-B606-4CEF-BEEF-117466CC70BB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Windows = Debug|Windows @@ -116,6 +126,26 @@ Global {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.ActiveCfg = Release|x64 {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.Build.0 = Release|x64 {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.Deploy.0 = Release|x64 + {700080FF-8673-400D-8E0A-80F5B9ECC6A1}.Debug|Windows.ActiveCfg = Debug|Any CPU + {700080FF-8673-400D-8E0A-80F5B9ECC6A1}.Debug|Windows.Build.0 = Debug|Any CPU + {700080FF-8673-400D-8E0A-80F5B9ECC6A1}.Release|Windows.ActiveCfg = Release|Any CPU + {700080FF-8673-400D-8E0A-80F5B9ECC6A1}.Release|Windows.Build.0 = Release|Any CPU + {8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}.Debug|Windows.ActiveCfg = Debug|Any CPU + {8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}.Debug|Windows.Build.0 = Debug|Any CPU + {8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}.Release|Windows.ActiveCfg = Release|Any CPU + {8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}.Release|Windows.Build.0 = Release|Any CPU + {9EC33FB0-4334-403D-9E69-0586F7E6695F}.Debug|Windows.ActiveCfg = Debug|Any CPU + {9EC33FB0-4334-403D-9E69-0586F7E6695F}.Debug|Windows.Build.0 = Debug|Any CPU + {9EC33FB0-4334-403D-9E69-0586F7E6695F}.Release|Windows.ActiveCfg = Release|Any CPU + {9EC33FB0-4334-403D-9E69-0586F7E6695F}.Release|Windows.Build.0 = Release|Any CPU + {C5D057E6-48B7-48C5-A7E2-66A21258BD04}.Debug|Windows.ActiveCfg = Debug|Any CPU + {C5D057E6-48B7-48C5-A7E2-66A21258BD04}.Debug|Windows.Build.0 = Debug|Any CPU + {C5D057E6-48B7-48C5-A7E2-66A21258BD04}.Release|Windows.ActiveCfg = Release|Any CPU + {C5D057E6-48B7-48C5-A7E2-66A21258BD04}.Release|Windows.Build.0 = Release|Any CPU + {82651949-B606-4CEF-BEEF-117466CC70BB}.Debug|Windows.ActiveCfg = Debug|Any CPU + {82651949-B606-4CEF-BEEF-117466CC70BB}.Debug|Windows.Build.0 = Debug|Any CPU + {82651949-B606-4CEF-BEEF-117466CC70BB}.Release|Windows.ActiveCfg = Release|Any CPU + {82651949-B606-4CEF-BEEF-117466CC70BB}.Release|Windows.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -138,6 +168,11 @@ Global {D1286C4A-9D6A-4904-B9AD-CB7688483EDB} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {55CDD736-9A8A-4091-AC99-60E2F9C73269} = {7D32EE61-B6F0-4978-B500-45172B181283} + {700080FF-8673-400D-8E0A-80F5B9ECC6A1} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {9EC33FB0-4334-403D-9E69-0586F7E6695F} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {C5D057E6-48B7-48C5-A7E2-66A21258BD04} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {82651949-B606-4CEF-BEEF-117466CC70BB} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {289E6003-15D5-4377-ADA6-2E7093785BCD} diff --git a/Directory.Build.props b/Directory.Build.props index 8ee874b1111..afa93c38f60 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -34,6 +34,12 @@ 10 + + true + true + true + + diff --git a/Directory.Build.targets b/Directory.Build.targets index 74133d5d7c2..259737660de 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -19,15 +19,30 @@ + + $(CyberduckDir)core\dll\Cyberduck.Core.msbuildproj + $(CyberduckDir)core\src\main\csharp\Cyberduck.Core.Native.csproj $(CyberduckDir)core\native\refresh\src\main\csharp\Cyberduck.Core.Refresh.csproj + + $(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.msbuildproj + $(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj + + $(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.msbuildproj + + + $(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj + + + $(CyberduckDir)cli\dll\Cyberduck.Cli.msbuildproj + diff --git a/Packages.props b/Packages.props index 016188050df..24aa860af8d 100644 --- a/Packages.props +++ b/Packages.props @@ -18,6 +18,9 @@ + + + diff --git a/bonjour/dll/Cyberduck.Bonjour.msbuildproj b/bonjour/dll/Cyberduck.Bonjour.msbuildproj new file mode 100644 index 00000000000..680f2aac3a4 --- /dev/null +++ b/bonjour/dll/Cyberduck.Bonjour.msbuildproj @@ -0,0 +1,21 @@ + + + + net6.0 + false + 1.8 + ikvm.runtime.AppDomainAssemblyClassLoader + + + + + + + + + + + + + + diff --git a/bonjour/dll/Directory.Build.props b/bonjour/dll/Directory.Build.props new file mode 100644 index 00000000000..7a279aa7957 --- /dev/null +++ b/bonjour/dll/Directory.Build.props @@ -0,0 +1,9 @@ + + + + $(MSBuildThisFileDirectory) + + + + + diff --git a/bonjour/dll/build.xml b/bonjour/dll/build.xml index a6fca1270f1..932611f4c1e 100644 --- a/bonjour/dll/build.xml +++ b/bonjour/dll/build.xml @@ -1,54 +1,38 @@ - - - + - + + + + + + - - - + + + - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - - + + + + + + + + + + + + + + + + + + + diff --git a/bonjour/dll/pom.xml b/bonjour/dll/pom.xml index ee43247f578..fad87307b40 100644 --- a/bonjour/dll/pom.xml +++ b/bonjour/dll/pom.xml @@ -44,26 +44,6 @@ maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - org.codehaus.mojo diff --git a/bonjour/native/build.xml b/bonjour/native/build.xml index 6a5c585a427..377044482c1 100644 --- a/bonjour/native/build.xml +++ b/bonjour/native/build.xml @@ -39,8 +39,8 @@ - - + + @@ -48,6 +48,8 @@ value="${version} (${revision})"/> + diff --git a/bonjour/native/pom.xml b/bonjour/native/pom.xml index 6d47d4f855e..fc91fb35276 100644 --- a/bonjour/native/pom.xml +++ b/bonjour/native/pom.xml @@ -22,26 +22,6 @@ maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - org.codehaus.mojo diff --git a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj index 681d5516169..bce6498453b 100644 --- a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj +++ b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj @@ -1,8 +1,9 @@  - net472 + net6.0-windows10.0.19041.0 true + true @@ -10,11 +11,7 @@ - - - - - + diff --git a/cli/dll/Cyberduck.Cli.msbuildproj b/cli/dll/Cyberduck.Cli.msbuildproj new file mode 100644 index 00000000000..8271dd16f66 --- /dev/null +++ b/cli/dll/Cyberduck.Cli.msbuildproj @@ -0,0 +1,20 @@ + + + net6.0 + false + 1.8 + ikvm.runtime.AppDomainAssemblyClassLoader + + + + + + + + + + + + + + diff --git a/cli/dll/build.xml b/cli/dll/build.xml index 1313fa685b7..56bd14a7ecc 100644 --- a/cli/dll/build.xml +++ b/cli/dll/build.xml @@ -1,49 +1,56 @@ - + * $Revision: 6757 $ + * $Date: 2010-08-25 13:25:44 +0200 (Mi, 25 Aug 2010) $ + * + * Copyright (c) 2005-2012 David Kocher. All rights reserved. + * http://cyberduck.io/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version.package + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Bug fixes, suggestions and comments should be sent to: + * dkocher@cyberduck.io + --> - + + + + + + - - - + + + - - - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - + + + + + + + + + + + + + + + + + diff --git a/cli/dll/pom.xml b/cli/dll/pom.xml index dfcdc881b85..5d9066042bd 100644 --- a/cli/dll/pom.xml +++ b/cli/dll/pom.xml @@ -80,26 +80,6 @@ maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - maven-antrun-plugin @@ -114,12 +94,6 @@ ${project.version} runtime - - ch.cyberduck - Cyberduck.Core.Native - dll - ${project.version} - ch.cyberduck Cyberduck.Protocols diff --git a/cli/src/main/csharp/duck.csproj b/cli/src/main/csharp/duck.csproj index 658424bce41..079163d33c2 100644 --- a/cli/src/main/csharp/duck.csproj +++ b/cli/src/main/csharp/duck.csproj @@ -1,14 +1,19 @@  + net6.0-windows10.0.19041.0 Exe - net472 + + + + + $(Filename)$(Extension) @@ -37,12 +42,4 @@ - - - - - - - - diff --git a/cli/windows/pom.xml b/cli/windows/pom.xml index a46e64c95fd..a11fc92357f 100644 --- a/cli/windows/pom.xml +++ b/cli/windows/pom.xml @@ -104,26 +104,6 @@ maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - diff --git a/core/dll/Cyberduck.Core.msbuildproj b/core/dll/Cyberduck.Core.msbuildproj new file mode 100644 index 00000000000..81f0af9a70a --- /dev/null +++ b/core/dll/Cyberduck.Core.msbuildproj @@ -0,0 +1,59 @@ + + + net6.0 + false + 1.8 + ikvm.runtime.AppDomainAssemblyClassLoader + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/dll/Directory.Build.props b/core/dll/Directory.Build.props new file mode 100644 index 00000000000..7a279aa7957 --- /dev/null +++ b/core/dll/Directory.Build.props @@ -0,0 +1,9 @@ + + + + $(MSBuildThisFileDirectory) + + + + + diff --git a/core/dll/build.xml b/core/dll/build.xml index 421fd1d1a25..49695aede71 100644 --- a/core/dll/build.xml +++ b/core/dll/build.xml @@ -23,32 +23,34 @@ - + + + + + + - - - + + + - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - - - + + + + + + + + + + + + + + + + diff --git a/core/dll/pom.xml b/core/dll/pom.xml index 5bdda723d32..e30a93e596f 100644 --- a/core/dll/pom.xml +++ b/core/dll/pom.xml @@ -44,26 +44,6 @@ maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - org.codehaus.mojo @@ -112,7 +92,7 @@ net.java.openjdk sunmscapi ${java-native-dll} - runtime + compile net.java.openjdk @@ -126,7 +106,7 @@ net.java.openjdk sunec ${java-native-dll} - runtime + compile net.java.dev.jna diff --git a/core/native/pom.xml b/core/native/pom.xml index 5b53fdd8107..4cf7dc4aaf7 100644 --- a/core/native/pom.xml +++ b/core/native/pom.xml @@ -26,26 +26,6 @@ maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - org.codehaus.mojo diff --git a/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj b/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj index b78fbb7a10b..529b993eb6a 100644 --- a/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj +++ b/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj @@ -16,7 +16,7 @@ - net472 + net6.0-windows10.0.19041.0 11 true true @@ -29,6 +29,7 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -36,10 +37,6 @@ - - - - diff --git a/core/src/main/csharp/Cyberduck.Core.Native.csproj b/core/src/main/csharp/Cyberduck.Core.Native.csproj index 317a9415b2f..32a64085ade 100644 --- a/core/src/main/csharp/Cyberduck.Core.Native.csproj +++ b/core/src/main/csharp/Cyberduck.Core.Native.csproj @@ -16,26 +16,18 @@ - net472 + net6.0-windows10.0.19041.0 true 11 + true - - - - - - - - - - + all diff --git a/core/src/main/csharp/ch/cyberduck/core/CrashReporter.cs b/core/src/main/csharp/ch/cyberduck/core/CrashReporter.cs index cdbb3cde22a..3d7140f60bc 100644 --- a/core/src/main/csharp/ch/cyberduck/core/CrashReporter.cs +++ b/core/src/main/csharp/ch/cyberduck/core/CrashReporter.cs @@ -1,4 +1,5 @@ -// +#if false +// // Copyright (c) 2010-2016 Yves Langisch. All rights reserved. // http://cyberduck.io/ // @@ -182,3 +183,5 @@ private byte[] GetMultipartFormData(Dictionary postParameters, s } } } + +#endif diff --git a/core/src/main/csharp/ch/cyberduck/core/local/SystemLocal.cs b/core/src/main/csharp/ch/cyberduck/core/local/SystemLocal.cs index 4a8582d3709..6bcb8cf2d38 100644 --- a/core/src/main/csharp/ch/cyberduck/core/local/SystemLocal.cs +++ b/core/src/main/csharp/ch/cyberduck/core/local/SystemLocal.cs @@ -143,7 +143,7 @@ private static string Sanitize(string name, bool makeUnc = false) // there is no need to validate hostnames here, would bail out somewhere else // handles all cases of "\\*\" // including, but not limited to: wsl$, wsl.localhost, \\?\ (MAX_PATH bypass), any network share - Append(segment, writer); + Methods.Append(segment, writer); nextDriveLetter = segment.Length == 1 && (segment[0] == '?' || segment[0] == '.'); } else if (firstChanceDriveLetter && segment.Length == 2 && segment[1] == Path.VolumeSeparatorChar) @@ -198,8 +198,11 @@ private static string Sanitize(string name, bool makeUnc = false) } } return writer.ToString(); + } - static void Append(in ReadOnlySpan range, StringWriter writer) + static class Methods + { + internal static void Append(in ReadOnlySpan range, StringWriter writer) { // skip any allocation of strings or arrays. foreach (ref readonly var c in range) diff --git a/core/src/main/csharp/ch/cyberduck/core/proxy/SystemProxy.cs b/core/src/main/csharp/ch/cyberduck/core/proxy/SystemProxy.cs index ccc54f21f18..8048db48a42 100644 --- a/core/src/main/csharp/ch/cyberduck/core/proxy/SystemProxy.cs +++ b/core/src/main/csharp/ch/cyberduck/core/proxy/SystemProxy.cs @@ -46,9 +46,13 @@ public override ch.cyberduck.core.proxy.Proxy find(string host) return ch.cyberduck.core.proxy.Proxy.DIRECT; } - Uri proxy = _system.GetProxy(target); - return new ch.cyberduck.core.proxy.Proxy(ch.cyberduck.core.proxy.Proxy.Type.valueOf(proxy.Scheme.ToUpper()), - proxy.Host, proxy.Port, proxy.UserInfo); + if (_system.GetProxy(target) is Uri proxy) + { + return new ch.cyberduck.core.proxy.Proxy(ch.cyberduck.core.proxy.Proxy.Type.valueOf(proxy.Scheme.ToUpper()), + proxy.Host, proxy.Port, proxy.UserInfo); + } + + return ch.cyberduck.core.proxy.Proxy.DIRECT; } } } diff --git a/core/src/main/java/ch/cyberduck/core/ssl/CustomTrustSSLProtocolSocketFactory.java b/core/src/main/java/ch/cyberduck/core/ssl/CustomTrustSSLProtocolSocketFactory.java index 84ad4c5f8bd..7d33b9e6d93 100644 --- a/core/src/main/java/ch/cyberduck/core/ssl/CustomTrustSSLProtocolSocketFactory.java +++ b/core/src/main/java/ch/cyberduck/core/ssl/CustomTrustSSLProtocolSocketFactory.java @@ -78,7 +78,7 @@ public CustomTrustSSLProtocolSocketFactory(final X509TrustManager trust, final X this.key = key; try { // Default provider - context = SSLContext.getInstance("TLSv1.3"); + context = SSLContext.getInstance("TLSv1.2"); context.init(new KeyManager[]{key}, new TrustManager[]{trust}, seeder); if(log.isDebugEnabled()) { log.debug(String.format("Using SSL context with protocol %s", context.getProtocol())); diff --git a/core/src/test/csharp/Cyberduck.Core.Test.csproj b/core/src/test/csharp/Cyberduck.Core.Test.csproj index 976116d6a0b..7c2a3ba293b 100644 --- a/core/src/test/csharp/Cyberduck.Core.Test.csproj +++ b/core/src/test/csharp/Cyberduck.Core.Test.csproj @@ -1,24 +1,17 @@  - net472 + net6.0-windows10.0.19041.0 false - - - - - - - - - + + diff --git a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj new file mode 100644 index 00000000000..45fd37732e4 --- /dev/null +++ b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj @@ -0,0 +1,24 @@ + + + net6.0 + false + 1.8 + ikvm.runtime.AppDomainAssemblyClassLoader + + + + + + + + + + + + + + + + + + diff --git a/cryptomator/dll/build.xml b/cryptomator/dll/build.xml index 94c042db69d..cf5872a37ab 100644 --- a/cryptomator/dll/build.xml +++ b/cryptomator/dll/build.xml @@ -1,48 +1,56 @@ + * $Revision: 6757 $ + * $Date: 2010-08-25 13:25:44 +0200 (Mi, 25 Aug 2010) $ + * + * Copyright (c) 2005-2012 David Kocher. All rights reserved. + * http://cyberduck.io/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version.package + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Bug fixes, suggestions and comments should be sent to: + * dkocher@cyberduck.io + --> - + + + + + + - - - + + + - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - - + + + + + + + + + + + + + + + + diff --git a/cryptomator/dll/pom.xml b/cryptomator/dll/pom.xml index f03a3484778..f71e4e42921 100644 --- a/cryptomator/dll/pom.xml +++ b/cryptomator/dll/pom.xml @@ -57,6 +57,9 @@ + + maven-dependency-plugin + org.codehaus.mojo build-helper-maven-plugin @@ -78,29 +81,6 @@ - - maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - - maven-antrun-plugin diff --git a/defaults/src/main/resources/default.properties b/defaults/src/main/resources/default.properties index 38772875f4d..c300759b8b9 100644 --- a/defaults/src/main/resources/default.properties +++ b/defaults/src/main/resources/default.properties @@ -579,7 +579,7 @@ connection.unsecure.warning.ftp=true connection.unsecure.warning.http=true connection.ssl.provider.bouncycastle.position=1 # Register bouncy castle as preferred provider. Used in Cyptomator, SSL and SSH -connection.ssl.protocols=TLSv1.3,TLSv1.2,TLSv1.1,TLSv1 +connection.ssl.protocols=TLSv1.2,TLSv1.1,TLSv1 connection.ssl.protocols.ftp=TLSv1.2,TLSv1.1,TLSv1 connection.ssl.cipher.blacklist= connection.ssl.x509.revocation.online=false diff --git a/global.json b/global.json index 0b31220b2e8..b5658e50d7c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.3.0", - "Microsoft.Build.Traversal": "3.1.6" + "Microsoft.Build.Traversal": "3.1.6", + "IKVM.Net.Sdk": "8.7.0-pre.2" } } diff --git a/nuget.config b/nuget.config index 3f0e003403c..1824fab8e40 100644 --- a/nuget.config +++ b/nuget.config @@ -1,6 +1,8 @@  + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 363c97c00b0..04663a22cf4 100644 --- a/pom.xml +++ b/pom.xml @@ -909,6 +909,31 @@ + + windows + + + Windows + + + + + + + maven-dependency-plugin + + + copy-dependencies-jar-target + + true + + + + + + + + release-sign-artifacts diff --git a/protocols/dll/Cyberduck.Protocols.msbuildproj b/protocols/dll/Cyberduck.Protocols.msbuildproj new file mode 100644 index 00000000000..b53332bdb35 --- /dev/null +++ b/protocols/dll/Cyberduck.Protocols.msbuildproj @@ -0,0 +1,145 @@ + + + net6.0 + false + 1.8 + ikvm.runtime.AppDomainAssemblyClassLoader + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/protocols/dll/build.xml b/protocols/dll/build.xml index 0fcaaf7e481..fbc17526385 100644 --- a/protocols/dll/build.xml +++ b/protocols/dll/build.xml @@ -23,34 +23,34 @@ - + + + + + + - - - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - - - + + - + + + + + + + + + + + + + + + + diff --git a/protocols/dll/pom.xml b/protocols/dll/pom.xml index 0dbef8a884a..37c9a2c6c45 100644 --- a/protocols/dll/pom.xml +++ b/protocols/dll/pom.xml @@ -65,26 +65,6 @@ maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - maven-antrun-plugin diff --git a/windows/src/test/csharp/Cyberduck.Test.csproj b/windows/src/test/csharp/Cyberduck.Test.csproj index 3f53d19cac6..e50ce3a2557 100644 --- a/windows/src/test/csharp/Cyberduck.Test.csproj +++ b/windows/src/test/csharp/Cyberduck.Test.csproj @@ -1,7 +1,7 @@  - net472 + net6.0-windows10.0.90141.0 11.0 false @@ -11,15 +11,12 @@ - - - - +