From c09294ef39c295407a6e0dd4535cf12796f6753f Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 25 Jul 2024 12:03:33 +0200 Subject: [PATCH 01/23] [maven-release-plugin] prepare for next development iteration --- azure/pom.xml | 2 +- backblaze/pom.xml | 2 +- binding/pom.xml | 2 +- bonjour/dll/pom.xml | 2 +- bonjour/native/pom.xml | 2 +- bonjour/pom.xml | 2 +- box/pom.xml | 2 +- brick/pom.xml | 2 +- cli/dll/pom.xml | 2 +- cli/linux/pom.xml | 2 +- cli/osx/pom.xml | 2 +- cli/pom.xml | 2 +- cli/windows/pom.xml | 2 +- core/dll/pom.xml | 2 +- core/dylib/pom.xml | 2 +- core/native/pom.xml | 2 +- core/native/refresh/pom.xml | 2 +- core/pom.xml | 2 +- cryptomator/dll/pom.xml | 2 +- cryptomator/pom.xml | 2 +- ctera/pom.xml | 2 +- deepbox/pom.xml | 2 +- defaults/pom.xml | 2 +- dracoon/pom.xml | 2 +- dropbox/pom.xml | 2 +- eue/pom.xml | 2 +- freenet/pom.xml | 2 +- ftp/pom.xml | 2 +- googledrive/pom.xml | 2 +- googlestorage/pom.xml | 2 +- hubic/pom.xml | 2 +- i18n/pom.xml | 2 +- importer/dll/pom.xml | 2 +- importer/pom.xml | 2 +- irods/pom.xml | 2 +- jersey/pom.xml | 2 +- manta/pom.xml | 2 +- nextcloud/pom.xml | 2 +- nio/pom.xml | 2 +- oauth/pom.xml | 2 +- onedrive/pom.xml | 2 +- openstack/pom.xml | 2 +- osx/pom.xml | 2 +- owncloud/pom.xml | 2 +- pom.xml | 19 ++++++++++--------- profiles/pom.xml | 2 +- protocols/dll/pom.xml | 2 +- protocols/pom.xml | 2 +- s3/pom.xml | 2 +- smb/pom.xml | 2 +- spectra/pom.xml | 2 +- ssh/pom.xml | 2 +- storegate/pom.xml | 2 +- test/pom.xml | 2 +- tus/pom.xml | 2 +- webdav/pom.xml | 2 +- windows/pom.xml | 2 +- 57 files changed, 66 insertions(+), 65 deletions(-) diff --git a/azure/pom.xml b/azure/pom.xml index 8e27743f0a8..c1f3535daa4 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT azure diff --git a/backblaze/pom.xml b/backblaze/pom.xml index f01f87575a1..f00f725ff25 100644 --- a/backblaze/pom.xml +++ b/backblaze/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT backblaze jar diff --git a/binding/pom.xml b/binding/pom.xml index 65c44107696..b4a5ad38895 100644 --- a/binding/pom.xml +++ b/binding/pom.xml @@ -19,7 +19,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT binding jar diff --git a/bonjour/dll/pom.xml b/bonjour/dll/pom.xml index 2b62737d142..40ead80da9e 100644 --- a/bonjour/dll/pom.xml +++ b/bonjour/dll/pom.xml @@ -5,7 +5,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Bonjour pom diff --git a/bonjour/native/pom.xml b/bonjour/native/pom.xml index 2f20795722d..039fd43ac52 100644 --- a/bonjour/native/pom.xml +++ b/bonjour/native/pom.xml @@ -5,7 +5,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Bonjour.Native pom diff --git a/bonjour/pom.xml b/bonjour/pom.xml index 12682c25aeb..ab6fc8b79d5 100644 --- a/bonjour/pom.xml +++ b/bonjour/pom.xml @@ -18,7 +18,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 diff --git a/box/pom.xml b/box/pom.xml index 712393273ad..86f964e7848 100644 --- a/box/pom.xml +++ b/box/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT box diff --git a/brick/pom.xml b/brick/pom.xml index 1bafb0da673..b41cd77890b 100644 --- a/brick/pom.xml +++ b/brick/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT brick jar diff --git a/cli/dll/pom.xml b/cli/dll/pom.xml index 1c7c8009139..881261892dd 100644 --- a/cli/dll/pom.xml +++ b/cli/dll/pom.xml @@ -20,7 +20,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Cli pom diff --git a/cli/linux/pom.xml b/cli/linux/pom.xml index 1efdba9be64..1f6c8406fba 100644 --- a/cli/linux/pom.xml +++ b/cli/linux/pom.xml @@ -20,7 +20,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT cli-linux Cyberduck CLI Linux diff --git a/cli/osx/pom.xml b/cli/osx/pom.xml index 7bd1b2a9bf4..dcf7d39c6ca 100644 --- a/cli/osx/pom.xml +++ b/cli/osx/pom.xml @@ -20,7 +20,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT cli-osx Cyberduck CLI Mac diff --git a/cli/pom.xml b/cli/pom.xml index 08bbd3eb224..8d92a761ccc 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -19,7 +19,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT cli diff --git a/cli/windows/pom.xml b/cli/windows/pom.xml index 5e4c31d114b..5f660f94b56 100644 --- a/cli/windows/pom.xml +++ b/cli/windows/pom.xml @@ -20,7 +20,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT cli-windows Cyberduck CLI Windows diff --git a/core/dll/pom.xml b/core/dll/pom.xml index 60344ed5b93..da668ec9729 100644 --- a/core/dll/pom.xml +++ b/core/dll/pom.xml @@ -5,7 +5,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Core pom diff --git a/core/dylib/pom.xml b/core/dylib/pom.xml index 3e3567bc9d3..36f1943d9cb 100644 --- a/core/dylib/pom.xml +++ b/core/dylib/pom.xml @@ -5,7 +5,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT libcore diff --git a/core/native/pom.xml b/core/native/pom.xml index 595a167aa59..f00cb916933 100644 --- a/core/native/pom.xml +++ b/core/native/pom.xml @@ -5,7 +5,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Core.Native pom diff --git a/core/native/refresh/pom.xml b/core/native/refresh/pom.xml index a5bdc3c10d0..2062e5741ac 100644 --- a/core/native/refresh/pom.xml +++ b/core/native/refresh/pom.xml @@ -5,7 +5,7 @@ ch.cyberduck Cyberduck.Core.Native ../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Core.Refresh pom diff --git a/core/pom.xml b/core/pom.xml index de7deadb90d..d0d71707531 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT core jar diff --git a/cryptomator/dll/pom.xml b/cryptomator/dll/pom.xml index 14c4cc66855..87099954603 100644 --- a/cryptomator/dll/pom.xml +++ b/cryptomator/dll/pom.xml @@ -20,7 +20,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Cryptomator pom diff --git a/cryptomator/pom.xml b/cryptomator/pom.xml index ea747d7fd5f..ddc8cccaa12 100644 --- a/cryptomator/pom.xml +++ b/cryptomator/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT cryptomator jar diff --git a/ctera/pom.xml b/ctera/pom.xml index 262c1d3afeb..d43b20aaf58 100644 --- a/ctera/pom.xml +++ b/ctera/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT ctera jar diff --git a/deepbox/pom.xml b/deepbox/pom.xml index b4629614bb9..2e4e77ae085 100644 --- a/deepbox/pom.xml +++ b/deepbox/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT deepbox diff --git a/defaults/pom.xml b/defaults/pom.xml index 070a8151e6e..be74420029e 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT defaults diff --git a/dracoon/pom.xml b/dracoon/pom.xml index d2b9282dc54..df230ca3f57 100644 --- a/dracoon/pom.xml +++ b/dracoon/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT dracoon diff --git a/dropbox/pom.xml b/dropbox/pom.xml index af2ab77c30a..745bac51a31 100644 --- a/dropbox/pom.xml +++ b/dropbox/pom.xml @@ -18,7 +18,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 dropbox diff --git a/eue/pom.xml b/eue/pom.xml index ac1915751ec..440b009a651 100644 --- a/eue/pom.xml +++ b/eue/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT eue jar diff --git a/freenet/pom.xml b/freenet/pom.xml index 6fc6d8218c9..2bf5832c492 100644 --- a/freenet/pom.xml +++ b/freenet/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT freenet jar diff --git a/ftp/pom.xml b/ftp/pom.xml index 31103bcd19b..339c1956567 100644 --- a/ftp/pom.xml +++ b/ftp/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT ftp jar diff --git a/googledrive/pom.xml b/googledrive/pom.xml index f0a51091a51..c52ffb54398 100644 --- a/googledrive/pom.xml +++ b/googledrive/pom.xml @@ -18,7 +18,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 googledrive diff --git a/googlestorage/pom.xml b/googlestorage/pom.xml index f34cad32bd1..b4bc69608de 100644 --- a/googlestorage/pom.xml +++ b/googlestorage/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT googlestorage diff --git a/hubic/pom.xml b/hubic/pom.xml index bc3881eba1f..4061993b016 100644 --- a/hubic/pom.xml +++ b/hubic/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT hubic jar diff --git a/i18n/pom.xml b/i18n/pom.xml index eadc912e89a..8c9e3c4f9d5 100644 --- a/i18n/pom.xml +++ b/i18n/pom.xml @@ -18,7 +18,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 jar diff --git a/importer/dll/pom.xml b/importer/dll/pom.xml index f240bba52d9..d24d91e5674 100644 --- a/importer/dll/pom.xml +++ b/importer/dll/pom.xml @@ -5,7 +5,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Importer pom diff --git a/importer/pom.xml b/importer/pom.xml index 07da61d8aae..b014df1881e 100644 --- a/importer/pom.xml +++ b/importer/pom.xml @@ -18,7 +18,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 diff --git a/irods/pom.xml b/irods/pom.xml index 6bb5bd448ba..cc17cef3794 100644 --- a/irods/pom.xml +++ b/irods/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT irods jar diff --git a/jersey/pom.xml b/jersey/pom.xml index 9cadddffca4..84178273c91 100644 --- a/jersey/pom.xml +++ b/jersey/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT jersey diff --git a/manta/pom.xml b/manta/pom.xml index 9de983b4af3..572f2b7cda2 100644 --- a/manta/pom.xml +++ b/manta/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT manta diff --git a/nextcloud/pom.xml b/nextcloud/pom.xml index 086deaaf989..ba5bcbad7cb 100644 --- a/nextcloud/pom.xml +++ b/nextcloud/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT nextcloud jar diff --git a/nio/pom.xml b/nio/pom.xml index 59ec1b9e82a..c50071dbeba 100644 --- a/nio/pom.xml +++ b/nio/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT nio jar diff --git a/oauth/pom.xml b/oauth/pom.xml index 9d4593c15e6..d260dadc7d5 100644 --- a/oauth/pom.xml +++ b/oauth/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT oauth diff --git a/onedrive/pom.xml b/onedrive/pom.xml index 9ad3891df7e..53b3f909d8c 100644 --- a/onedrive/pom.xml +++ b/onedrive/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT onedrive diff --git a/openstack/pom.xml b/openstack/pom.xml index f846e8c3311..70a001524d4 100644 --- a/openstack/pom.xml +++ b/openstack/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT openstack jar diff --git a/osx/pom.xml b/osx/pom.xml index 0d1a1975104..b352dc96d62 100644 --- a/osx/pom.xml +++ b/osx/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT osx jar diff --git a/owncloud/pom.xml b/owncloud/pom.xml index f54698d2d5a..114f3fc227c 100644 --- a/owncloud/pom.xml +++ b/owncloud/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT owncloud jar diff --git a/pom.xml b/pom.xml index 0ed3bff9289..cc9f5e1a67b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 ch.cyberduck parent Cyberduck pom - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT defaults @@ -80,7 +81,7 @@ 8 8 - + 5.14.0 2.38 2.14.2 @@ -507,12 +508,12 @@ - - - - - - + + + + + + diff --git a/profiles/pom.xml b/profiles/pom.xml index 690ab6389ae..38235a5d8d3 100644 --- a/profiles/pom.xml +++ b/profiles/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT profiles jar diff --git a/protocols/dll/pom.xml b/protocols/dll/pom.xml index c29b36e8beb..6f69262ee91 100644 --- a/protocols/dll/pom.xml +++ b/protocols/dll/pom.xml @@ -5,7 +5,7 @@ ch.cyberduck parent ../../pom.xml - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT Cyberduck.Protocols pom diff --git a/protocols/pom.xml b/protocols/pom.xml index 46251caa890..ae3c36c9dd6 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -18,7 +18,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 pom diff --git a/s3/pom.xml b/s3/pom.xml index 9780c217b58..58af7abfff5 100644 --- a/s3/pom.xml +++ b/s3/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT s3 jar diff --git a/smb/pom.xml b/smb/pom.xml index 007be8f810a..74dede3a0bf 100644 --- a/smb/pom.xml +++ b/smb/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT smb jar diff --git a/spectra/pom.xml b/spectra/pom.xml index 4606271e08a..393b245a6aa 100644 --- a/spectra/pom.xml +++ b/spectra/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT spectra jar diff --git a/ssh/pom.xml b/ssh/pom.xml index f947333a2cd..aa67fe194e7 100644 --- a/ssh/pom.xml +++ b/ssh/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT ssh jar diff --git a/storegate/pom.xml b/storegate/pom.xml index 55c99214bca..eeb5c3c0064 100644 --- a/storegate/pom.xml +++ b/storegate/pom.xml @@ -19,7 +19,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT storegate diff --git a/test/pom.xml b/test/pom.xml index a59f4ad4295..3b6c068faf2 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 pom diff --git a/tus/pom.xml b/tus/pom.xml index 7c843e13a84..24442fad7e5 100644 --- a/tus/pom.xml +++ b/tus/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT tus jar diff --git a/webdav/pom.xml b/webdav/pom.xml index 364441ab546..88727fa618a 100644 --- a/webdav/pom.xml +++ b/webdav/pom.xml @@ -18,7 +18,7 @@ ch.cyberduck parent - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT webdav jar diff --git a/windows/pom.xml b/windows/pom.xml index 504c1c95367..fa2bf03a344 100644 --- a/windows/pom.xml +++ b/windows/pom.xml @@ -18,7 +18,7 @@ parent ch.cyberduck - 9.1.1-SNAPSHOT + 10.0.0-SNAPSHOT 4.0.0 Cyberduck.Native From f6155dfceac8eee46af689e97a226a26d410bfd5 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 25 Jul 2024 14:54:48 +0200 Subject: [PATCH 02/23] Migrate to ikvmnet --- .github/workflows/build.yml | 7 + Cyberduck.sln | 132 ++++++++++++++++- Directory.Build.Java.props | 10 ++ Directory.Build.props | 19 +-- Directory.Build.targets | 24 ++- Packages.props | 3 +- bonjour/dll/Cyberduck.Bonjour.msbuildproj | 12 ++ bonjour/dll/Directory.Build.props | 25 ++++ bonjour/dll/build.xml | 36 ++--- bonjour/dll/pom.xml | 30 ++-- bonjour/native/pom.xml | 20 --- .../csharp/Cyberduck.Bonjour.Native.csproj | 6 +- build.xml | 13 ++ cli/dll/Cyberduck.Cli.msbuildproj | 13 ++ cli/dll/Directory.Build.props | 25 ++++ cli/dll/build.xml | 37 ++--- cli/dll/pom.xml | 20 --- cli/src/main/csharp/Directory.Build.props | 5 - cli/src/main/csharp/duck.csproj | 13 +- cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs | 73 ++------- cli/src/main/wix/Bundle/duck.bundle.wixproj | 7 + cli/windows/build.proj | 2 +- cli/windows/pom.xml | 20 --- core/dll/Cyberduck.Core.msbuildproj | 53 +++++++ core/dll/Directory.Build.props | 25 ++++ core/dll/build.xml | 40 ++--- core/dll/pom.xml | 52 +------ core/native/build.xml | 7 +- core/native/pom.xml | 28 ---- core/native/refresh/pom.xml | 20 --- .../main/csharp/Cyberduck.Core.Refresh.csproj | 2 +- .../main/csharp/Cyberduck.Core.Native.csproj | 5 +- .../preferences/ApplicationPreferences.cs | 4 - .../test/csharp/Cyberduck.Core.Test.csproj | 5 +- .../csharp/ch/cyberduck/core/JavaSetup.cs | 12 ++ .../cyberduck/core/local/SystemLocalTest.cs | 8 +- .../dll/Cyberduck.Cryptomator.msbuildproj | 13 ++ cryptomator/dll/Directory.Build.props | 25 ++++ cryptomator/dll/build.xml | 36 ++--- cryptomator/dll/pom.xml | 20 --- global.json | 1 + importer/dll/Cyberduck.Importer.msbuildproj | 13 ++ importer/dll/Directory.Build.props | 25 ++++ importer/dll/build.xml | 36 ++--- importer/dll/pom.xml | 28 +--- nuget.config | 10 ++ pom.xml | 28 +++- protocols/dll/Cyberduck.Protocols.msbuildproj | 137 +++++++++++++++++ protocols/dll/Directory.Build.props | 25 ++++ protocols/dll/build.xml | 39 ++--- protocols/dll/pom.xml | 20 --- windows/build.proj | 4 +- windows/build.xml | 6 +- windows/pom.xml | 18 --- windows/src/main/csharp/Cyberduck.csproj | 12 +- windows/src/main/csharp/Directory.Build.props | 5 - windows/src/main/package/package.wapproj | 2 + .../main/wix/Bundle/Cyberduck.Bundle.wixproj | 7 + windows/src/main/wix/Bundle/Cyberduck.wxs | 140 ++++++------------ windows/src/test/csharp/Cyberduck.Test.csproj | 5 +- windows/src/test/csharp/Directory.Build.props | 5 - 61 files changed, 817 insertions(+), 656 deletions(-) create mode 100644 Directory.Build.Java.props create mode 100644 bonjour/dll/Cyberduck.Bonjour.msbuildproj create mode 100644 bonjour/dll/Directory.Build.props create mode 100644 cli/dll/Cyberduck.Cli.msbuildproj create mode 100644 cli/dll/Directory.Build.props create mode 100644 core/dll/Cyberduck.Core.msbuildproj create mode 100644 core/dll/Directory.Build.props create mode 100644 core/src/test/csharp/ch/cyberduck/core/JavaSetup.cs create mode 100644 cryptomator/dll/Cyberduck.Cryptomator.msbuildproj create mode 100644 cryptomator/dll/Directory.Build.props create mode 100644 importer/dll/Cyberduck.Importer.msbuildproj create mode 100644 importer/dll/Directory.Build.props create mode 100644 protocols/dll/Cyberduck.Protocols.msbuildproj create mode 100644 protocols/dll/Directory.Build.props diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e27a60d15d..d13169e4e37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,6 +31,13 @@ jobs: if: runner.os == 'windows' with: msbuild-architecture: x64 + - name: "NuGet" + if: runner.os == 'windows' + env: + NugetCredentials: "Username=${{ github.actor }};Password=${{ secrets.GITHUB_TOKEN }}" + run: | + echo "NuGetPackageSourceCredentials_gh-ikvmnet=${{ env.NugetCredentials }}" >> $env:GITHUB_ENV + echo "NuGetPackageSourceCredentials_gh-iterate-ch=${{ env.NugetCredentials }}" >> $env:GITHUB_ENV - name: Cache local Maven repository uses: actions/cache@v4 with: diff --git a/Cyberduck.sln b/Cyberduck.sln index 02942a3531a..92f036b5dd6 100644 --- a/Cyberduck.sln +++ b/Cyberduck.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31825.309 @@ -52,12 +51,36 @@ 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("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}" +EndProject +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}" +EndProject +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.msbuildproj", "{C9B1C169-1354-4348-9938-7892399C6336}" +EndProject +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}" +EndProject +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}" +EndProject +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Windows = Debug|Windows Release|Windows = Release|Windows EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|Windows.ActiveCfg = Debug|Any CPU + {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|Windows.Build.0 = Debug|Any CPU + {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|Windows.ActiveCfg = Release|Any CPU + {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|Windows.Build.0 = Release|Any CPU + {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|Windows.ActiveCfg = Debug|Any CPU + {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|Windows.Build.0 = Debug|Any CPU + {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|Windows.ActiveCfg = Release|Any CPU + {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|Windows.Build.0 = Release|Any CPU + {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|Windows.ActiveCfg = Debug|Any CPU + {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|Windows.Build.0 = Debug|Any CPU + {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|Windows.ActiveCfg = Release|Any CPU + {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|Windows.Build.0 = Release|Any CPU {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.ActiveCfg = Debug|x64 {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.Build.0 = Debug|x64 {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|Windows.ActiveCfg = Release|x64 @@ -78,12 +101,113 @@ Global {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|Windows.Build.0 = Debug|x64 {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.ActiveCfg = Release|x64 {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.Build.0 = Release|x64 + {9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|Windows.ActiveCfg = Debug|Any CPU + {9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|Windows.Build.0 = Debug|Any CPU + {9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|Windows.ActiveCfg = Release|Any CPU + {9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|Windows.Build.0 = Release|Any CPU + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|Windows.ActiveCfg = Debug|Any CPU + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|Windows.Build.0 = Debug|Any CPU + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|Windows.ActiveCfg = Release|Any CPU + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|Windows.Build.0 = Release|Any CPU {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.ActiveCfg = Debug|x64 {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.Build.0 = Debug|x64 {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.ActiveCfg = Release|x64 {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.Build.0 = Release|x64 + {C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.ActiveCfg = Debug|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.Build.0 = Debug|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.ActiveCfg = Release|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.Build.0 = Release|Any CPU + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.ActiveCfg = Debug|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.Build.0 = Debug|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.ActiveCfg = Release|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.Build.0 = Release|Win32 + {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.ActiveCfg = Debug|x86 + {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.Build.0 = Debug|x86 + {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.ActiveCfg = Release|x86 + {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.Build.0 = Release|x86 + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.ActiveCfg = Debug|x86 + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.Build.0 = Debug|x86 + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.ActiveCfg = Release|x86 + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.Build.0 = Release|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.ActiveCfg = Debug|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.Build.0 = Debug|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.ActiveCfg = Release|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.Build.0 = Release|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.ActiveCfg = Debug|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.Build.0 = Debug|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.ActiveCfg = Release|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.Build.0 = Release|x86 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.ActiveCfg = Debug|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.Build.0 = Debug|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.ActiveCfg = Release|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.Build.0 = Release|x64 + {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.ActiveCfg = Debug|Any CPU + {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.Build.0 = Debug|Any CPU + {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.ActiveCfg = Release|Any CPU + {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.Build.0 = Release|Any CPU + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.ActiveCfg = Debug|x64 + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Build.0 = Debug|x64 + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Deploy.0 = Debug|x64 + {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 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {1B4DFDAD-C676-4338-B435-F2F62D79E096} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {2D33598A-21A1-4117-82DC-250F4CE8D5E5} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {7EFC0398-8F4D-4850-BBE3-A0CC85410559} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {1926AB55-690C-4081-99D5-170847C206D9} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {581C7683-D22D-4346-B3BF-DC2936231C46} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506} + {2287E64E-3515-4324-9833-553348295C15} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} + {72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} + {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} + {9C7B827F-AE30-44C4-A210-E49DF883C720} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506} + {457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} + {7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} + {C9B1C169-1354-4348-9938-7892399C6336} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {FBA5EFE2-362B-4BAD-A748-3248F79468AC} = {7D32EE61-B6F0-4978-B500-45172B181283} + {00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283} + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283} + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04} = {457F1D6D-8AEC-42E2-9211-2A8405C95019} + {F6975079-F730-4A31-9909-DE536E524764} = {457F1D6D-8AEC-42E2-9211-2A8405C95019} + {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} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {289E6003-15D5-4377-ADA6-2E7093785BCD} + EndGlobalSection +EndGlobal +|Windows.ActiveCfg = Debug|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.Build.0 = Debug|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Release|Any CPU.Build.0 = Release|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.ActiveCfg = Release|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.Build.0 = Release|Any CPU + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Any CPU.ActiveCfg = Debug|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Any CPU.Build.0 = Debug|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Any CPU.ActiveCfg = Release|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Any CPU.Build.0 = Release|x64 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Any CPU.ActiveCfg = Debug|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Any CPU.Build.0 = Debug|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Any CPU.ActiveCfg = Release|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Any CPU.Build.0 = Release|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Debug|Any CPU.ActiveCfg = Debug|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Debug|Any CPU.Build.0 = Debug|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Release|Any CPU.ActiveCfg = Release|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Release|Any CPU.Build.0 = Release|x86 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Any CPU.Build.0 = Debug|Win32 {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.ActiveCfg = Debug|Win32 {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.Build.0 = Debug|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Any CPU.ActiveCfg = Release|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Any CPU.Build.0 = Release|Win32 {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.ActiveCfg = Release|Win32 {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.Build.0 = Release|Win32 {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.ActiveCfg = Debug|x86 @@ -121,15 +245,21 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {1B4DFDAD-C676-4338-B435-F2F62D79E096} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {2D33598A-21A1-4117-82DC-250F4CE8D5E5} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {7EFC0398-8F4D-4850-BBE3-A0CC85410559} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {1926AB55-690C-4081-99D5-170847C206D9} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {581C7683-D22D-4346-B3BF-DC2936231C46} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506} {2287E64E-3515-4324-9833-553348295C15} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} {72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} + {9C7B827F-AE30-44C4-A210-E49DF883C720} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506} {457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} {7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} + {C9B1C169-1354-4348-9938-7892399C6336} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} {FBA5EFE2-362B-4BAD-A748-3248F79468AC} = {7D32EE61-B6F0-4978-B500-45172B181283} {00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283} {65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283} diff --git a/Directory.Build.Java.props b/Directory.Build.Java.props new file mode 100644 index 00000000000..89a3fea60d1 --- /dev/null +++ b/Directory.Build.Java.props @@ -0,0 +1,10 @@ + + + + 1.8 + false + true + ikvm.runtime.AppDomainAssemblyClassLoader + + + \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 9c525504841..c33d4a964be 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -31,6 +31,7 @@ $(BaseOutputPath) false + false 12 @@ -40,22 +41,4 @@ - - - - - - - - - - - - - - - - - - diff --git a/Directory.Build.targets b/Directory.Build.targets index 74133d5d7c2..996c6e37562 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -19,14 +19,32 @@ + + $(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.msbuildproj + + + $(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj + + + $(CyberduckDir)cli\dll\Cyberduck.Cli.msbuildproj + + + $(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\src\main\csharp\Cyberduck.Bonjour.Native.csproj + + $(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.msbuildproj + + + $(CyberduckDir)importer\dll\Cyberduck.Importer.msbuildproj + + + $(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj @@ -57,5 +75,7 @@ + + diff --git a/Packages.props b/Packages.props index e13be8279db..34f558d758f 100644 --- a/Packages.props +++ b/Packages.props @@ -19,6 +19,7 @@ + @@ -37,4 +38,4 @@ - + \ No newline at end of file diff --git a/bonjour/dll/Cyberduck.Bonjour.msbuildproj b/bonjour/dll/Cyberduck.Bonjour.msbuildproj new file mode 100644 index 00000000000..1189e4e76ef --- /dev/null +++ b/bonjour/dll/Cyberduck.Bonjour.msbuildproj @@ -0,0 +1,12 @@ + + + net472 + + + + + + + + + diff --git a/bonjour/dll/Directory.Build.props b/bonjour/dll/Directory.Build.props new file mode 100644 index 00000000000..82445b2700b --- /dev/null +++ b/bonjour/dll/Directory.Build.props @@ -0,0 +1,25 @@ + + + + + + $(MSBuildThisFileDirectory) + + + + + + diff --git a/bonjour/dll/build.xml b/bonjour/dll/build.xml index a6fca1270f1..f5fec0f93bb 100644 --- a/bonjour/dll/build.xml +++ b/bonjour/dll/build.xml @@ -23,32 +23,18 @@ - + + + + + - - - - - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - + + + + + + - diff --git a/bonjour/dll/pom.xml b/bonjour/dll/pom.xml index 40ead80da9e..c9a70a90e14 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 @@ -91,6 +71,14 @@ + + + ch.cyberduck + Cyberduck.Core + ${project.version} + dll + + @@ -101,4 +89,4 @@ ${project.version} - + \ No newline at end of file diff --git a/bonjour/native/pom.xml b/bonjour/native/pom.xml index 039fd43ac52..18b20d3fec5 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..6f20a8480c7 100644 --- a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj +++ b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj @@ -9,12 +9,14 @@ + + + + - - diff --git a/build.xml b/build.xml index 821cd21a3a3..a22adfaf88e 100644 --- a/build.xml +++ b/build.xml @@ -130,4 +130,17 @@ locale="en"/> + + + + + + + + + + + + + diff --git a/cli/dll/Cyberduck.Cli.msbuildproj b/cli/dll/Cyberduck.Cli.msbuildproj new file mode 100644 index 00000000000..3129c18dab5 --- /dev/null +++ b/cli/dll/Cyberduck.Cli.msbuildproj @@ -0,0 +1,13 @@ + + + net472 + + + + + + + + + + diff --git a/cli/dll/Directory.Build.props b/cli/dll/Directory.Build.props new file mode 100644 index 00000000000..82445b2700b --- /dev/null +++ b/cli/dll/Directory.Build.props @@ -0,0 +1,25 @@ + + + + + + $(MSBuildThisFileDirectory) + + + + + + diff --git a/cli/dll/build.xml b/cli/dll/build.xml index 1313fa685b7..f047e8c0e13 100644 --- a/cli/dll/build.xml +++ b/cli/dll/build.xml @@ -18,32 +18,17 @@ - + + + + + - - - - - - - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - + + + + + + diff --git a/cli/dll/pom.xml b/cli/dll/pom.xml index 881261892dd..f85f6d31891 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 diff --git a/cli/src/main/csharp/Directory.Build.props b/cli/src/main/csharp/Directory.Build.props index c6ba27d8ed9..9e4f31d90df 100644 --- a/cli/src/main/csharp/Directory.Build.props +++ b/cli/src/main/csharp/Directory.Build.props @@ -20,9 +20,4 @@ - - x64 - x64 - - diff --git a/cli/src/main/csharp/duck.csproj b/cli/src/main/csharp/duck.csproj index 658424bce41..23828e56ebe 100644 --- a/cli/src/main/csharp/duck.csproj +++ b/cli/src/main/csharp/duck.csproj @@ -3,6 +3,8 @@ Exe net472 + x64 + win7-x64 @@ -18,10 +20,6 @@ $(Filename)$(Extension) PreserveNewest - - $(Filename)$(Extension) - PreserveNewest - bookmarks/%(Filename)%(Extension) @@ -38,10 +36,9 @@ - - - - + + contentfiles;analyzers;build;buildTransitive + diff --git a/cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs b/cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs index d23d13e1453..33670d2310e 100644 --- a/cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs +++ b/cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs @@ -67,75 +67,25 @@ - - + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - @@ -154,6 +104,7 @@ + diff --git a/cli/src/main/wix/Bundle/duck.bundle.wixproj b/cli/src/main/wix/Bundle/duck.bundle.wixproj index f7a2cd4f770..1c22127b548 100644 --- a/cli/src/main/wix/Bundle/duck.bundle.wixproj +++ b/cli/src/main/wix/Bundle/duck.bundle.wixproj @@ -12,6 +12,7 @@ CyberduckDir=$(CyberduckDir); ProfilesDir=$(CyberduckDir)profiles\default\; LicenseFile=$(CyberduckDir)i18n/src/main/resources/en.lproj/License.txt; + IkvmRuntimeDir=$(TargetBuildDir)\ikvm; $(DefineConstants) @@ -33,6 +34,12 @@ ProfileComponents var.ProfilesDir + + ikvm + INSTALLFOLDER + IkvmRuntime + var.IkvmRuntimeDir + diff --git a/cli/windows/build.proj b/cli/windows/build.proj index a249bf29c12..9d4e4035e57 100644 --- a/cli/windows/build.proj +++ b/cli/windows/build.proj @@ -1,7 +1,7 @@ - + diff --git a/cli/windows/pom.xml b/cli/windows/pom.xml index 5f660f94b56..8e98281a563 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..6cded0ee5d2 --- /dev/null +++ b/core/dll/Cyberduck.Core.msbuildproj @@ -0,0 +1,53 @@ + + + net472 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/dll/Directory.Build.props b/core/dll/Directory.Build.props new file mode 100644 index 00000000000..82445b2700b --- /dev/null +++ b/core/dll/Directory.Build.props @@ -0,0 +1,25 @@ + + + + + + $(MSBuildThisFileDirectory) + + + + + + diff --git a/core/dll/build.xml b/core/dll/build.xml index 421fd1d1a25..d227d35f0de 100644 --- a/core/dll/build.xml +++ b/core/dll/build.xml @@ -21,34 +21,20 @@ --> - + - + + + + + - - - - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - - + + + + + + - - + \ No newline at end of file diff --git a/core/dll/pom.xml b/core/dll/pom.xml index da668ec9729..1a5302aca96 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 @@ -101,32 +81,12 @@ compile - net.java.openjdk - sunmscapi - x86_64 - dll - ${java-native-dll} - runtime - - - net.java.openjdk - sunmscapi - ${java-native-dll} - runtime - - - net.java.openjdk - sunec - x86_64 - dll - ${java-native-dll} - runtime - - - net.java.openjdk - sunec - ${java-native-dll} - runtime + + com.auth0 + java-jwt + compile net.java.dev.jna diff --git a/core/native/build.xml b/core/native/build.xml index 4294261e67e..116ac198c63 100644 --- a/core/native/build.xml +++ b/core/native/build.xml @@ -30,12 +30,7 @@ - - - - - + diff --git a/core/native/pom.xml b/core/native/pom.xml index f00cb916933..45c6f0883c7 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 @@ -140,14 +120,6 @@ core ${project.version} - - com.microsoft - msvcr120 - x86_64 - dll - 12.00.40649.5 - runtime - nunit nunit.framework diff --git a/core/native/refresh/pom.xml b/core/native/refresh/pom.xml index 2062e5741ac..892f1acc468 100644 --- a/core/native/refresh/pom.xml +++ b/core/native/refresh/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/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj b/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj index c944ad51634..a282a133741 100644 --- a/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj +++ b/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj @@ -29,6 +29,7 @@ + all @@ -41,7 +42,6 @@ - diff --git a/core/src/main/csharp/Cyberduck.Core.Native.csproj b/core/src/main/csharp/Cyberduck.Core.Native.csproj index 1558714ba82..6d7cde59237 100644 --- a/core/src/main/csharp/Cyberduck.Core.Native.csproj +++ b/core/src/main/csharp/Cyberduck.Core.Native.csproj @@ -29,12 +29,9 @@ - - - - + all diff --git a/core/src/main/csharp/ch/cyberduck/core/preferences/ApplicationPreferences.cs b/core/src/main/csharp/ch/cyberduck/core/preferences/ApplicationPreferences.cs index cd43b7bfe69..e87624c176b 100644 --- a/core/src/main/csharp/ch/cyberduck/core/preferences/ApplicationPreferences.cs +++ b/core/src/main/csharp/ch/cyberduck/core/preferences/ApplicationPreferences.cs @@ -275,16 +275,12 @@ protected override void setDefaults() this.setDefault("local.normalize.unicode", bool.FalseString); // SSL Keystore - // Add mscapi security provider - Security.addProvider(new SunMSCAPI()); this.setDefault("connection.ssl.keystore.type", "Windows-MY"); this.setDefault("connection.ssl.keystore.provider", "SunMSCAPI"); // Override secure random strong algorithm. Outputs bytes from the Windows CryptGenRandom() API this.setDefault("connection.ssl.securerandom.algorithm", "Windows-PRNG"); this.setDefault("connection.ssl.securerandom.provider", "SunMSCAPI"); - // Set secure random algorithms for BC - Security.setProperty("securerandom.strongAlgorithms", "Windows-PRNG:SunMSCAPI,SHA1PRNG:SUN"); // Enable Integrated Windows Authentication this.setDefault("connection.proxy.windows.authentication.enable", bool.TrueString); diff --git a/core/src/test/csharp/Cyberduck.Core.Test.csproj b/core/src/test/csharp/Cyberduck.Core.Test.csproj index 976116d6a0b..936ee789163 100644 --- a/core/src/test/csharp/Cyberduck.Core.Test.csproj +++ b/core/src/test/csharp/Cyberduck.Core.Test.csproj @@ -4,16 +4,13 @@ net472 false + true - - - - diff --git a/core/src/test/csharp/ch/cyberduck/core/JavaSetup.cs b/core/src/test/csharp/ch/cyberduck/core/JavaSetup.cs new file mode 100644 index 00000000000..3b1ee307ead --- /dev/null +++ b/core/src/test/csharp/ch/cyberduck/core/JavaSetup.cs @@ -0,0 +1,12 @@ +using NUnit.Framework; +using System; + +[SetUpFixture] +public class JavaSetup +{ + [OneTimeSetUp] + public void SetupJna() + { + java.lang.System.setProperty("jna.boot.library.path", AppContext.BaseDirectory); + } +} diff --git a/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs b/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs index 879722f7c14..43e5920f6d2 100644 --- a/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs +++ b/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs @@ -14,17 +14,17 @@ public class SystemLocalTest const string PIPE_NAME = @"\\.\pipe\openssh-ssh-agent"; const string WSL_PATH = @"\\wsl$\test\"; - [Test, Explicit("Broken in IKVM")] + [Test] public void FilesGetUsableSpace() { - var store = Files.getFileStore(Paths.get(@"\\?\c:\")); + var store = Files.getFileStore(Paths.get(@"c:\")); store.getUsableSpace(); } - [Test, Explicit("Broken in IKVM")] + [Test] public void PathsToFileGetUsableSpace() { - Paths.get(@"\\?\c:\").toFile().getUsableSpace(); + Paths.get(@"c:\").toFile().getUsableSpace(); } [Test] diff --git a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj new file mode 100644 index 00000000000..ae65d8bf1ef --- /dev/null +++ b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj @@ -0,0 +1,13 @@ + + + net472 + + + + + + + + + + diff --git a/cryptomator/dll/Directory.Build.props b/cryptomator/dll/Directory.Build.props new file mode 100644 index 00000000000..e0dc1f1ec1f --- /dev/null +++ b/cryptomator/dll/Directory.Build.props @@ -0,0 +1,25 @@ + + + + + + $(MSBuildThisFileDirectory) + + + + + + diff --git a/cryptomator/dll/build.xml b/cryptomator/dll/build.xml index 94c042db69d..70f00675d3a 100644 --- a/cryptomator/dll/build.xml +++ b/cryptomator/dll/build.xml @@ -17,32 +17,18 @@ - + + + + + - - - - - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - + + + + + + - diff --git a/cryptomator/dll/pom.xml b/cryptomator/dll/pom.xml index 87099954603..d2256db3e65 100644 --- a/cryptomator/dll/pom.xml +++ b/cryptomator/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 diff --git a/global.json b/global.json index 0b31220b2e8..2e7a984995e 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,6 @@ { "msbuild-sdks": { + "IKVM.NET.Sdk": "8.10.0-dev.62", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6" } diff --git a/importer/dll/Cyberduck.Importer.msbuildproj b/importer/dll/Cyberduck.Importer.msbuildproj new file mode 100644 index 00000000000..917864a442d --- /dev/null +++ b/importer/dll/Cyberduck.Importer.msbuildproj @@ -0,0 +1,13 @@ + + + net472 + + + + + + + + + + diff --git a/importer/dll/Directory.Build.props b/importer/dll/Directory.Build.props new file mode 100644 index 00000000000..e0dc1f1ec1f --- /dev/null +++ b/importer/dll/Directory.Build.props @@ -0,0 +1,25 @@ + + + + + + $(MSBuildThisFileDirectory) + + + + + + diff --git a/importer/dll/build.xml b/importer/dll/build.xml index f792d430a68..a4ac25cd91d 100644 --- a/importer/dll/build.xml +++ b/importer/dll/build.xml @@ -23,32 +23,18 @@ - + + + + + - - - - - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - + + + + + + - diff --git a/importer/dll/pom.xml b/importer/dll/pom.xml index d24d91e5674..11cc01d9a60 100644 --- a/importer/dll/pom.xml +++ b/importer/dll/pom.xml @@ -65,32 +65,20 @@ maven-dependency-plugin - - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - - maven-antrun-plugin + + + ch.cyberduck + Cyberduck.Core + dll + ${project.version} + + diff --git a/nuget.config b/nuget.config index 3f0e003403c..b9c4832f8c8 100644 --- a/nuget.config +++ b/nuget.config @@ -1,6 +1,16 @@  + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index cc9f5e1a67b..f2af296e3c4 100644 --- a/pom.xml +++ b/pom.xml @@ -1013,5 +1013,31 @@ debug + + windows + + + Windows + + + + + + + maven-dependency-plugin + + + copy-dependencies-jar-target + + true + true + + + + + + + + - + \ No newline at end of file diff --git a/protocols/dll/Cyberduck.Protocols.msbuildproj b/protocols/dll/Cyberduck.Protocols.msbuildproj new file mode 100644 index 00000000000..c3a47ee05cf --- /dev/null +++ b/protocols/dll/Cyberduck.Protocols.msbuildproj @@ -0,0 +1,137 @@ + + + net472 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/protocols/dll/Directory.Build.props b/protocols/dll/Directory.Build.props new file mode 100644 index 00000000000..e0dc1f1ec1f --- /dev/null +++ b/protocols/dll/Directory.Build.props @@ -0,0 +1,25 @@ + + + + + + $(MSBuildThisFileDirectory) + + + + + + diff --git a/protocols/dll/build.xml b/protocols/dll/build.xml index 0fcaaf7e481..79298e526b7 100644 --- a/protocols/dll/build.xml +++ b/protocols/dll/build.xml @@ -23,34 +23,17 @@ - - - - - - - - - - - - - - - - - - IKVMC0109 - class is already available in referenced assembly - - - - - - + + + + - + + + + + + + diff --git a/protocols/dll/pom.xml b/protocols/dll/pom.xml index 6f69262ee91..425417ac79f 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/build.proj b/windows/build.proj index abbd6c1f8d3..9dd4030f31e 100644 --- a/windows/build.proj +++ b/windows/build.proj @@ -10,8 +10,8 @@ - - + + diff --git a/windows/build.xml b/windows/build.xml index eef8caff00f..7bd77cfcdbf 100755 --- a/windows/build.xml +++ b/windows/build.xml @@ -40,11 +40,7 @@ - - - - - + diff --git a/windows/pom.xml b/windows/pom.xml index fa2bf03a344..516f8aaa744 100644 --- a/windows/pom.xml +++ b/windows/pom.xml @@ -37,24 +37,6 @@ maven-dependency-plugin - - unpack-runtime - generate-sources - - unpack - - - - - ch.iterate - ikvm - zip - ${ikvm-version} - - - ${project.build.directory} - - unpack-profiles-core generate-sources diff --git a/windows/src/main/csharp/Cyberduck.csproj b/windows/src/main/csharp/Cyberduck.csproj index 5d78b0765d5..99ea48ee6c6 100644 --- a/windows/src/main/csharp/Cyberduck.csproj +++ b/windows/src/main/csharp/Cyberduck.csproj @@ -3,6 +3,8 @@ WinExe net472 + win7-x64 + x64 true true @@ -17,11 +19,7 @@ - - $(Filename)$(Extension) - PreserveNewest - - + $(Filename)$(Extension) @@ -31,7 +29,6 @@ - $(TargetBuildDir)CustomOpenFileFolderDialog.dll @@ -46,6 +43,9 @@ + + all + all diff --git a/windows/src/main/csharp/Directory.Build.props b/windows/src/main/csharp/Directory.Build.props index 98e8d4c1e54..452a911d2e2 100644 --- a/windows/src/main/csharp/Directory.Build.props +++ b/windows/src/main/csharp/Directory.Build.props @@ -17,9 +17,4 @@ - - x64 - x64 - - diff --git a/windows/src/main/package/package.wapproj b/windows/src/main/package/package.wapproj index 0295158c676..c7466bdd1fd 100644 --- a/windows/src/main/package/package.wapproj +++ b/windows/src/main/package/package.wapproj @@ -24,6 +24,8 @@ 10.0.15063.0 net472;$(AssetTargetFallback) ..\csharp\Cyberduck.csproj + + false False diff --git a/windows/src/main/wix/Bundle/Cyberduck.Bundle.wixproj b/windows/src/main/wix/Bundle/Cyberduck.Bundle.wixproj index ebd0f5e15ab..7202cc9ce30 100644 --- a/windows/src/main/wix/Bundle/Cyberduck.Bundle.wixproj +++ b/windows/src/main/wix/Bundle/Cyberduck.Bundle.wixproj @@ -12,6 +12,7 @@ CyberduckDir=$(CyberduckDir); ProfilesDir=$(CyberduckDir)profiles\default\; LicenseFile=$(CyberduckDir)i18n/src/main/resources/en.lproj/License.txt; + IkvmRuntimeDir=$(TargetBuildDir)\ikvm; $(DefineConstants) @@ -61,6 +62,12 @@ ProfileComponents var.ProfilesDir + + ikvm + INSTALLLOCATION + IkvmRuntime + var.IkvmRuntimeDir + diff --git a/windows/src/main/wix/Bundle/Cyberduck.wxs b/windows/src/main/wix/Bundle/Cyberduck.wxs index c5f24a12175..37f58a1f041 100644 --- a/windows/src/main/wix/Bundle/Cyberduck.wxs +++ b/windows/src/main/wix/Bundle/Cyberduck.wxs @@ -1,7 +1,7 @@ - + @@ -17,19 +17,19 @@ - + - + - - + + - - + + @@ -37,7 +37,7 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + @@ -233,14 +178,14 @@ - + - + - + @@ -264,14 +209,14 @@ - + - + - + @@ -294,7 +239,7 @@ - + @@ -332,6 +277,7 @@ + @@ -350,4 +296,4 @@ AUTOSTART=1 - + \ No newline at end of file diff --git a/windows/src/test/csharp/Cyberduck.Test.csproj b/windows/src/test/csharp/Cyberduck.Test.csproj index 3f53d19cac6..7bd9f0742a5 100644 --- a/windows/src/test/csharp/Cyberduck.Test.csproj +++ b/windows/src/test/csharp/Cyberduck.Test.csproj @@ -3,6 +3,7 @@ net472 11.0 + x64 false @@ -11,10 +12,6 @@ - - - - diff --git a/windows/src/test/csharp/Directory.Build.props b/windows/src/test/csharp/Directory.Build.props index 98e8d4c1e54..452a911d2e2 100644 --- a/windows/src/test/csharp/Directory.Build.props +++ b/windows/src/test/csharp/Directory.Build.props @@ -17,9 +17,4 @@ - - x64 - x64 - - From 5cfa6a59361721f285927a547d4ad5b029a8ee1c Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 25 Jul 2024 15:30:26 +0200 Subject: [PATCH 03/23] Move to NUnit 4 --- Packages.props | 7 ++- .../csharp/ch/cyberduck/core/ShlwApiTests.cs | 3 +- .../core/SystemCertificateStoreTest.cs | 8 ++-- .../csharp/ch/cyberduck/core/UtilsTest.cs | 6 +-- .../WinCredentialManagerTest.cs | 43 ++++++++----------- .../cyberduck/core/local/SystemLocalTest.cs | 42 +++++++++--------- .../ApplicationPreferencesTests.cs | 2 +- .../core/ssl/HostnameVerifierTest.cs | 4 +- .../controller/PersistentFormHandlerTest.cs | 8 ++-- 9 files changed, 54 insertions(+), 69 deletions(-) diff --git a/Packages.props b/Packages.props index 34f558d758f..8d2c73e854a 100644 --- a/Packages.props +++ b/Packages.props @@ -25,10 +25,9 @@ - - - - + + + diff --git a/core/src/test/csharp/ch/cyberduck/core/ShlwApiTests.cs b/core/src/test/csharp/ch/cyberduck/core/ShlwApiTests.cs index 9e2da0c712b..945b278c855 100644 --- a/core/src/test/csharp/ch/cyberduck/core/ShlwApiTests.cs +++ b/core/src/test/csharp/ch/cyberduck/core/ShlwApiTests.cs @@ -10,8 +10,7 @@ public class ShlwApiTests public static void TestLoadIndirect() { string original = "C:\\Windows\\System32\\imageres.dll"; - string load = SHLoadIndirectString(original); - Assert.AreEqual(original, load); + Assert.That(SHLoadIndirectString(original), Is.EqualTo(original)); } } } diff --git a/core/src/test/csharp/ch/cyberduck/core/SystemCertificateStoreTest.cs b/core/src/test/csharp/ch/cyberduck/core/SystemCertificateStoreTest.cs index 5037e00fa50..f8b74b8148e 100644 --- a/core/src/test/csharp/ch/cyberduck/core/SystemCertificateStoreTest.cs +++ b/core/src/test/csharp/ch/cyberduck/core/SystemCertificateStoreTest.cs @@ -59,12 +59,12 @@ public void ExpiredSelfSignedCertificate() const string hostName = "foo.secure.example.com"; List certs = new ArrayList(); certs.add(cert); - Assert.False(new SystemCertificateStore().verify(new DisabledCertificateTrustCallback(), hostName, certs)); + Assert.That(!new SystemCertificateStore().verify(new DisabledCertificateTrustCallback(), hostName, certs)); //register exception PreferencesFactory.get() .setProperty(hostName + ".certificate.accept", SystemCertificateStore.ConvertCertificate(cert).Thumbprint); - Assert.IsTrue(new SystemCertificateStore().verify(new DisabledCertificateTrustCallback(), hostName, certs)); + Assert.That(new SystemCertificateStore().verify(new DisabledCertificateTrustCallback(), hostName, certs)); } [Test] @@ -140,12 +140,12 @@ public void UntrustedSelfSignedCertificate() certs.add(hostCert); certs.add(caCert); - Assert.False(new SystemCertificateStore().verify(new DisabledCertificateTrustCallback(), hostName, certs)); + Assert.That(!new SystemCertificateStore().verify(new DisabledCertificateTrustCallback(), hostName, certs)); //register exception PreferencesFactory.get() .setProperty(hostName + ".certificate.accept", SystemCertificateStore.ConvertCertificate(hostCert).Thumbprint); - Assert.IsTrue(new SystemCertificateStore().verify(new DisabledCertificateTrustCallback(), hostName, certs)); + Assert.That(new SystemCertificateStore().verify(new DisabledCertificateTrustCallback(), hostName, certs)); } } } diff --git a/core/src/test/csharp/ch/cyberduck/core/UtilsTest.cs b/core/src/test/csharp/ch/cyberduck/core/UtilsTest.cs index ae49a138a11..66913b29712 100644 --- a/core/src/test/csharp/ch/cyberduck/core/UtilsTest.cs +++ b/core/src/test/csharp/ch/cyberduck/core/UtilsTest.cs @@ -43,7 +43,7 @@ public void TestOSVersion() { var TestVersion = TestVersions[i]; var OSVersion = OSVersions[i]; - IsTrue(Utils.OSVersion.TestOSVersion(TestVersion, OSVersion), $"{TestVersion} (OS: {OSVersion})"); + That(Utils.OSVersion.TestOSVersion(TestVersion, OSVersion), $"{TestVersion} (OS: {OSVersion})"); } // Test Greater OS-versions @@ -53,7 +53,7 @@ public void TestOSVersion() for (int j = TestVersions.Length - 1; j > i; j--) { var TestVersion = TestVersions[j]; - IsFalse(Utils.OSVersion.TestOSVersion(TestVersion, OSVersion), $"{TestVersion} (OS: {OSVersion})"); + That(!Utils.OSVersion.TestOSVersion(TestVersion, OSVersion), $"{TestVersion} (OS: {OSVersion})"); } } @@ -64,7 +64,7 @@ public void TestOSVersion() for (int j = i - 1; j >= 0; j--) { var TestVersion = TestVersions[j]; - IsTrue(Utils.OSVersion.TestOSVersion(TestVersion, OSVersion), $"{TestVersion} (OS: {OSVersion})"); + That(Utils.OSVersion.TestOSVersion(TestVersion, OSVersion), $"{TestVersion} (OS: {OSVersion})"); } } } diff --git a/core/src/test/csharp/ch/cyberduck/core/credentialmanager/WinCredentialManagerTest.cs b/core/src/test/csharp/ch/cyberduck/core/credentialmanager/WinCredentialManagerTest.cs index ac7b339e630..f6c5330ce0a 100644 --- a/core/src/test/csharp/ch/cyberduck/core/credentialmanager/WinCredentialManagerTest.cs +++ b/core/src/test/csharp/ch/cyberduck/core/credentialmanager/WinCredentialManagerTest.cs @@ -47,13 +47,11 @@ public void TestSaveServiceEmbeddedUser([ValueSource(nameof(UserNames))] string { var target = $"protocol://{user}@service.{UUID.randomUUID().toString()}.tld"; var credentials = new NetworkCredential(user, UUID.randomUUID().toString()); - var saveResult = WinCredentialManager.SaveCredentials(target, credentials); - Assert.True(saveResult); + Assert.That(WinCredentialManager.SaveCredentials(target, credentials)); var query = WinCredentialManager.GetCredentials(target); - Assert.AreEqual(credentials.UserName, query.UserName); - Assert.AreEqual(credentials.Password, query.Password); - var removeResult = WinCredentialManager.RemoveCredentials(target); - Assert.True(removeResult); + Assert.That(query.UserName, Is.EqualTo(credentials.UserName)); + Assert.That(credentials.Password, Is.EqualTo(credentials.Password)); + Assert.That(WinCredentialManager.RemoveCredentials(target)); } [Test] @@ -61,13 +59,11 @@ public void TestSaveServiceUser([ValueSource(nameof(UserNames))] string user) { var target = $"protocol://service.{UUID.randomUUID().toString()}.tld"; var credentials = new NetworkCredential(user, UUID.randomUUID().toString()); - var saveResult = WinCredentialManager.SaveCredentials(target, credentials); - Assert.True(saveResult); + Assert.That(WinCredentialManager.SaveCredentials(target, credentials)); var query = WinCredentialManager.GetCredentials(target); - Assert.AreEqual(credentials.UserName, query.UserName); - Assert.AreEqual(credentials.Password, query.Password); - var removeResult = WinCredentialManager.RemoveCredentials(target); - Assert.True(removeResult); + Assert.That(query.UserName, Is.EqualTo(credentials.UserName)); + Assert.That(credentials.Password, Is.EqualTo(credentials.Password)); + Assert.That(WinCredentialManager.RemoveCredentials(target)); } [Test] @@ -75,13 +71,11 @@ public void TestSaveSimpleEmbeddedUser([ValueSource(nameof(UserNames))] string u { var target = $"{user}@{UUID.randomUUID().toString()}"; var credentials = new NetworkCredential(user, UUID.randomUUID().toString()); - var saveResult = WinCredentialManager.SaveCredentials(target, credentials); - Assert.True(saveResult); + Assert.That(WinCredentialManager.SaveCredentials(target, credentials)); var query = WinCredentialManager.GetCredentials(target); - Assert.AreEqual(credentials.UserName, query.UserName); - Assert.AreEqual(credentials.Password, query.Password); - var removeResult = WinCredentialManager.RemoveCredentials(target); - Assert.True(removeResult); + Assert.That(query.UserName, Is.EqualTo(credentials.UserName)); + Assert.That(credentials.Password, Is.EqualTo(credentials.Password)); + Assert.That(WinCredentialManager.RemoveCredentials(target)); } [Test] @@ -89,13 +83,11 @@ public void TestSaveSimpleUser([ValueSource(nameof(UserNames))] string user) { var target = UUID.randomUUID().toString(); var credentials = new NetworkCredential(user, UUID.randomUUID().toString()); - var saveResult = WinCredentialManager.SaveCredentials(target, credentials); - Assert.True(saveResult); + Assert.That(WinCredentialManager.SaveCredentials(target, credentials)); var query = WinCredentialManager.GetCredentials(target); - Assert.AreEqual(credentials.UserName, query.UserName); - Assert.AreEqual(credentials.Password, query.Password); - var removeResult = WinCredentialManager.RemoveCredentials(target); - Assert.True(removeResult); + Assert.That(query.UserName, Is.EqualTo(credentials.UserName)); + Assert.That(credentials.Password, Is.EqualTo(credentials.Password)); + Assert.That(WinCredentialManager.RemoveCredentials(target)); } [Test] @@ -144,8 +136,7 @@ public void TestSaveHugeBlob() }; var credTarget = "test:large-blob" + target; Assert.That(WinCredentialManager.SaveCredentials(credTarget, cred), Is.True); - cred = WinCredentialManager.GetCredentials(credTarget); - Assert.That(() => WinCredentialManager.GetCredentials(credTarget).Attributes["Blob"], Is.EqualTo(blob)); + Assert.That(WinCredentialManager.GetCredentials(credTarget).Attributes["Blob"], Is.EqualTo(blob)); WinCredentialManager.RemoveCredentials(credTarget); } } diff --git a/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs b/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs index 43e5920f6d2..32880e68470 100644 --- a/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs +++ b/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs @@ -31,48 +31,48 @@ public void PathsToFileGetUsableSpace() public void TestBadDriveLetter1() { const string PATH = @"#:\"; - Assert.IsEmpty(new SystemLocal(PATH).getAbsolute()); + Assert.That(new SystemLocal(PATH).getAbsolute(), Is.Empty); } [Test] public void TestBadDriveLetter2() { const string PATH = @"\#:\"; - Assert.IsEmpty(new SystemLocal(PATH).getAbsolute()); + Assert.That(new SystemLocal(PATH).getAbsolute(), Is.Empty); } [Test] public void TestBadDriveLetter3() { const string PATH = @"\\.\#:\"; - Assert.IsEmpty(new SystemLocal(PATH).getAbsolute()); + Assert.That(new SystemLocal(PATH).getAbsolute(), Is.Empty); } [Test] public void TestConvertToDirectorySeparator() { var path = new SystemLocal(PIPE_NAME.Replace('\\', '/')); - Assert.AreEqual(PIPE_NAME, path.getAbsolute()); + Assert.That(path.getAbsolute(), Is.EqualTo(PIPE_NAME)); } [Test] public void TestDirectoryAltSeparators() { var path = new SystemLocal(@"C:" + Path.AltDirectorySeparatorChar); - Assert.AreEqual(@"C:" + Path.DirectorySeparatorChar, path.getAbsolute()); + Assert.That(path.getAbsolute(), Is.EqualTo($"C:{Path.DirectorySeparatorChar}")); } [Test] public void TestDirectorySeparators() { var path = new SystemLocal(@"C:" + Path.DirectorySeparatorChar); - Assert.AreEqual(@"C:" + Path.DirectorySeparatorChar, path.getAbsolute()); + Assert.That(path.getAbsolute(), Is.EqualTo($"C:{Path.DirectorySeparatorChar}")); } [Test] public void TestEmptyPath() { - Assert.IsEmpty(new SystemLocal("").getAbsolute()); + Assert.That(new SystemLocal("").getAbsolute(), Is.Empty); } /// @@ -94,7 +94,7 @@ public void TestFileFormats() foreach (var item in filenames) { var local = new SystemLocal(item); - Assert.AreEqual(item, local.getAbsolute()); + Assert.That(local.getAbsolute(), Is.EqualTo(item)); } } @@ -104,7 +104,7 @@ public void TestInvalidCharacters() const string TEST = @"C:\:?<>:"; const string EXPECT = @"C:\_____"; CoreLocal local = new SystemLocal(TEST); - Assert.AreEqual(EXPECT, local.getAbsolute()); + Assert.That(local.getAbsolute(), Is.EqualTo(EXPECT)); } [Test] @@ -112,14 +112,14 @@ public void TestLocalCompound() { CoreLocal root = new SystemLocal(@"C:\"); CoreLocal compound = new SystemLocal(root, @"C:\"); - Assert.AreEqual(@"C:\C$", compound.getAbsolute()); + Assert.That(compound.getAbsolute(), Is.EqualTo("C:\\C$")); } [Test] public void TestMountainDuckPath() { CoreLocal local = new SystemLocal("/C:/Users/Public"); - Assert.AreEqual("C:\\Users\\Public", local.getAbsolute()); + Assert.That(local.getAbsolute(), Is.EqualTo("C:\\Users\\Public")); } [Test] @@ -127,7 +127,7 @@ public void TestPathAbsoluteWin32() { var test = @"C:\Directory\File.ext"; var path = new SystemLocal(test); - Assert.AreEqual(test, path.getAbsolute()); + Assert.That(path.getAbsolute(), Is.EqualTo(test)); } [Test] @@ -135,23 +135,21 @@ public void TestPathFromNonWindows() { const string TEST = @"\Volumes\System\Test"; SystemLocal path = new(TEST); - Assert.AreEqual(TEST, path.getAbsolute()); + Assert.That(path.getAbsolute(), Is.EqualTo(TEST)); } [Test] public void TestPathsPipe() { var path = Paths.get(PIPE_NAME); - Assert.NotNull(path); - Assert.AreEqual(PIPE_NAME, path.ToString()); + Assert.That(path.toString(), Is.EqualTo(PIPE_NAME)); } [Test] public void TestPathsWslPath() { var path = Paths.get(WSL_PATH); - Assert.NotNull(path); - Assert.AreEqual(WSL_PATH, path.ToString()); + Assert.That(path.toString(), Is.EqualTo(WSL_PATH)); } [Test] @@ -159,21 +157,21 @@ public void TestPathToLocal() { CorePath path = new CorePath("C:\\Users\\Public", EnumSet.of(AbstractPath.Type.directory)); var local = new SystemLocal(path.getAbsolute()); - Assert.AreEqual("C:\\Users\\Public", local.getAbsolute()); + Assert.That(local.getAbsolute(), Is.EqualTo("C:\\Users\\Public")); } [Test] public void TestPipeName() { CoreLocal local = new SystemLocal(PIPE_NAME); - Assert.AreEqual(PIPE_NAME, local.getAbsolute()); + Assert.That(local.getAbsolute(), Is.EqualTo(PIPE_NAME)); } [Test] public void TestTildePath() { CoreLocal local = new SystemLocal("~/.ssh/known_hosts"); - Assert.IsNotEmpty(local.getAbsolute()); + Assert.That(local.getAbsolute(), Is.Not.Empty); } [Test] @@ -181,14 +179,14 @@ public void TestUnicode() { var test = @"\\?\C:\ÄÖÜßßäöü"; var path = new SystemLocal(test); - Assert.AreEqual(test, path.getAbsolute()); + Assert.That(path.getAbsolute(), Is.EqualTo(test)); } [Test] public void TestWslPath() { CoreLocal local = new SystemLocal(WSL_PATH); - Assert.AreEqual(WSL_PATH, local.getAbsolute()); + Assert.That(local.getAbsolute(), Is.EqualTo(WSL_PATH)); } } } diff --git a/core/src/test/csharp/ch/cyberduck/core/preferences/ApplicationPreferencesTests.cs b/core/src/test/csharp/ch/cyberduck/core/preferences/ApplicationPreferencesTests.cs index 5533a2cc81a..110bf5355ac 100644 --- a/core/src/test/csharp/ch/cyberduck/core/preferences/ApplicationPreferencesTests.cs +++ b/core/src/test/csharp/ch/cyberduck/core/preferences/ApplicationPreferencesTests.cs @@ -15,7 +15,7 @@ public void LocaleDisplayNames() foreach (string locale in preferences.applicationLocales()) { - Assert.IsNotEmpty(preferences.getDisplayName(locale)); + Assert.That(preferences.getDisplayName(locale), Is.Not.Empty); } } diff --git a/core/src/test/csharp/ch/cyberduck/core/ssl/HostnameVerifierTest.cs b/core/src/test/csharp/ch/cyberduck/core/ssl/HostnameVerifierTest.cs index c9349da8ac6..5395fb5dd8f 100644 --- a/core/src/test/csharp/ch/cyberduck/core/ssl/HostnameVerifierTest.cs +++ b/core/src/test/csharp/ch/cyberduck/core/ssl/HostnameVerifierTest.cs @@ -31,7 +31,7 @@ public void Init() [Test] public void WilcardCertificate() { - Assert.True(HostnameVerifier.Match("foo.secure.example.com", "*.secure.example.com")); + Assert.That(HostnameVerifier.Match("foo.secure.example.com", "*.secure.example.com")); } } -} \ No newline at end of file +} diff --git a/windows/src/test/csharp/ch/cyberduck/ui/controller/PersistentFormHandlerTest.cs b/windows/src/test/csharp/ch/cyberduck/ui/controller/PersistentFormHandlerTest.cs index 6969f05b034..a8f99d57306 100644 --- a/windows/src/test/csharp/ch/cyberduck/ui/controller/PersistentFormHandlerTest.cs +++ b/windows/src/test/csharp/ch/cyberduck/ui/controller/PersistentFormHandlerTest.cs @@ -16,10 +16,8 @@ // yves@cyberduck.ch // -using System.Drawing; -using Ch.Cyberduck.Core.I18n; -using Ch.Cyberduck.Core.Local; using NUnit.Framework; +using System.Drawing; namespace Ch.Cyberduck.Ui.Controller { @@ -32,7 +30,7 @@ public void SetGetTest() PersistentFormHandler handler = new PersistentFormHandler(GetType(), 0, Rectangle.Empty); handler.Set("key", 189); handler = new PersistentFormHandler(GetType(), 0, Rectangle.Empty); - Assert.AreEqual(189, handler.Get("key")); + Assert.That(handler.Get("key"), Is.EqualTo(189)); } [Test] @@ -41,7 +39,7 @@ public void SetGetTestDefaultValue() PersistentFormHandler handler = new PersistentFormHandler(GetType(), 0, Rectangle.Empty); handler.Set("keyDefault", 111); handler = new PersistentFormHandler(GetType(), 0, Rectangle.Empty); - Assert.AreEqual(500, handler.Get("keyNotAvailable", 500)); + Assert.That(handler.Get("keyNotAvailable", 500), Is.EqualTo(500)); } } } From 42b4aa34c35ce1d4c6e45e9dc3086d15b698bf17 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 25 Jul 2024 16:11:26 +0200 Subject: [PATCH 04/23] Review *Finder --- .../AssemblyApplicationResourcesFinder.cs | 20 ++++------- .../LocalSupportDirectoryFinder.cs | 35 +++++++------------ .../RoamingSupportDirectoryFinder.cs | 33 ++++++----------- 3 files changed, 30 insertions(+), 58 deletions(-) diff --git a/core/src/main/csharp/ch/cyberduck/core/preferences/AssemblyApplicationResourcesFinder.cs b/core/src/main/csharp/ch/cyberduck/core/preferences/AssemblyApplicationResourcesFinder.cs index abb8fcf9ddc..23cccc4d093 100644 --- a/core/src/main/csharp/ch/cyberduck/core/preferences/AssemblyApplicationResourcesFinder.cs +++ b/core/src/main/csharp/ch/cyberduck/core/preferences/AssemblyApplicationResourcesFinder.cs @@ -16,22 +16,16 @@ // yves@cyberduck.ch // +using System; using ch.cyberduck.core.preferences; using Ch.Cyberduck.Core.Local; +using CoreLocal = ch.cyberduck.core.Local; -namespace Ch.Cyberduck.Core.Preferences -{ - using Local = ch.cyberduck.core.Local; - - public class AssemblyApplicationResourcesFinder : ApplicationResourcesFinder - { - private static readonly SystemLocal local; +namespace Ch.Cyberduck.Core.Preferences; - static AssemblyApplicationResourcesFinder() - { - local = new(EnvironmentInfo.ResourcesLocation); - } +public class AssemblyApplicationResourcesFinder : ApplicationResourcesFinder +{ + private static readonly Lazy local = new(() => new(EnvironmentInfo.ResourcesLocation), true); - public Local find() => new SystemLocal(local); - } + public CoreLocal find() => local.Value; } diff --git a/core/src/main/csharp/ch/cyberduck/core/preferences/LocalSupportDirectoryFinder.cs b/core/src/main/csharp/ch/cyberduck/core/preferences/LocalSupportDirectoryFinder.cs index 03c96b4850e..b501b746a13 100644 --- a/core/src/main/csharp/ch/cyberduck/core/preferences/LocalSupportDirectoryFinder.cs +++ b/core/src/main/csharp/ch/cyberduck/core/preferences/LocalSupportDirectoryFinder.cs @@ -16,35 +16,24 @@ // feedback@cyberduck.io // +using System; using ch.cyberduck.core.preferences; using Ch.Cyberduck.Core.Local; -using Windows.Storage; -using Path = System.IO.Path; +using CoreLocal = ch.cyberduck.core.Local; -namespace Ch.Cyberduck.Core.Preferences -{ - using Local = ch.cyberduck.core.Local; +namespace Ch.Cyberduck.Core.Preferences; - public class LocalSupportDirectoryFinder : SupportDirectoryFinder - { - private static SystemLocal local; - public static SystemLocal Local - { - get - { - return local ??= new(Path.Combine(EnvironmentInfo.LocalAppDataPath, EnvironmentInfo.DataFolderName)); - } - } +public class LocalSupportDirectoryFinder : SupportDirectoryFinder +{ + private static readonly Lazy local = new(() => new(EnvironmentInfo.LocalAppDataPath, EnvironmentInfo.DataFolderName), true); - public Local find() - { - return new SystemLocal(Local); - } + public static SystemLocal Local => local.Value; - public SupportDirectoryFinder setup() - { - return this; - } + public CoreLocal find() => Local; + + public SupportDirectoryFinder setup() + { + return this; } } diff --git a/core/src/main/csharp/ch/cyberduck/core/preferences/RoamingSupportDirectoryFinder.cs b/core/src/main/csharp/ch/cyberduck/core/preferences/RoamingSupportDirectoryFinder.cs index 0b386dcc9bc..32bb9a207b7 100644 --- a/core/src/main/csharp/ch/cyberduck/core/preferences/RoamingSupportDirectoryFinder.cs +++ b/core/src/main/csharp/ch/cyberduck/core/preferences/RoamingSupportDirectoryFinder.cs @@ -16,34 +16,23 @@ // feedback@cyberduck.io // +using System; using ch.cyberduck.core.preferences; using Ch.Cyberduck.Core.Local; -using Path = System.IO.Path; +using CoreLocal = ch.cyberduck.core.Local; -namespace Ch.Cyberduck.Core.Preferences -{ - using Local = ch.cyberduck.core.Local; +namespace Ch.Cyberduck.Core.Preferences; - public class RoamingSupportDirectoryFinder : SupportDirectoryFinder - { - private static SystemLocal local; +public class RoamingSupportDirectoryFinder : SupportDirectoryFinder +{ + private static readonly Lazy local = new(() => new(EnvironmentInfo.AppDataPath, EnvironmentInfo.DataFolderName), true); - public static SystemLocal Local - { - get - { - return local ??= new(Path.Combine(EnvironmentInfo.AppDataPath, EnvironmentInfo.DataFolderName)); - } - } + public static SystemLocal Local => local.Value; - public Local find() - { - return new SystemLocal(Local); - } + public CoreLocal find() => Local; - public SupportDirectoryFinder setup() - { - return this; - } + public SupportDirectoryFinder setup() + { + return this; } } From d2a4ef2ff26ec82fde40cec165128d565ede0429 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 25 Jul 2024 16:45:13 +0200 Subject: [PATCH 05/23] Review SystemLocalTest --- .../cyberduck/core/local/SystemLocalTest.cs | 150 +++++------------- 1 file changed, 44 insertions(+), 106 deletions(-) diff --git a/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs b/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs index 32880e68470..5eb2e7be262 100644 --- a/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs +++ b/core/src/test/csharp/ch/cyberduck/core/local/SystemLocalTest.cs @@ -2,7 +2,6 @@ using java.nio.file; using java.util; using NUnit.Framework; -using CoreLocal = ch.cyberduck.core.Local; using CorePath = ch.cyberduck.core.Path; using Path = System.IO.Path; @@ -15,60 +14,63 @@ public class SystemLocalTest const string WSL_PATH = @"\\wsl$\test\"; [Test] - public void FilesGetUsableSpace() + public void EnsureNioDoesntFail([Values(PIPE_NAME, WSL_PATH, "X:\\C$")] string path) { - var store = Files.getFileStore(Paths.get(@"c:\")); - store.getUsableSpace(); + _ = Paths.get(path).toFile(); } [Test] - public void PathsToFileGetUsableSpace() + public void ValidateInvalidNioPaths([Values(@"\\?\X:")] string path) { - Paths.get(@"c:\").toFile().getUsableSpace(); + Assert.Throws(() => Paths.get(path)); } [Test] - public void TestBadDriveLetter1() + public void FilesGetUsableSpace() { - const string PATH = @"#:\"; - Assert.That(new SystemLocal(PATH).getAbsolute(), Is.Empty); + Files.getFileStore(Paths.get(@"c:\")).getUsableSpace(); } [Test] - public void TestBadDriveLetter2() + public void PathsToFileGetUsableSpace() { - const string PATH = @"\#:\"; - Assert.That(new SystemLocal(PATH).getAbsolute(), Is.Empty); + Paths.get(@"c:\").toFile().getUsableSpace(); } [Test] - public void TestBadDriveLetter3() + public void TestBadDriveLetter([Values(@"#:\", @"\#:\", @"\\.\#:\")] string path) { - const string PATH = @"\\.\#:\"; - Assert.That(new SystemLocal(PATH).getAbsolute(), Is.Empty); + // Sanitized empty + Assert.That(new SystemLocal(path).getAbsolute(), Is.Empty); } - [Test] - public void TestConvertToDirectorySeparator() + [Test, Sequential] + public void TestPathSanitize( + [Values( + /* 00 */ "C:\\C:" + )] string path, + [Values( + /* 00 */ "C:\\C_" + )] string expected) { - var path = new SystemLocal(PIPE_NAME.Replace('\\', '/')); - Assert.That(path.getAbsolute(), Is.EqualTo(PIPE_NAME)); + Assert.That(new SystemLocal(path).getAbsolute(), Is.EqualTo(expected)); } [Test] - public void TestDirectoryAltSeparators() + public void TestConvertToDirectorySeparator() { - var path = new SystemLocal(@"C:" + Path.AltDirectorySeparatorChar); - Assert.That(path.getAbsolute(), Is.EqualTo($"C:{Path.DirectorySeparatorChar}")); + SystemLocal path = new(PIPE_NAME.Replace('\\', '/')); + Assert.That(path.getAbsolute(), Is.EqualTo(PIPE_NAME)); } [Test] - public void TestDirectorySeparators() + public void TestDirectorySeparators([ValueSource(nameof(TestDirectorySeparatorsValues))] char sep) { - var path = new SystemLocal(@"C:" + Path.DirectorySeparatorChar); - Assert.That(path.getAbsolute(), Is.EqualTo($"C:{Path.DirectorySeparatorChar}")); + Assert.That(new SystemLocal($"C:{sep}").getAbsolute(), Is.EqualTo($"C:{Path.DirectorySeparatorChar}")); } + static char[] TestDirectorySeparatorsValues() => [Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar]; + [Test] public void TestEmptyPath() { @@ -82,7 +84,7 @@ public void TestEmptyPath() public void TestFileFormats() { string[] filenames = - { + [ @"c:\temp\test-file.txt", @"\\127.0.0.1\c$\temp\test-file.txt", @"\\LOCALHOST\c$\temp\test-file.txt", @@ -90,103 +92,39 @@ public void TestFileFormats() @"\\?\c:\temp\test-file.txt", @"\\.\UNC\LOCALHOST\c$\temp\test-file.txt", @"\\127.0.0.1\c$\temp\test-file.txt" - }; + ]; foreach (var item in filenames) { - var local = new SystemLocal(item); - Assert.That(local.getAbsolute(), Is.EqualTo(item)); + // Local passes through invalid paths, and logs an error + Assert.That(new SystemLocal(item).getAbsolute(), Is.EqualTo(item)); } } - [Test] - public void TestInvalidCharacters() - { - const string TEST = @"C:\:?<>:"; - const string EXPECT = @"C:\_____"; - CoreLocal local = new SystemLocal(TEST); - Assert.That(local.getAbsolute(), Is.EqualTo(EXPECT)); - } - - [Test] - public void TestLocalCompound() - { - CoreLocal root = new SystemLocal(@"C:\"); - CoreLocal compound = new SystemLocal(root, @"C:\"); - Assert.That(compound.getAbsolute(), Is.EqualTo("C:\\C$")); - } - - [Test] - public void TestMountainDuckPath() - { - CoreLocal local = new SystemLocal("/C:/Users/Public"); - Assert.That(local.getAbsolute(), Is.EqualTo("C:\\Users\\Public")); - } - - [Test] - public void TestPathAbsoluteWin32() - { - var test = @"C:\Directory\File.ext"; - var path = new SystemLocal(test); - Assert.That(path.getAbsolute(), Is.EqualTo(test)); - } - - [Test] - public void TestPathFromNonWindows() - { - const string TEST = @"\Volumes\System\Test"; - SystemLocal path = new(TEST); - Assert.That(path.getAbsolute(), Is.EqualTo(TEST)); - } - - [Test] - public void TestPathsPipe() - { - var path = Paths.get(PIPE_NAME); - Assert.That(path.toString(), Is.EqualTo(PIPE_NAME)); - } - - [Test] - public void TestPathsWslPath() - { - var path = Paths.get(WSL_PATH); - Assert.That(path.toString(), Is.EqualTo(WSL_PATH)); - } - [Test] public void TestPathToLocal() { - CorePath path = new CorePath("C:\\Users\\Public", EnumSet.of(AbstractPath.Type.directory)); - var local = new SystemLocal(path.getAbsolute()); - Assert.That(local.getAbsolute(), Is.EqualTo("C:\\Users\\Public")); + const string PUBLIC_PATH = @"C:\Users\Public"; + CorePath path = new(PUBLIC_PATH, EnumSet.of(AbstractPath.Type.directory)); + SystemLocal local = new(path.getAbsolute()); + Assert.That(local.getAbsolute(), Is.EqualTo(PUBLIC_PATH)); } [Test] - public void TestPipeName() + public void TestAbsoluteEquality([Values( + PIPE_NAME, + @"\\?\C:\ÄÖÜßßäöü", + WSL_PATH, + @"\Volumes\System\Test", + @"C:\Directory\File.ext", + @"C:\C$")] string path) { - CoreLocal local = new SystemLocal(PIPE_NAME); - Assert.That(local.getAbsolute(), Is.EqualTo(PIPE_NAME)); + Assert.That(new SystemLocal(path).getAbsolute(), Is.EqualTo(path)); } [Test] public void TestTildePath() { - CoreLocal local = new SystemLocal("~/.ssh/known_hosts"); - Assert.That(local.getAbsolute(), Is.Not.Empty); - } - - [Test] - public void TestUnicode() - { - var test = @"\\?\C:\ÄÖÜßßäöü"; - var path = new SystemLocal(test); - Assert.That(path.getAbsolute(), Is.EqualTo(test)); - } - - [Test] - public void TestWslPath() - { - CoreLocal local = new SystemLocal(WSL_PATH); - Assert.That(local.getAbsolute(), Is.EqualTo(WSL_PATH)); + Assert.That(new SystemLocal("~/.ssh/known_hosts").getAbsolute(), Is.Not.Empty); } } } From 406faf1f13d508da134ff165aa72b4e7470fcbb5 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 31 Jul 2024 09:55:19 +0200 Subject: [PATCH 06/23] Up IKVM --- Directory.Build.Java.props | 13 +++++++++---- Packages.props | 2 +- .../main/csharp/ch/cyberduck/cli/WindowsTerminal.cs | 4 ++++ global.json | 2 +- nuget.config | 1 + windows/src/main/csharp/Properties/AssemblyInfo.cs | 4 +++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Directory.Build.Java.props b/Directory.Build.Java.props index 89a3fea60d1..4a28cc6e15b 100644 --- a/Directory.Build.Java.props +++ b/Directory.Build.Java.props @@ -1,10 +1,15 @@ - - 1.8 - false - true + ikvm.runtime.AppDomainAssemblyClassLoader + false + 1.8 + true + + + + + IKVMC0101;IKVMC0111;$(NoWarn) \ No newline at end of file diff --git a/Packages.props b/Packages.props index 8d2c73e854a..1e3979263f3 100644 --- a/Packages.props +++ b/Packages.props @@ -19,7 +19,7 @@ - + diff --git a/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs b/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs index 2c2e34950b4..22abe1d3b9e 100644 --- a/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs +++ b/cli/src/main/csharp/ch/cyberduck/cli/WindowsTerminal.cs @@ -17,9 +17,13 @@ // using ch.cyberduck.cli; +using ikvm.runtime; +using IKVM.Attributes; using org.apache.commons.cli; using Console = System.Console; +[assembly: CustomAssemblyClassLoader(typeof(AppDomainAssemblyClassLoader))] + namespace Ch.Cyberduck.Cli { internal class WindowsTerminal : Terminal diff --git a/global.json b/global.json index 2e7a984995e..acd7ab1365d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "IKVM.NET.Sdk": "8.10.0-dev.62", + "IKVM.NET.Sdk": "8.10.0-dev.171", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6" } diff --git a/nuget.config b/nuget.config index b9c4832f8c8..e9b94018d69 100644 --- a/nuget.config +++ b/nuget.config @@ -7,6 +7,7 @@ + diff --git a/windows/src/main/csharp/Properties/AssemblyInfo.cs b/windows/src/main/csharp/Properties/AssemblyInfo.cs index d630065294b..a45fedaa42e 100644 --- a/windows/src/main/csharp/Properties/AssemblyInfo.cs +++ b/windows/src/main/csharp/Properties/AssemblyInfo.cs @@ -1,3 +1,5 @@ -using System.Runtime.InteropServices; +using ikvm.runtime; +using IKVM.Attributes; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] +[assembly: CustomAssemblyClassLoader(typeof(AppDomainAssemblyClassLoader))] From 1959e8b673ed5f8fc89d4963eab5d10399ed722b Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Wed, 7 Aug 2024 18:05:15 +0200 Subject: [PATCH 07/23] Dual-Target net472 and net8.0 --- .editorconfig | 2 +- Cyberduck.sln | 269 ++++++------------ Directory.Build.props | 59 ++-- Directory.Build.targets | 115 ++++---- Packages.props | 3 + bonjour/dll/Cyberduck.Bonjour.msbuildproj | 25 +- bonjour/dll/Directory.Build.props | 1 - bonjour/dll/build.xml | 4 +- bonjour/dll/pom.xml | 11 +- bonjour/native/build.xml | 19 +- bonjour/native/pom.xml | 43 +-- bonjour/pom.xml | 16 -- .../csharp/Cyberduck.Bonjour.Native.csproj | 11 +- bonjour/src/main/csharp/Directory.Build.props | 5 - build.xml | 24 +- cli/dll/Cyberduck.Cli.msbuildproj | 22 +- cli/dll/Directory.Build.props | 1 - cli/dll/build.xml | 4 +- cli/dll/pom.xml | 25 +- cli/src/main/csharp/duck.csproj | 10 +- cli/src/main/wix/Bundle/duck.bundle.wixproj | 2 +- cli/windows/Directory.Build.props | 1 + cli/windows/build.xml | 27 +- cli/windows/pom.xml | 45 +-- core/dll/Cyberduck.Core.msbuildproj | 102 +++---- core/dll/Directory.Build.props | 1 - core/dll/build.xml | 4 +- core/dll/pom.xml | 15 +- core/i18n-gen/i18n-gen.targets | 2 +- core/native/build.proj | 4 +- core/native/build.xml | 18 +- core/native/pom.xml | 53 ++-- core/native/refresh/build.xml | 22 +- core/native/refresh/pom.xml | 45 +-- .../main/csharp/Cyberduck.Core.Refresh.csproj | 12 +- .../src/main/csharp/Directory.Build.props | 6 +- .../main/csharp/Cyberduck.Core.Native.csproj | 25 +- core/src/main/csharp/Directory.Build.props | 6 +- .../CodeAnalysis/UnscopedRefAttribute.cs | 4 + .../csharp/System/IO/StringWriterPolyfills.cs | 16 ++ .../ch/cyberduck/core/local/SystemLocal.cs | 12 +- .../test/csharp/Cyberduck.Core.Test.csproj | 1 + core/src/test/csharp/Directory.Build.props | 6 +- .../dll/Cyberduck.Cryptomator.msbuildproj | 22 +- cryptomator/dll/Directory.Build.props | 1 - cryptomator/dll/build.xml | 4 +- cryptomator/dll/pom.xml | 37 ++- cryptomator/pom.xml | 23 -- importer/dll/Cyberduck.Importer.msbuildproj | 22 +- importer/dll/Directory.Build.props | 1 - importer/dll/build.xml | 4 +- importer/dll/pom.xml | 23 +- importer/pom.xml | 9 - pom.xml | 32 ++- protocols/dll/Cyberduck.Protocols.msbuildproj | 268 ++++++++--------- protocols/dll/Directory.Build.props | 1 - protocols/dll/build.xml | 4 +- protocols/dll/pom.xml | 26 +- src/main/msbuild/Cyberduck.Cpp.props | 6 + src/main/msbuild/Cyberduck.Java.props | 7 + src/template/msbuild/Version.props | 13 + windows/Directory.Build.props | 5 +- windows/build.proj | 2 +- windows/build.xml | 28 +- windows/pom.xml | 62 +--- windows/src/main/csharp/Cyberduck.csproj | 7 +- windows/src/main/csharp/Directory.Build.props | 2 +- .../csharp/ch/cyberduck/core/CrashReporter.cs | 0 windows/src/main/package/package.wapproj | 1 - .../Directory.Build.props | 17 -- .../WindowsVersionCustomAction.vcxproj | 3 +- 71 files changed, 755 insertions(+), 973 deletions(-) create mode 100644 core/src/main/csharp/System/IO/StringWriterPolyfills.cs create mode 100644 src/main/msbuild/Cyberduck.Cpp.props create mode 100644 src/main/msbuild/Cyberduck.Java.props create mode 100644 src/template/msbuild/Version.props rename {core => windows}/src/main/csharp/ch/cyberduck/core/CrashReporter.cs (100%) delete mode 100644 windows/src/main/wix/WindowsVersionCustomAction/Directory.Build.props diff --git a/.editorconfig b/.editorconfig index 95836f70b47..707f7695dc2 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ insert_final_newline = true charset = utf-8-bom # XML project files -[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj}] +[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj,msbuildproj}] indent_size = 2 # XML config files diff --git a/Cyberduck.sln b/Cyberduck.sln index 92f036b5dd6..a7a00c5df4f 100644 --- a/Cyberduck.sln +++ b/Cyberduck.sln @@ -51,195 +51,106 @@ 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("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}" EndProject -Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}" EndProject -Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.msbuildproj", "{C9B1C169-1354-4348-9938-7892399C6336}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.msbuildproj", "{C9B1C169-1354-4348-9938-7892399C6336}" EndProject -Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}" EndProject -Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}" EndProject -Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Windows = Debug|Windows - Release|Windows = Release|Windows + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|Windows.ActiveCfg = Debug|Any CPU - {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|Windows.Build.0 = Debug|Any CPU - {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|Windows.ActiveCfg = Release|Any CPU - {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|Windows.Build.0 = Release|Any CPU - {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|Windows.ActiveCfg = Debug|Any CPU - {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|Windows.Build.0 = Debug|Any CPU - {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|Windows.ActiveCfg = Release|Any CPU - {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|Windows.Build.0 = Release|Any CPU - {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|Windows.ActiveCfg = Debug|Any CPU - {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|Windows.Build.0 = Debug|Any CPU - {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|Windows.ActiveCfg = Release|Any CPU - {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|Windows.Build.0 = Release|Any CPU - {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.ActiveCfg = Debug|x64 - {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.Build.0 = Debug|x64 - {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|Windows.ActiveCfg = Release|x64 - {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|Windows.Build.0 = Release|x64 - {1926AB55-690C-4081-99D5-170847C206D9}.Debug|Windows.ActiveCfg = Debug|x64 - {1926AB55-690C-4081-99D5-170847C206D9}.Debug|Windows.Build.0 = Debug|x64 - {1926AB55-690C-4081-99D5-170847C206D9}.Release|Windows.ActiveCfg = Release|x64 - {1926AB55-690C-4081-99D5-170847C206D9}.Release|Windows.Build.0 = Release|x64 - {581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|Windows.ActiveCfg = Debug|x64 - {581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|Windows.Build.0 = Debug|x64 - {581C7683-D22D-4346-B3BF-DC2936231C46}.Release|Windows.ActiveCfg = Release|x64 - {581C7683-D22D-4346-B3BF-DC2936231C46}.Release|Windows.Build.0 = Release|x64 - {2287E64E-3515-4324-9833-553348295C15}.Debug|Windows.ActiveCfg = Debug|x64 - {2287E64E-3515-4324-9833-553348295C15}.Debug|Windows.Build.0 = Debug|x64 - {2287E64E-3515-4324-9833-553348295C15}.Release|Windows.ActiveCfg = Release|x64 - {2287E64E-3515-4324-9833-553348295C15}.Release|Windows.Build.0 = Release|x64 - {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|Windows.ActiveCfg = Debug|x64 - {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|Windows.Build.0 = Debug|x64 - {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.ActiveCfg = Release|x64 - {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.Build.0 = Release|x64 - {9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|Windows.ActiveCfg = Debug|Any CPU - {9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|Windows.Build.0 = Debug|Any CPU - {9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|Windows.ActiveCfg = Release|Any CPU - {9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|Windows.Build.0 = Release|Any CPU - {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|Windows.ActiveCfg = Debug|Any CPU - {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|Windows.Build.0 = Debug|Any CPU - {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|Windows.ActiveCfg = Release|Any CPU - {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|Windows.Build.0 = Release|Any CPU - {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.ActiveCfg = Debug|x64 - {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.Build.0 = Debug|x64 - {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.ActiveCfg = Release|x64 - {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.Build.0 = Release|x64 - {C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.ActiveCfg = Debug|Any CPU - {C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.Build.0 = Debug|Any CPU - {C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.ActiveCfg = Release|Any CPU - {C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.Build.0 = Release|Any CPU - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.ActiveCfg = Debug|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.Build.0 = Debug|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.ActiveCfg = Release|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.Build.0 = Release|Win32 - {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.ActiveCfg = Debug|x86 - {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.Build.0 = Debug|x86 - {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.ActiveCfg = Release|x86 - {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.Build.0 = Release|x86 - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.ActiveCfg = Debug|x86 - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.Build.0 = Debug|x86 - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.ActiveCfg = Release|x86 - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.Build.0 = Release|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.ActiveCfg = Debug|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.Build.0 = Debug|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.ActiveCfg = Release|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.Build.0 = Release|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.ActiveCfg = Debug|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.Build.0 = Debug|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.ActiveCfg = Release|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.Build.0 = Release|x86 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.ActiveCfg = Debug|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.Build.0 = Debug|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.ActiveCfg = Release|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.Build.0 = Release|x64 - {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.ActiveCfg = Debug|Any CPU - {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.Build.0 = Debug|Any CPU - {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.ActiveCfg = Release|Any CPU - {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.Build.0 = Release|Any CPU - {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.ActiveCfg = Debug|x64 - {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Build.0 = Debug|x64 - {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Deploy.0 = Debug|x64 - {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 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1B4DFDAD-C676-4338-B435-F2F62D79E096} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} - {2D33598A-21A1-4117-82DC-250F4CE8D5E5} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} - {7EFC0398-8F4D-4850-BBE3-A0CC85410559} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} - {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} - {1926AB55-690C-4081-99D5-170847C206D9} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} - {581C7683-D22D-4346-B3BF-DC2936231C46} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506} - {2287E64E-3515-4324-9833-553348295C15} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} - {72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} - {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D} - {9C7B827F-AE30-44C4-A210-E49DF883C720} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} - {B31E6C36-D710-443F-8ED7-16BE3BD51FC4} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} - {B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506} - {457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} - {7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67} - {C9B1C169-1354-4348-9938-7892399C6336} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B} - {FBA5EFE2-362B-4BAD-A748-3248F79468AC} = {7D32EE61-B6F0-4978-B500-45172B181283} - {00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283} - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283} - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04} = {457F1D6D-8AEC-42E2-9211-2A8405C95019} - {F6975079-F730-4A31-9909-DE536E524764} = {457F1D6D-8AEC-42E2-9211-2A8405C95019} - {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} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {289E6003-15D5-4377-ADA6-2E7093785BCD} - EndGlobalSection -EndGlobal -|Windows.ActiveCfg = Debug|Any CPU - {C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.Build.0 = Debug|Any CPU - {C9B1C169-1354-4348-9938-7892399C6336}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9B1C169-1354-4348-9938-7892399C6336}.Release|Any CPU.Build.0 = Release|Any CPU - {C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.ActiveCfg = Release|Any CPU - {C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.Build.0 = Release|Any CPU - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Any CPU.ActiveCfg = Debug|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Any CPU.Build.0 = Debug|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Any CPU.ActiveCfg = Release|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Any CPU.Build.0 = Release|x64 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Any CPU.ActiveCfg = Debug|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Any CPU.Build.0 = Debug|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Any CPU.ActiveCfg = Release|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Any CPU.Build.0 = Release|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Debug|Any CPU.Build.0 = Debug|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Release|Any CPU.ActiveCfg = Release|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Release|Any CPU.Build.0 = Release|x86 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Any CPU.Build.0 = Debug|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.ActiveCfg = Debug|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.Build.0 = Debug|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Any CPU.ActiveCfg = Release|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Any CPU.Build.0 = Release|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.ActiveCfg = Release|Win32 - {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.Build.0 = Release|Win32 - {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.ActiveCfg = Debug|x86 - {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.Build.0 = Debug|x86 - {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.ActiveCfg = Release|x86 - {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.Build.0 = Release|x86 - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.ActiveCfg = Debug|x86 - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.Build.0 = Debug|x86 - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.ActiveCfg = Release|x86 - {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.Build.0 = Release|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.ActiveCfg = Debug|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.Build.0 = Debug|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.ActiveCfg = Release|x86 - {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.Build.0 = Release|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.ActiveCfg = Debug|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.Build.0 = Debug|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.ActiveCfg = Release|x86 - {F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.Build.0 = Release|x86 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.ActiveCfg = Debug|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.Build.0 = Debug|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.ActiveCfg = Release|x64 - {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.Build.0 = Release|x64 - {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.ActiveCfg = Debug|Any CPU - {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.Build.0 = Debug|Any CPU - {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.ActiveCfg = Release|Any CPU - {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.Build.0 = Release|Any CPU - {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.ActiveCfg = Debug|x64 - {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Build.0 = Debug|x64 - {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Deploy.0 = Debug|x64 - {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 + {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|x64.ActiveCfg = Debug|Any CPU + {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|x64.Build.0 = Debug|Any CPU + {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|x64.ActiveCfg = Release|Any CPU + {1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|x64.Build.0 = Release|Any CPU + {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|x64.ActiveCfg = Debug|Any CPU + {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|x64.Build.0 = Debug|Any CPU + {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|x64.ActiveCfg = Release|Any CPU + {2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|x64.Build.0 = Release|Any CPU + {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|x64.ActiveCfg = Debug|Any CPU + {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|x64.Build.0 = Debug|Any CPU + {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|x64.ActiveCfg = Release|Any CPU + {7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|x64.Build.0 = Release|Any CPU + {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|x64.ActiveCfg = Debug|x64 + {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|x64.Build.0 = Debug|x64 + {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|x64.ActiveCfg = Release|x64 + {89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|x64.Build.0 = Release|x64 + {1926AB55-690C-4081-99D5-170847C206D9}.Debug|x64.ActiveCfg = Debug|Any CPU + {1926AB55-690C-4081-99D5-170847C206D9}.Debug|x64.Build.0 = Debug|Any CPU + {1926AB55-690C-4081-99D5-170847C206D9}.Release|x64.ActiveCfg = Release|Any CPU + {1926AB55-690C-4081-99D5-170847C206D9}.Release|x64.Build.0 = Release|Any CPU + {581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|x64.ActiveCfg = Debug|x64 + {581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|x64.Build.0 = Debug|x64 + {581C7683-D22D-4346-B3BF-DC2936231C46}.Release|x64.ActiveCfg = Release|x64 + {581C7683-D22D-4346-B3BF-DC2936231C46}.Release|x64.Build.0 = Release|x64 + {2287E64E-3515-4324-9833-553348295C15}.Debug|x64.ActiveCfg = Debug|x64 + {2287E64E-3515-4324-9833-553348295C15}.Debug|x64.Build.0 = Debug|x64 + {2287E64E-3515-4324-9833-553348295C15}.Release|x64.ActiveCfg = Release|x64 + {2287E64E-3515-4324-9833-553348295C15}.Release|x64.Build.0 = Release|x64 + {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|x64.ActiveCfg = Debug|x64 + {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|x64.Build.0 = Debug|x64 + {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|x64.ActiveCfg = Release|x64 + {04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|x64.Build.0 = Release|x64 + {9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|x64.ActiveCfg = Debug|Any CPU + {9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|x64.Build.0 = Debug|Any CPU + {9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|x64.ActiveCfg = Release|Any CPU + {9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|x64.Build.0 = Release|Any CPU + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|x64.ActiveCfg = Debug|Any CPU + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|x64.Build.0 = Debug|Any CPU + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|x64.ActiveCfg = Release|Any CPU + {B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|x64.Build.0 = Release|Any CPU + {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|x64.ActiveCfg = Debug|x64 + {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|x64.Build.0 = Debug|x64 + {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|x64.ActiveCfg = Release|x64 + {B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|x64.Build.0 = Release|x64 + {C9B1C169-1354-4348-9938-7892399C6336}.Debug|x64.ActiveCfg = Debug|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Debug|x64.Build.0 = Debug|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Release|x64.ActiveCfg = Release|Any CPU + {C9B1C169-1354-4348-9938-7892399C6336}.Release|x64.Build.0 = Release|Any CPU + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|x64.ActiveCfg = Debug|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|x64.Build.0 = Debug|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|x64.ActiveCfg = Release|Win32 + {FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|x64.Build.0 = Release|Win32 + {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.ActiveCfg = Debug|x86 + {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.Build.0 = Debug|x86 + {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.ActiveCfg = Release|x86 + {00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.Build.0 = Release|x86 + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.ActiveCfg = Debug|x86 + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.Build.0 = Debug|x86 + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.ActiveCfg = Release|x86 + {65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.Build.0 = Release|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.ActiveCfg = Debug|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.Build.0 = Debug|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.ActiveCfg = Release|x86 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.Build.0 = Release|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.ActiveCfg = Debug|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.Build.0 = Debug|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Release|x64.ActiveCfg = Release|x86 + {F6975079-F730-4A31-9909-DE536E524764}.Release|x64.Build.0 = Release|x86 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|x64.ActiveCfg = Debug|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|x64.Build.0 = Debug|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|x64.ActiveCfg = Release|x64 + {D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|x64.Build.0 = Release|x64 + {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|x64.ActiveCfg = Debug|Any CPU + {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|x64.Build.0 = Debug|Any CPU + {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|x64.ActiveCfg = Release|Any CPU + {ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|x64.Build.0 = Release|Any CPU + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.ActiveCfg = Debug|x64 + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.Build.0 = Debug|x64 + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.Deploy.0 = Debug|x64 + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.ActiveCfg = Release|x64 + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.Build.0 = Release|x64 + {55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.Deploy.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Directory.Build.props b/Directory.Build.props index c33d4a964be..6ec281e88af 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,29 +16,36 @@ - - iterate GmbH - Libre FTP, SFTP, WebDAV, S3 and OpenStack Swift browser for Mac and Windows. - - - - $(MSBuildThisFileDirectory) - $(ModulePath)target\ - - $(TargetBuildDir)obj\$(MSBuildProjectName)\ - $(TargetBuildDir) - $(BaseIntermediateOutputPath)$(Configuration)\ - $(BaseOutputPath) - - false - false - 12 - - - - - - - - - + + iterate GmbH + Libre FTP, SFTP, WebDAV, S3 and OpenStack Swift browser for Mac and Windows. + + + + $(MSBuildThisFileDirectory) + $(CyberduckDir)src\main\msbuild\ + $(ModulePath)target\ + $(TargetBuildDir)lib\ + $(TargetBuildDir)generated\msbuild\ + + $(TargetBuildDir) + false + + $(ArtifactsPath)obj\$(MSBuildProjectName)\ + $(ArtifactsPath) + $(BaseIntermediateOutputPath)$(Configuration)\ + $(BaseOutputPath) + + false + 12 + + + + + + + + + + + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index 996c6e37562..f3c3736c548 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -16,66 +16,71 @@ - + - - - $(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.msbuildproj - - - $(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj - - - $(CyberduckDir)cli\dll\Cyberduck.Cli.msbuildproj - - - $(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)cryptomator\dll\Cyberduck.Cryptomator.msbuildproj - - - $(CyberduckDir)importer\dll\Cyberduck.Importer.msbuildproj - - - $(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj - - + + $(LibDir);$(AssemblySearchPaths) + - - - + + net472 + net8.0 + $(LibDir)$(LibDirFramework)\;$(AssemblySearchPaths) + - - Cyberduck.%(Identity) - - - $(TargetBuildDir)%(Identity).dll - - + + + $(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.msbuildproj + + + $(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj + + + $(CyberduckDir)cli\dll\Cyberduck.Cli.msbuildproj + + + $(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)cryptomator\dll\Cyberduck.Cryptomator.msbuildproj + + + $(CyberduckDir)importer\dll\Cyberduck.Importer.msbuildproj + + + $(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj + - - - $([MSBuild]::VersionLessThanOrEquals('$(NETCoreSdkVersion)', '6.0.301')) - $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '6.0.401')) - SDKFix_RemoveDuplicateAnalyzers;$(CoreCompileDependsOn) - + + + + Cyberduck.%(Identity) + + + - - - - - - - + + + $([MSBuild]::VersionLessThanOrEquals('$(NETCoreSdkVersion)', '6.0.301')) + $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '6.0.401')) + SDKFix_RemoveDuplicateAnalyzers;$(CoreCompileDependsOn) + + + + + + + + + - + - + \ No newline at end of file diff --git a/Packages.props b/Packages.props index 1e3979263f3..ced17f28823 100644 --- a/Packages.props +++ b/Packages.props @@ -33,7 +33,10 @@ + + + diff --git a/bonjour/dll/Cyberduck.Bonjour.msbuildproj b/bonjour/dll/Cyberduck.Bonjour.msbuildproj index 1189e4e76ef..2ba81c75dc8 100644 --- a/bonjour/dll/Cyberduck.Bonjour.msbuildproj +++ b/bonjour/dll/Cyberduck.Bonjour.msbuildproj @@ -1,12 +1,17 @@ - - net472 - + + + net472 + - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/bonjour/dll/Directory.Build.props b/bonjour/dll/Directory.Build.props index 82445b2700b..415d5cdf9b5 100644 --- a/bonjour/dll/Directory.Build.props +++ b/bonjour/dll/Directory.Build.props @@ -20,6 +20,5 @@ - diff --git a/bonjour/dll/build.xml b/bonjour/dll/build.xml index f5fec0f93bb..e0509917d22 100644 --- a/bonjour/dll/build.xml +++ b/bonjour/dll/build.xml @@ -29,11 +29,9 @@ - + - - diff --git a/bonjour/dll/pom.xml b/bonjour/dll/pom.xml index c9a70a90e14..8cb21bc0f03 100644 --- a/bonjour/dll/pom.xml +++ b/bonjour/dll/pom.xml @@ -58,8 +58,9 @@ + net472 dll - ${project.build.directory}/Cyberduck.Bonjour.dll + ${project.build.directory}/net472/Cyberduck.Bonjour.dll @@ -75,6 +76,7 @@ ch.cyberduck Cyberduck.Core + net472 ${project.version} dll @@ -87,6 +89,13 @@ ch.cyberduck bonjour ${project.version} + provided + + + ch.cyberduck + core + + \ No newline at end of file diff --git a/bonjour/native/build.xml b/bonjour/native/build.xml index 6a5c585a427..fd59646a58f 100644 --- a/bonjour/native/build.xml +++ b/bonjour/native/build.xml @@ -23,31 +23,18 @@ - - - - - - - - - + - + - - - + diff --git a/bonjour/native/pom.xml b/bonjour/native/pom.xml index 18b20d3fec5..3959d4429be 100644 --- a/bonjour/native/pom.xml +++ b/bonjour/native/pom.xml @@ -36,8 +36,9 @@ + net472 dll - ${project.build.directory}/Cyberduck.Bonjour.Native.dll + ${project.build.directory}/net472/Cyberduck.Bonjour.Native.dll @@ -46,36 +47,6 @@ maven-antrun-plugin - - - run-ant-restore-target - initialize - - run - - - - - - - - - - run-ant-build-target - compile - - run - - - - - - - - - - - @@ -83,19 +54,11 @@ ch.cyberduck Cyberduck.Bonjour + net472 dll ${project.version} - runtime - - - - ch.cyberduck - bonjour - ${project.version} - - diff --git a/bonjour/pom.xml b/bonjour/pom.xml index ab6fc8b79d5..73667535edb 100644 --- a/bonjour/pom.xml +++ b/bonjour/pom.xml @@ -55,22 +55,6 @@ true - - - - maven-dependency-plugin - - - - - - ch.cyberduck - Cyberduck.Core - dll - ${project.version} - runtime - - linux diff --git a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj index 6f20a8480c7..b176bbca869 100644 --- a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj +++ b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj @@ -1,24 +1,21 @@  + net472 true - + - - - - - - {18FBED6D-F2B7-4EC8-A4A4-46282E635308} diff --git a/bonjour/src/main/csharp/Directory.Build.props b/bonjour/src/main/csharp/Directory.Build.props index f42b355a991..12cf8c164a2 100644 --- a/bonjour/src/main/csharp/Directory.Build.props +++ b/bonjour/src/main/csharp/Directory.Build.props @@ -20,9 +20,4 @@ - - x64 - x64 - - diff --git a/build.xml b/build.xml index a22adfaf88e..ed1113ebfb3 100644 --- a/build.xml +++ b/build.xml @@ -78,10 +78,6 @@ - - - - @@ -131,16 +127,24 @@ - + - - - + - + - + + + + + + + + + + + diff --git a/cli/dll/Cyberduck.Cli.msbuildproj b/cli/dll/Cyberduck.Cli.msbuildproj index 3129c18dab5..c550adab78c 100644 --- a/cli/dll/Cyberduck.Cli.msbuildproj +++ b/cli/dll/Cyberduck.Cli.msbuildproj @@ -1,13 +1,15 @@ - - net472 - + + net472 + - - + - - - - - + + + + + + + + \ No newline at end of file diff --git a/cli/dll/Directory.Build.props b/cli/dll/Directory.Build.props index 82445b2700b..415d5cdf9b5 100644 --- a/cli/dll/Directory.Build.props +++ b/cli/dll/Directory.Build.props @@ -20,6 +20,5 @@ - diff --git a/cli/dll/build.xml b/cli/dll/build.xml index f047e8c0e13..68d88d0cf85 100644 --- a/cli/dll/build.xml +++ b/cli/dll/build.xml @@ -24,11 +24,9 @@ - + - - diff --git a/cli/dll/pom.xml b/cli/dll/pom.xml index f85f6d31891..0296c1e89f3 100644 --- a/cli/dll/pom.xml +++ b/cli/dll/pom.xml @@ -70,8 +70,9 @@ + net472 dll - ${project.build.directory}/Cyberduck.Cli.dll + ${project.build.directory}/net472/Cyberduck.Cli.dll @@ -90,29 +91,30 @@ ch.cyberduck Cyberduck.Core + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Core.Native + net472 dll ${project.version} ch.cyberduck Cyberduck.Protocols + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Cryptomator + net472 dll ${project.version} - runtime @@ -123,6 +125,21 @@ ch.cyberduck cli ${project.version} + provided + + + ch.cyberduck + core + + + ch.cyberduck + cryptomator + + + ch.cyberduck + protocols + + diff --git a/cli/src/main/csharp/duck.csproj b/cli/src/main/csharp/duck.csproj index 23828e56ebe..24881b26752 100644 --- a/cli/src/main/csharp/duck.csproj +++ b/cli/src/main/csharp/duck.csproj @@ -20,6 +20,10 @@ $(Filename)$(Extension) PreserveNewest + + PreserveNewest + $(Filename)$(Extension) + bookmarks/%(Filename)%(Extension) @@ -36,10 +40,8 @@ - - contentfiles;analyzers;build;buildTransitive - + - + \ No newline at end of file diff --git a/cli/src/main/wix/Bundle/duck.bundle.wixproj b/cli/src/main/wix/Bundle/duck.bundle.wixproj index 1c22127b548..5daa10a2cb2 100644 --- a/cli/src/main/wix/Bundle/duck.bundle.wixproj +++ b/cli/src/main/wix/Bundle/duck.bundle.wixproj @@ -36,7 +36,7 @@ ikvm - INSTALLFOLDER + INSTALLLOCATION IkvmRuntime var.IkvmRuntimeDir diff --git a/cli/windows/Directory.Build.props b/cli/windows/Directory.Build.props index 446ced77aa6..345496fbdd4 100644 --- a/cli/windows/Directory.Build.props +++ b/cli/windows/Directory.Build.props @@ -17,6 +17,7 @@ $(MSBuildThisFileDirectory) + false diff --git a/cli/windows/build.xml b/cli/windows/build.xml index 213babf5c02..4a773374c78 100644 --- a/cli/windows/build.xml +++ b/cli/windows/build.xml @@ -19,26 +19,12 @@ - - - - - - - - - - - - - - + @@ -47,20 +33,16 @@ - + - - - - - + @@ -71,11 +53,8 @@ - - - diff --git a/cli/windows/pom.xml b/cli/windows/pom.xml index 8e98281a563..065e296c419 100644 --- a/cli/windows/pom.xml +++ b/cli/windows/pom.xml @@ -39,34 +39,6 @@ maven-antrun-plugin - - run-ant-restore-target - initialize - - run - - - - - - - - - - run-ant-build-target - compile - - run - - - - - - - - - - run-ant-installer-target package @@ -111,46 +83,39 @@ ch.cyberduck Cyberduck.Core + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Core.Native + net472 dll ${project.version} ch.cyberduck Cyberduck.Protocols + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Cryptomator + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Cli + net472 dll ${project.version} - runtime - - - - ch.cyberduck - cli - ${project.version} - - diff --git a/core/dll/Cyberduck.Core.msbuildproj b/core/dll/Cyberduck.Core.msbuildproj index 6cded0ee5d2..434b974e1ce 100644 --- a/core/dll/Cyberduck.Core.msbuildproj +++ b/core/dll/Cyberduck.Core.msbuildproj @@ -1,53 +1,55 @@ - - net472 - + + net472;net8.0 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/dll/Directory.Build.props b/core/dll/Directory.Build.props index 82445b2700b..415d5cdf9b5 100644 --- a/core/dll/Directory.Build.props +++ b/core/dll/Directory.Build.props @@ -20,6 +20,5 @@ - diff --git a/core/dll/build.xml b/core/dll/build.xml index d227d35f0de..c49487124ed 100644 --- a/core/dll/build.xml +++ b/core/dll/build.xml @@ -29,11 +29,9 @@ - + - - diff --git a/core/dll/pom.xml b/core/dll/pom.xml index 1a5302aca96..0621c0678c6 100644 --- a/core/dll/pom.xml +++ b/core/dll/pom.xml @@ -58,8 +58,14 @@ + net472 dll - ${project.build.directory}/Cyberduck.Core.dll + ${project.build.directory}/net472/Cyberduck.Core.dll + + + net8.0 + dll + ${project.build.directory}/net8.0/Cyberduck.Core.dll @@ -78,7 +84,7 @@ --> com.fasterxml.jackson.core jackson-databind - compile + provided com.auth0 java-jwt - compile + provided net.java.dev.jna @@ -105,6 +111,7 @@ ch.cyberduck core ${project.version} + provided - + \ No newline at end of file diff --git a/core/i18n-gen/i18n-gen.targets b/core/i18n-gen/i18n-gen.targets index 219a24a80dc..ff9b37d2bfa 100644 --- a/core/i18n-gen/i18n-gen.targets +++ b/core/i18n-gen/i18n-gen.targets @@ -1,6 +1,6 @@  - $(CyberduckDir)core\target\i18n-gen.dll + $(CyberduckDir)core\target\netstandard2.0\i18n-gen.dll - - + + diff --git a/core/native/build.xml b/core/native/build.xml index 116ac198c63..914ac71531e 100644 --- a/core/native/build.xml +++ b/core/native/build.xml @@ -23,33 +23,21 @@ - - - - - - - - - - + - + - - - - + diff --git a/core/native/pom.xml b/core/native/pom.xml index 45c6f0883c7..9758bb70695 100644 --- a/core/native/pom.xml +++ b/core/native/pom.xml @@ -40,8 +40,14 @@ + net472 dll - ${project.build.directory}/Cyberduck.Core.Native.dll + ${project.build.directory}/net472/Cyberduck.Core.Native.dll + + + net8.0 + dll + ${project.build.directory}/net8.0-windows10.0.22621.0/Cyberduck.Core.Native.dll @@ -50,40 +56,11 @@ maven-antrun-plugin - false - - run-ant-restore-target - initialize - - run - - - - - - - - - - run-ant-build-target - compile - - run - - - - - - - - - - - run-ant-test-target test + false run @@ -106,20 +83,22 @@ ch.cyberduck Cyberduck.Core + net472 + dll + ${project.version} + + + ch.cyberduck + Cyberduck.Core + net8.0 dll ${project.version} - runtime - - ch.cyberduck - core - ${project.version} - nunit nunit.framework diff --git a/core/native/refresh/build.xml b/core/native/refresh/build.xml index 36210698428..90d718df519 100644 --- a/core/native/refresh/build.xml +++ b/core/native/refresh/build.xml @@ -23,35 +23,19 @@ - - - - - - - - - - - - - - + - + - - - + diff --git a/core/native/refresh/pom.xml b/core/native/refresh/pom.xml index 892f1acc468..563de868c13 100644 --- a/core/native/refresh/pom.xml +++ b/core/native/refresh/pom.xml @@ -36,8 +36,14 @@ + net472 dll - ${project.build.directory}/Cyberduck.Core.Refresh.dll + ${project.build.directory}/net472/Cyberduck.Core.Refresh.dll + + + net8.0 + dll + ${project.build.directory}/net8.0-windows10.0.22621.0/Cyberduck.Core.Refresh.dll @@ -46,37 +52,6 @@ maven-antrun-plugin - - - run-ant-restore-target - initialize - - run - - - - - - - - - - run-ant-build-target - compile - - run - - - - - - - - - - - - @@ -84,16 +59,16 @@ ch.cyberduck Cyberduck.Core.Native + net472 dll ${project.version} - runtime ch.cyberduck - Cyberduck.Protocols + Cyberduck.Core.Native + net8.0 dll ${project.version} - runtime 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 a282a133741..b2429b5cd3a 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,9 @@ - net472 + net472;net8.0-windows10.0.22621.0 + 10.0.14393.0 + x64 12.0 true true @@ -32,6 +34,7 @@ all + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -39,10 +42,7 @@ - - - - + @@ -53,4 +53,4 @@ - + \ No newline at end of file diff --git a/core/native/refresh/src/main/csharp/Directory.Build.props b/core/native/refresh/src/main/csharp/Directory.Build.props index e2b0c542710..3d745f39e25 100644 --- a/core/native/refresh/src/main/csharp/Directory.Build.props +++ b/core/native/refresh/src/main/csharp/Directory.Build.props @@ -1,9 +1,5 @@  - - - x64 - x64 - + diff --git a/core/src/main/csharp/Cyberduck.Core.Native.csproj b/core/src/main/csharp/Cyberduck.Core.Native.csproj index 6d7cde59237..d8948205cd8 100644 --- a/core/src/main/csharp/Cyberduck.Core.Native.csproj +++ b/core/src/main/csharp/Cyberduck.Core.Native.csproj @@ -16,27 +16,23 @@ - net472 + net472;net8.0-windows10.0.22621.0 + 10.0.14393.0 + x64 true - - - - - - all + runtime; build; native; contentfiles; analyzers; buildtransitive - all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -44,6 +40,17 @@ + + + + + + + + + + + True @@ -69,4 +76,4 @@ Ch.Cyberduck.Properties - + \ No newline at end of file diff --git a/core/src/main/csharp/Directory.Build.props b/core/src/main/csharp/Directory.Build.props index 0c3264d5b0a..4a975e0eebb 100644 --- a/core/src/main/csharp/Directory.Build.props +++ b/core/src/main/csharp/Directory.Build.props @@ -20,9 +20,5 @@ - - - x64 - x64 - + diff --git a/core/src/main/csharp/System/Diagnostics/CodeAnalysis/UnscopedRefAttribute.cs b/core/src/main/csharp/System/Diagnostics/CodeAnalysis/UnscopedRefAttribute.cs index edd68e9f658..cb38a1c362f 100644 --- a/core/src/main/csharp/System/Diagnostics/CodeAnalysis/UnscopedRefAttribute.cs +++ b/core/src/main/csharp/System/Diagnostics/CodeAnalysis/UnscopedRefAttribute.cs @@ -1,6 +1,10 @@ namespace System.Diagnostics.CodeAnalysis; +#if NETFRAMEWORK + [AttributeUsage(AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property, AllowMultiple = false, Inherited = false)] public sealed class UnscopedRefAttribute : Attribute { } + +#endif diff --git a/core/src/main/csharp/System/IO/StringWriterPolyfills.cs b/core/src/main/csharp/System/IO/StringWriterPolyfills.cs new file mode 100644 index 00000000000..55f0dd27404 --- /dev/null +++ b/core/src/main/csharp/System/IO/StringWriterPolyfills.cs @@ -0,0 +1,16 @@ +#if NETFRAMEWORK + +namespace System.IO; + +public static class StringWriterPolyfills +{ + public static void Write(this StringWriter writer, in ReadOnlySpan chars) + { + foreach (ref readonly var c in chars) + { + writer.Write(c); + } + } +} + +#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..7c37f370412 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,8 @@ 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); + writer.Write(segment); + nextDriveLetter = segment.Length == 1 && (segment[0] == '?' || segment[0] == '.'); } else if (firstChanceDriveLetter && segment.Length == 2 && segment[1] == Path.VolumeSeparatorChar) @@ -198,15 +199,6 @@ private static string Sanitize(string name, bool makeUnc = false) } } return writer.ToString(); - - static void Append(in ReadOnlySpan range, StringWriter writer) - { - // skip any allocation of strings or arrays. - foreach (ref readonly var c in range) - { - writer.Write(c); - } - } } } } diff --git a/core/src/test/csharp/Cyberduck.Core.Test.csproj b/core/src/test/csharp/Cyberduck.Core.Test.csproj index 936ee789163..3b01caa9fd3 100644 --- a/core/src/test/csharp/Cyberduck.Core.Test.csproj +++ b/core/src/test/csharp/Cyberduck.Core.Test.csproj @@ -2,6 +2,7 @@ net472 + x64 false true diff --git a/core/src/test/csharp/Directory.Build.props b/core/src/test/csharp/Directory.Build.props index e2b76fa5166..9107ccfa536 100644 --- a/core/src/test/csharp/Directory.Build.props +++ b/core/src/test/csharp/Directory.Build.props @@ -18,11 +18,7 @@ <_CoreBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/ + - - x64 - x64 - - diff --git a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj index ae65d8bf1ef..4e0ebcf53b6 100644 --- a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj +++ b/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj @@ -1,13 +1,15 @@ - - net472 - + + net472;net8.0 + - - + - - - - - + + + + + + + + \ No newline at end of file diff --git a/cryptomator/dll/Directory.Build.props b/cryptomator/dll/Directory.Build.props index e0dc1f1ec1f..742c29d2fb8 100644 --- a/cryptomator/dll/Directory.Build.props +++ b/cryptomator/dll/Directory.Build.props @@ -20,6 +20,5 @@ - diff --git a/cryptomator/dll/build.xml b/cryptomator/dll/build.xml index 70f00675d3a..f5d9e5435cf 100644 --- a/cryptomator/dll/build.xml +++ b/cryptomator/dll/build.xml @@ -23,11 +23,9 @@ - + - - diff --git a/cryptomator/dll/pom.xml b/cryptomator/dll/pom.xml index d2256db3e65..8cced4aad60 100644 --- a/cryptomator/dll/pom.xml +++ b/cryptomator/dll/pom.xml @@ -70,8 +70,14 @@ + net472 dll - ${project.build.directory}/Cyberduck.Cryptomator.dll + ${project.build.directory}/net472/Cyberduck.Cryptomator.dll + + + net8.0 + dll + ${project.build.directory}/net8.0/Cyberduck.Cryptomator.dll @@ -86,6 +92,22 @@ + + + ch.cyberduck + Cyberduck.Core + net472 + dll + ${project.version} + + + ch.cyberduck + Cyberduck.Core + net8.0 + dll + ${project.version} + + @@ -94,6 +116,17 @@ ch.cyberduck cryptomator ${project.version} + provided + + + ch.cyberduck + core + + + com.auth0 + java-jwt + + - + \ No newline at end of file diff --git a/cryptomator/pom.xml b/cryptomator/pom.xml index ddc8cccaa12..6ab8bbcb062 100644 --- a/cryptomator/pom.xml +++ b/cryptomator/pom.xml @@ -28,29 +28,6 @@ 2.1.2.1 - - - windows - - - Windows - - - - true - - - - ch.cyberduck - Cyberduck.Core - dll - ${project.version} - runtime - - - - - ch.cyberduck diff --git a/importer/dll/Cyberduck.Importer.msbuildproj b/importer/dll/Cyberduck.Importer.msbuildproj index 917864a442d..119bb07e690 100644 --- a/importer/dll/Cyberduck.Importer.msbuildproj +++ b/importer/dll/Cyberduck.Importer.msbuildproj @@ -1,13 +1,15 @@ - - net472 - + + net472;net8.0 + - - + - - - - - + + + + + + + + \ No newline at end of file diff --git a/importer/dll/Directory.Build.props b/importer/dll/Directory.Build.props index e0dc1f1ec1f..742c29d2fb8 100644 --- a/importer/dll/Directory.Build.props +++ b/importer/dll/Directory.Build.props @@ -20,6 +20,5 @@ - diff --git a/importer/dll/build.xml b/importer/dll/build.xml index a4ac25cd91d..547ea69d8d0 100644 --- a/importer/dll/build.xml +++ b/importer/dll/build.xml @@ -29,11 +29,9 @@ - + - - diff --git a/importer/dll/pom.xml b/importer/dll/pom.xml index 11cc01d9a60..7ace536f074 100644 --- a/importer/dll/pom.xml +++ b/importer/dll/pom.xml @@ -55,8 +55,14 @@ + net472 dll - ${project.build.directory}/Cyberduck.Importer.dll + ${project.build.directory}/net472/Cyberduck.Importer.dll + + + net8.0 + dll + ${project.build.directory}/net8.0/Cyberduck.Importer.dll @@ -75,6 +81,14 @@ ch.cyberduck Cyberduck.Core + net472 + dll + ${project.version} + + + ch.cyberduck + Cyberduck.Core + net8.0 dll ${project.version} @@ -87,6 +101,13 @@ ch.cyberduck importer ${project.version} + provided + + + ch.cyberduck + core + + diff --git a/importer/pom.xml b/importer/pom.xml index b014df1881e..5e6652a5937 100644 --- a/importer/pom.xml +++ b/importer/pom.xml @@ -35,15 +35,6 @@ true - - - ch.cyberduck - Cyberduck.Core - dll - ${project.version} - runtime - - linux diff --git a/pom.xml b/pom.xml index f2af296e3c4..0cdd33d6051 100644 --- a/pom.xml +++ b/pom.xml @@ -625,7 +625,36 @@ copy-dependencies - ${project.build.directory} + ${project.build.directory}/lib + net472,net8.0 + dll + true + true + + + + copy-dependencies-dll-net472-target + generate-sources + + copy-dependencies + + + ${project.build.directory}/lib/net472 + net472 + dll + true + true + + + + copy-dependencies-dll-net8.0-target + generate-sources + + copy-dependencies + + + ${project.build.directory}/lib/net8.0 + net8.0 dll true true @@ -1031,6 +1060,7 @@ true true + compile diff --git a/protocols/dll/Cyberduck.Protocols.msbuildproj b/protocols/dll/Cyberduck.Protocols.msbuildproj index c3a47ee05cf..8bb50810c54 100644 --- a/protocols/dll/Cyberduck.Protocols.msbuildproj +++ b/protocols/dll/Cyberduck.Protocols.msbuildproj @@ -1,137 +1,139 @@ - - net472 - + + net472;net8.0 + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/protocols/dll/Directory.Build.props b/protocols/dll/Directory.Build.props index e0dc1f1ec1f..742c29d2fb8 100644 --- a/protocols/dll/Directory.Build.props +++ b/protocols/dll/Directory.Build.props @@ -20,6 +20,5 @@ - diff --git a/protocols/dll/build.xml b/protocols/dll/build.xml index 79298e526b7..296b9012ad0 100644 --- a/protocols/dll/build.xml +++ b/protocols/dll/build.xml @@ -29,11 +29,9 @@ - + - - diff --git a/protocols/dll/pom.xml b/protocols/dll/pom.xml index 425417ac79f..ae8f135c1fc 100644 --- a/protocols/dll/pom.xml +++ b/protocols/dll/pom.xml @@ -55,8 +55,14 @@ + net472 dll - ${project.build.directory}/Cyberduck.Protocols.dll + ${project.build.directory}/net472/Cyberduck.Protocols.dll + + + net8.0 + dll + ${project.build.directory}/net8.0/Cyberduck.Protocols.dll @@ -75,9 +81,16 @@ ch.cyberduck Cyberduck.Core + net472 + dll + ${project.version} + + + ch.cyberduck + Cyberduck.Core + net8.0 dll ${project.version} - runtime @@ -89,6 +102,13 @@ protocols pom ${project.version} + provided + + + ch.cyberduck + core + + - + \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.Cpp.props b/src/main/msbuild/Cyberduck.Cpp.props new file mode 100644 index 00000000000..96185344ba5 --- /dev/null +++ b/src/main/msbuild/Cyberduck.Cpp.props @@ -0,0 +1,6 @@ + + + $(OutputPath) + $(IntermediateOutputPath) + + \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.Java.props b/src/main/msbuild/Cyberduck.Java.props new file mode 100644 index 00000000000..9c3429b2c88 --- /dev/null +++ b/src/main/msbuild/Cyberduck.Java.props @@ -0,0 +1,7 @@ + + + <_DirectoryBuildJavaPropsFile>$([MSBuild]::GetPathOfFileAbove('Directory.Build.Java.props', '$(MSBuildProjectDirectory)')) + + + + \ No newline at end of file diff --git a/src/template/msbuild/Version.props b/src/template/msbuild/Version.props new file mode 100644 index 00000000000..9aa2ba2a632 --- /dev/null +++ b/src/template/msbuild/Version.props @@ -0,0 +1,13 @@ + + + + ${version} + ${fullversion} + ${revision} + 0 + $(AssemblyVersion).$(Revision) + + $(FileVersion) + + + \ No newline at end of file diff --git a/windows/Directory.Build.props b/windows/Directory.Build.props index dd573ef48a9..423651ecc5d 100644 --- a/windows/Directory.Build.props +++ b/windows/Directory.Build.props @@ -17,12 +17,9 @@ $(MSBuildThisFileDirectory) + false - - $(BuildVersion).$(Revision) - - diff --git a/windows/build.proj b/windows/build.proj index 9dd4030f31e..a8e703d6492 100644 --- a/windows/build.proj +++ b/windows/build.proj @@ -18,6 +18,6 @@ - + diff --git a/windows/build.xml b/windows/build.xml index 7bd77cfcdbf..aca2f04b9f8 100755 --- a/windows/build.xml +++ b/windows/build.xml @@ -31,42 +31,32 @@ - - - - - - - - - - + - + - - - - + + + - + @@ -91,15 +81,9 @@ - - - - - - diff --git a/windows/pom.xml b/windows/pom.xml index 516f8aaa744..f20d8b3c40b 100644 --- a/windows/pom.xml +++ b/windows/pom.xml @@ -60,34 +60,6 @@ maven-antrun-plugin - - run-ant-restore-target - initialize - - run - - - - - - - - - - run-ant-build-target - compile - - run - - - - - - - - - - run-ant-test-target test @@ -145,56 +117,58 @@ ch.cyberduck Cyberduck.Core + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Core.Native + net472 dll ${project.version} ch.cyberduck Cyberduck.Core.Refresh + net472 dll ${project.version} ch.cyberduck Cyberduck.Protocols + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Bonjour + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Bonjour.Native + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Importer + net472 dll ${project.version} - runtime ch.cyberduck Cyberduck.Cryptomator + net472 dll ${project.version} - runtime com.github.vslavik @@ -210,28 +184,8 @@ native dll 1.0.0.1 - runtime - - - - ch.cyberduck - protocols - pom - ${project.version} - - - ch.cyberduck - importer - ${project.version} - - - ch.cyberduck - cryptomator - ${project.version} - - diff --git a/windows/src/main/csharp/Cyberduck.csproj b/windows/src/main/csharp/Cyberduck.csproj index 99ea48ee6c6..23466bbff45 100644 --- a/windows/src/main/csharp/Cyberduck.csproj +++ b/windows/src/main/csharp/Cyberduck.csproj @@ -19,7 +19,8 @@ - + + PreserveNewest $(Filename)$(Extension) @@ -30,7 +31,7 @@ - $(TargetBuildDir)CustomOpenFileFolderDialog.dll + $(TargetBuildDir)lib/CustomOpenFileFolderDialog.dll @@ -89,4 +90,4 @@ - + \ No newline at end of file diff --git a/windows/src/main/csharp/Directory.Build.props b/windows/src/main/csharp/Directory.Build.props index 452a911d2e2..b20cbe14427 100644 --- a/windows/src/main/csharp/Directory.Build.props +++ b/windows/src/main/csharp/Directory.Build.props @@ -17,4 +17,4 @@ - + \ No newline at end of file diff --git a/core/src/main/csharp/ch/cyberduck/core/CrashReporter.cs b/windows/src/main/csharp/ch/cyberduck/core/CrashReporter.cs similarity index 100% rename from core/src/main/csharp/ch/cyberduck/core/CrashReporter.cs rename to windows/src/main/csharp/ch/cyberduck/core/CrashReporter.cs diff --git a/windows/src/main/package/package.wapproj b/windows/src/main/package/package.wapproj index c7466bdd1fd..5f8d27d72bb 100644 --- a/windows/src/main/package/package.wapproj +++ b/windows/src/main/package/package.wapproj @@ -63,7 +63,6 @@ %(Filename)%(Extension) - diff --git a/windows/src/main/wix/WindowsVersionCustomAction/Directory.Build.props b/windows/src/main/wix/WindowsVersionCustomAction/Directory.Build.props deleted file mode 100644 index 527aa27e2dc..00000000000 --- a/windows/src/main/wix/WindowsVersionCustomAction/Directory.Build.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - diff --git a/windows/src/main/wix/WindowsVersionCustomAction/WindowsVersionCustomAction.vcxproj b/windows/src/main/wix/WindowsVersionCustomAction/WindowsVersionCustomAction.vcxproj index c0e651409b2..e13162a9c7e 100644 --- a/windows/src/main/wix/WindowsVersionCustomAction/WindowsVersionCustomAction.vcxproj +++ b/windows/src/main/wix/WindowsVersionCustomAction/WindowsVersionCustomAction.vcxproj @@ -14,10 +14,10 @@ {fba5efe2-362b-4bad-a748-3248f79468ac} Win32Proj WindowsVersionCustomAction - windows\target\ 10.0 + DynamicLibrary v140 @@ -26,7 +26,6 @@ v143 DynamicLibrary Unicode - obj\$(Configuration) true From 9f174c0c93f68e88f5e22436e42e6dbff684e1fc Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 15 Aug 2024 13:10:31 +0200 Subject: [PATCH 08/23] Fix build outputs --- Directory.Build.props | 2 ++ Directory.Build.targets | 8 +++----- bonjour/dll/Cyberduck.Bonjour.msbuildproj | 9 ++++++++- cli/dll/Cyberduck.Cli.msbuildproj | 9 ++++++++- core/dll/Cyberduck.Core.msbuildproj | 9 ++++++++- cryptomator/dll/Cyberduck.Cryptomator.msbuildproj | 9 ++++++++- importer/dll/Cyberduck.Importer.msbuildproj | 9 ++++++++- protocols/dll/Cyberduck.Protocols.msbuildproj | 9 ++++++++- src/main/msbuild/Cyberduck.Java.targets | 7 +++++++ 9 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 src/main/msbuild/Cyberduck.Java.targets diff --git a/Directory.Build.props b/Directory.Build.props index 6ec281e88af..cfe326bdc9a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -38,6 +38,8 @@ false 12 + + false diff --git a/Directory.Build.targets b/Directory.Build.targets index f3c3736c548..db8a4a382b5 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -57,9 +57,9 @@ $(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj - - - + + + Cyberduck.%(Identity) @@ -81,6 +81,4 @@ - - \ No newline at end of file diff --git a/bonjour/dll/Cyberduck.Bonjour.msbuildproj b/bonjour/dll/Cyberduck.Bonjour.msbuildproj index 2ba81c75dc8..7f8172f6042 100644 --- a/bonjour/dll/Cyberduck.Bonjour.msbuildproj +++ b/bonjour/dll/Cyberduck.Bonjour.msbuildproj @@ -1,4 +1,7 @@ - + + + + + win-x86 + win-x64 + + $([MSBuild]::VersionLessThanOrEquals('$(NETCoreSdkVersion)', '6.0.301')) diff --git a/Packages.props b/Packages.props index 02e17a2fa77..e5718fd859b 100644 --- a/Packages.props +++ b/Packages.props @@ -21,6 +21,7 @@ + diff --git a/cli/src/main/csharp/duck.csproj b/cli/src/main/csharp/duck.csproj index 24881b26752..f5c7bd33988 100644 --- a/cli/src/main/csharp/duck.csproj +++ b/cli/src/main/csharp/duck.csproj @@ -4,7 +4,7 @@ Exe net472 x64 - win7-x64 + win-x64 diff --git a/windows/src/main/csharp/Cyberduck.csproj b/windows/src/main/csharp/Cyberduck.csproj index 23466bbff45..f11ba5602e2 100644 --- a/windows/src/main/csharp/Cyberduck.csproj +++ b/windows/src/main/csharp/Cyberduck.csproj @@ -3,7 +3,7 @@ WinExe net472 - win7-x64 + win-x64 x64 true true From 612abc9d699633794b0403a33f638477f5b2983b Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 28 Nov 2024 12:01:36 +0100 Subject: [PATCH 20/23] Not used on Windows --- importer/dll/Cyberduck.Importer.msbuildproj | 1 - 1 file changed, 1 deletion(-) diff --git a/importer/dll/Cyberduck.Importer.msbuildproj b/importer/dll/Cyberduck.Importer.msbuildproj index d14e5f87adf..dce12e8bc37 100644 --- a/importer/dll/Cyberduck.Importer.msbuildproj +++ b/importer/dll/Cyberduck.Importer.msbuildproj @@ -11,7 +11,6 @@ - \ No newline at end of file From bc94cc6b1b92a980c6aa8ce639eed17c46b13ca0 Mon Sep 17 00:00:00 2001 From: Yves Langisch Date: Thu, 28 Nov 2024 16:20:16 +0100 Subject: [PATCH 21/23] Update test to use NUnit 4 asserts. --- .../core/preferences/ApplicationPreferencesTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/test/csharp/ch/cyberduck/core/preferences/ApplicationPreferencesTests.cs b/core/src/test/csharp/ch/cyberduck/core/preferences/ApplicationPreferencesTests.cs index 110bf5355ac..8f373ec3597 100644 --- a/core/src/test/csharp/ch/cyberduck/core/preferences/ApplicationPreferencesTests.cs +++ b/core/src/test/csharp/ch/cyberduck/core/preferences/ApplicationPreferencesTests.cs @@ -27,10 +27,10 @@ public void PersistsEmptyValue() new("test.empty.default", "DONT") ]); - Assert.AreEqual("DONT", preferences.getDefault("test.empty.default")); + Assert.That("DONT", Is.EqualTo(preferences.getDefault("test.empty.default"))); preferences.setProperty("test.empty.default", ""); - Assert.AreEqual("DONT", preferences.getDefault("test.empty.default")); - Assert.AreEqual("", preferences.getProperty("test.empty.default")); + Assert.That("DONT", Is.EqualTo(preferences.getDefault("test.empty.default"))); + Assert.That("", Is.EqualTo(preferences.getProperty("test.empty.default"))); } [TestCase] @@ -44,7 +44,7 @@ public void OverrideDefaultsDefault() new("test.core.override", "") ]); - Assert.IsEmpty(preferences.getProperty("test.core.override")); + Assert.That(preferences.getProperty("test.core.override"), Is.Empty); } public class TestPreferences : ApplicationPreferences From e4512c598d490fd8705e0933abae1ac70d94d1be Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 28 Nov 2024 17:32:13 +0100 Subject: [PATCH 22/23] Update IKVM --- Directory.Build.Java.props | 12 ++++++++++-- Packages.props | 2 +- .../src/main/csharp/Cyberduck.Bonjour.Native.csproj | 1 + global.json | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Directory.Build.Java.props b/Directory.Build.Java.props index 4a28cc6e15b..8c82e95d5ca 100644 --- a/Directory.Build.Java.props +++ b/Directory.Build.Java.props @@ -8,8 +8,16 @@ - - IKVMC0101;IKVMC0111;$(NoWarn) + + IKVM0100;IKVM0101;IKVM0105;IKVM0111;$(NoWarn) \ No newline at end of file diff --git a/Packages.props b/Packages.props index e5718fd859b..ea744f45526 100644 --- a/Packages.props +++ b/Packages.props @@ -19,7 +19,7 @@ - + diff --git a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj index b176bbca869..f26981c6860 100644 --- a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj +++ b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj @@ -14,6 +14,7 @@ + diff --git a/global.json b/global.json index e50be3a20d4..eacf8c02c59 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "IKVM.NET.Sdk": "8.11.0-dev.50", + "IKVM.NET.Sdk": "8.11.0-dev.186", "Microsoft.Build.NoTargets": "3.7.56", "Microsoft.Build.Traversal": "4.1.0" } From bdfd3c7fab1922fad856327625421c8ca3ddf967 Mon Sep 17 00:00:00 2001 From: AliveDevil Date: Thu, 12 Dec 2024 15:58:35 +0100 Subject: [PATCH 23/23] Push IKVM --- Packages.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages.props b/Packages.props index ea744f45526..7cfd3edaa9d 100644 --- a/Packages.props +++ b/Packages.props @@ -19,7 +19,7 @@ - + diff --git a/global.json b/global.json index eacf8c02c59..975a729e70c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "IKVM.NET.Sdk": "8.11.0-dev.186", + "IKVM.NET.Sdk": "8.11.0-dev.211", "Microsoft.Build.NoTargets": "3.7.56", "Microsoft.Build.Traversal": "4.1.0" }