diff --git a/Cyberduck.sln b/Cyberduck.sln index c7c71f1e46..6436ed0021 100644 --- a/Cyberduck.sln +++ b/Cyberduck.sln @@ -51,17 +51,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "i18n-gen", "core\i18n-gen\i EndProject Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "package", "windows\src\main\package\package.wapproj", "{55CDD736-9A8A-4091-AC99-60E2F9C73269}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}" +Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.ikvmproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}" +Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.ikvmproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.msbuildproj", "{C9B1C169-1354-4348-9938-7892399C6336}" +Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.ikvmproj", "{C9B1C169-1354-4348-9938-7892399C6336}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}" +Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.ikvmproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}" +Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.ikvmproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}" +Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.ikvmproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -105,10 +105,10 @@ Global {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 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.ActiveCfg = Debug|x64 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.Build.0 = Debug|x64 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.ActiveCfg = Release|x64 + {EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.Build.0 = Release|x64 {F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.ActiveCfg = Debug|x64 {F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.Build.0 = Debug|x64 {F6975079-F730-4A31-9909-DE536E524764}.Release|x64.ActiveCfg = Release|x64 diff --git a/Directory.Build.Java.props b/Directory.Build.Java.props deleted file mode 100644 index daf8215559..0000000000 --- a/Directory.Build.Java.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - ikvm.runtime.AppDomainAssemblyClassLoader - false - 1.8 - - - - - IKVM0100;IKVM0101;IKVM0105;IKVM0111;$(NoWarn) - - - \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 18751344e8..7cd498cbc8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,38 +16,11 @@ - - 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 - - false - - - - - - - + - \ No newline at end of file + diff --git a/Directory.Build.targets b/Directory.Build.targets index 7eecb31013..bb8c9469a1 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -16,84 +16,6 @@ - - - - $(LibDir);$(AssemblySearchPaths) - - - - net472 - net8.0 - $(LibDir)$(LibDirFramework)\;$(AssemblySearchPaths) - - - - $(DefaultItemExcludes);**/*net472* - - - $(DefaultItemExcludes);**/*net8.0* - - - - - $(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 - - - - - - Cyberduck.%(Identity) - - - \\?\ - - - - - - win-x86 - win-x64 - - - - - $([MSBuild]::VersionLessThanOrEquals('$(NETCoreSdkVersion)', '6.0.301')) - $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '6.0.401')) - SDKFix_RemoveDuplicateAnalyzers;$(CoreCompileDependsOn) - - - - - - - - - - + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index ea253eb374..b1a9795c8d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -50,6 +50,6 @@ - @(PackageVersion->'%(Identity)'->Replace('.', '')->'Pkg%(Identity)Version=%(Version)') + @(PackageVersion->'%(Identity)'->Replace('.', '_')->'Pkg%(Identity)Version=%(Version)') diff --git a/bonjour/dll/Cyberduck.Bonjour.msbuildproj b/bonjour/dll/Cyberduck.Bonjour.ikvmproj similarity index 85% rename from bonjour/dll/Cyberduck.Bonjour.msbuildproj rename to bonjour/dll/Cyberduck.Bonjour.ikvmproj index 4efb34d915..b5119d86da 100644 --- a/bonjour/dll/Cyberduck.Bonjour.msbuildproj +++ b/bonjour/dll/Cyberduck.Bonjour.ikvmproj @@ -1,5 +1,4 @@ - - + - + - - + + - + + + + + + + + + \ No newline at end of file diff --git a/bonjour/dll/pom.xml b/bonjour/dll/pom.xml index 3f0c7cc879..bcff55db9a 100644 --- a/bonjour/dll/pom.xml +++ b/bonjour/dll/pom.xml @@ -50,17 +50,16 @@ build-helper-maven-plugin - install-dll - verify + install-nupkg + package attach-artifact - net472 - dll - ${project.build.directory}/net472/Cyberduck.Bonjour.dll + nupkg + ${project.build.directory}/Cyberduck.Bonjour.${project.version}.nupkg @@ -76,9 +75,8 @@ ch.cyberduck Cyberduck.Core - net472 + nupkg ${project.version} - dll diff --git a/bonjour/native/Directory.Build.props b/bonjour/native/Directory.Build.props index ae8c28c65d..17adff8d34 100644 --- a/bonjour/native/Directory.Build.props +++ b/bonjour/native/Directory.Build.props @@ -15,10 +15,11 @@ - - $(MSBuildThisFileDirectory) - + + Cyberduck.Bonjour.Native + $(MSBuildThisFileDirectory) + - + - + \ No newline at end of file diff --git a/bonjour/native/build.xml b/bonjour/native/build.xml index fd59646a58..6dfdf91369 100644 --- a/bonjour/native/build.xml +++ b/bonjour/native/build.xml @@ -37,4 +37,13 @@ + + + + + + + + + diff --git a/bonjour/native/pom.xml b/bonjour/native/pom.xml index 4d90379c65..b5960de96b 100644 --- a/bonjour/native/pom.xml +++ b/bonjour/native/pom.xml @@ -28,7 +28,7 @@ build-helper-maven-plugin - install-dll + install-nupkg package attach-artifact @@ -36,9 +36,8 @@ - net472 - dll - ${project.build.directory}/net472/Cyberduck.Bonjour.Native.dll + nupkg + ${project.build.directory}/Cyberduck.Bonjour.Native.${project.version}.nupkg @@ -54,8 +53,7 @@ ch.cyberduck Cyberduck.Bonjour - net472 - dll + nupkg ${project.version} diff --git a/bonjour/native/src/main/nuget/Cyberduck.Bonjour.Native.nuspec b/bonjour/native/src/main/nuget/Cyberduck.Bonjour.Native.nuspec new file mode 100644 index 0000000000..8a3cd206e9 --- /dev/null +++ b/bonjour/native/src/main/nuget/Cyberduck.Bonjour.Native.nuspec @@ -0,0 +1,20 @@ + + + + $id$ + $version$ + $description$ + $authors$ + + + + + + + + + + + + + \ No newline at end of file diff --git a/bonjour/native/src/main/nuget/nuget.proj b/bonjour/native/src/main/nuget/nuget.proj new file mode 100644 index 0000000000..f5a01498fc --- /dev/null +++ b/bonjour/native/src/main/nuget/nuget.proj @@ -0,0 +1,9 @@ + + + + netstandard2.0 + true + false + Cyberduck.Bonjour.Native.nuspec + + diff --git a/bonjour/src/main/csharp/Directory.Build.props b/bonjour/src/main/Directory.Build.props similarity index 100% rename from bonjour/src/main/csharp/Directory.Build.props rename to bonjour/src/main/Directory.Build.props diff --git a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj index f26981c686..6213282790 100644 --- a/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj +++ b/bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj @@ -13,7 +13,6 @@ - diff --git a/bonjour/src/main/csharp/nuget.proj b/bonjour/src/main/csharp/nuget.proj new file mode 100644 index 0000000000..6b158b5b19 --- /dev/null +++ b/bonjour/src/main/csharp/nuget.proj @@ -0,0 +1,8 @@ + + + netstandard2.0 + true + false + Cyberduck.Core.Native.nuspec + + diff --git a/build.xml b/build.xml index d218160770..f4c0e516f8 100644 --- a/build.xml +++ b/build.xml @@ -127,23 +127,34 @@ - + + + - + - + - + + + + + + + + - - + + - + diff --git a/cli/dll/Cyberduck.Cli.msbuildproj b/cli/dll/Cyberduck.Cli.ikvmproj similarity index 83% rename from cli/dll/Cyberduck.Cli.msbuildproj rename to cli/dll/Cyberduck.Cli.ikvmproj index 37aef258ad..5567cf24de 100644 --- a/cli/dll/Cyberduck.Cli.msbuildproj +++ b/cli/dll/Cyberduck.Cli.ikvmproj @@ -1,16 +1,12 @@ - net8.0 - - - diff --git a/cli/dll/build.xml b/cli/dll/build.xml index 68d88d0cf8..d26f3e01fc 100644 --- a/cli/dll/build.xml +++ b/cli/dll/build.xml @@ -16,17 +16,25 @@ --> - + - + - - + + - + + + + + + + + + \ No newline at end of file diff --git a/cli/dll/pom.xml b/cli/dll/pom.xml index 38005a74d9..fcd9f978d5 100644 --- a/cli/dll/pom.xml +++ b/cli/dll/pom.xml @@ -70,8 +70,8 @@ - dll - ${project.build.directory}/net8.0/Cyberduck.Cli.dll + nupkg + ${project.build.directory}/Cyberduck.Cli.${project.version}.nupkg @@ -90,29 +90,19 @@ ch.cyberduck Cyberduck.Core - net8.0 - dll - ${project.version} - - - ch.cyberduck - Cyberduck.Core.Native - net8.0 - dll + nupkg ${project.version} ch.cyberduck Cyberduck.Protocols - net8.0 - dll + nupkg ${project.version} ch.cyberduck Cyberduck.Cryptomator - net8.0 - dll + nupkg ${project.version} diff --git a/cli/src/main/csharp/Properties/PublishProfiles/win-arm64.pubxml b/cli/src/main/csharp/Properties/PublishProfiles/win-arm64.pubxml new file mode 100644 index 0000000000..b7028ce11a --- /dev/null +++ b/cli/src/main/csharp/Properties/PublishProfiles/win-arm64.pubxml @@ -0,0 +1,7 @@ + + + + win-arm64 + true + + \ No newline at end of file diff --git a/cli/src/main/csharp/Properties/PublishProfiles/win-x64.pubxml b/cli/src/main/csharp/Properties/PublishProfiles/win-x64.pubxml new file mode 100644 index 0000000000..3bab3131c9 --- /dev/null +++ b/cli/src/main/csharp/Properties/PublishProfiles/win-x64.pubxml @@ -0,0 +1,7 @@ + + + + win-x64 + true + + \ No newline at end of file diff --git a/cli/src/main/csharp/duck.csproj b/cli/src/main/csharp/duck.csproj index 2faeebc208..5f4c2c8997 100644 --- a/cli/src/main/csharp/duck.csproj +++ b/cli/src/main/csharp/duck.csproj @@ -5,7 +5,7 @@ net8.0-windows10.0.22621.0 win-x64;win-arm64 x64;arm64 - true + win-$(Platform) @@ -13,18 +13,9 @@ - - $(Filename)$(Extension) - PreserveNewest - - - $(Filename)$(Extension) - PreserveNewest - - - PreserveNewest - $(Filename)$(Extension) - + + + bookmarks/%(Filename)%(Extension) @@ -40,9 +31,4 @@ - - - - - - \ No newline at end of file + diff --git a/cli/src/main/wix/Bootstrapper/Cyberduck CLI Bundle.wxs b/cli/src/main/wix/Bootstrapper/Cyberduck CLI Bundle.wxs index a82786ba8a..2c445637ad 100644 --- a/cli/src/main/wix/Bootstrapper/Cyberduck CLI Bundle.wxs +++ b/cli/src/main/wix/Bootstrapper/Cyberduck CLI Bundle.wxs @@ -1,29 +1,15 @@ - + + + + + + + - - - - - - - - - - - - = v10.0 AND CBNumber >= 14393]]> - + - - - + diff --git a/cli/src/main/wix/Bootstrapper/duck.bootstrapper.wixproj b/cli/src/main/wix/Bootstrapper/duck.bootstrapper.wixproj index 0518575c02..8dffba8052 100644 --- a/cli/src/main/wix/Bootstrapper/duck.bootstrapper.wixproj +++ b/cli/src/main/wix/Bootstrapper/duck.bootstrapper.wixproj @@ -1,74 +1,15 @@ - - - + - 3.14 - ef87de0e-bc36-4d3c-8852-c8ad11d01f04 - 2.0 - duck-$(Version) + duck-$(FileVersion)-$(Platform) + x64;arm64 Bundle CyberduckDir=$(CyberduckDir);SetupDir=$(SetupDir) - - false - Debug;$(DefineConstants) - - - true - - + + - - - - - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - $(WixExtDir)\WixBalExtension.dll - WixBalExtension - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - + - - - - - - $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0@InstallationFolder) - $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots@KitsRoot10) - $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)bin\ - $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion).0\ - $(Win10SDKBinPath)$(Win10SDKVersion) - - - - - $(FrameworkSdkPath)bin\signtool.exe - $(WinSDK)\bin\x86\signtool.exe - $(Win10SDKVerBinPath)x86\signtool.exe - - - - - - - - - \ No newline at end of file diff --git a/cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs b/cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs index 6f714a77d5..2b11b91341 100644 --- a/cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs +++ b/cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs @@ -1,14 +1,14 @@ - + - duck-$(Version) + duck-$(FileVersion)-$(Platform) x64;arm64 + + ProductVersion=$(FileVersion) + + + + false + + + true - - - - diff --git a/cli/src/main/wix/Directory.Build.props b/cli/src/main/wix/Directory.Build.props index dd4d65e229..41cf1d2014 100644 --- a/cli/src/main/wix/Directory.Build.props +++ b/cli/src/main/wix/Directory.Build.props @@ -15,14 +15,14 @@ - - <_CliBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/ - - + + <_CliBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/ + + - - $(OutputPath)$(Configuration) - $(CyberduckDir)setup\wix\ - + + $(BaseOutputPath)$(Configuration)\ + $(CyberduckDir)setup\wix\ + - + \ No newline at end of file diff --git a/cli/windows/Directory.Build.props b/cli/windows/Directory.Build.props index 345496fbdd..446ced77aa 100644 --- a/cli/windows/Directory.Build.props +++ b/cli/windows/Directory.Build.props @@ -17,7 +17,6 @@ $(MSBuildThisFileDirectory) - false diff --git a/cli/windows/build.xml b/cli/windows/build.xml index 294b61d3c3..8c2d98d1fc 100644 --- a/cli/windows/build.xml +++ b/cli/windows/build.xml @@ -23,7 +23,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -40,19 +40,12 @@ - - - - - - - + + - - diff --git a/cli/windows/build.proj b/cli/windows/dirs.proj similarity index 63% rename from cli/windows/build.proj rename to cli/windows/dirs.proj index 9d4e4035e5..c498d1a49d 100644 --- a/cli/windows/build.proj +++ b/cli/windows/dirs.proj @@ -2,10 +2,12 @@ + - + + diff --git a/cli/windows/pom.xml b/cli/windows/pom.xml index 5f569fb84d..4b0bbe4830 100644 --- a/cli/windows/pom.xml +++ b/cli/windows/pom.xml @@ -72,6 +72,10 @@ + + pack-nupkg + none + @@ -83,39 +87,35 @@ ch.cyberduck Cyberduck.Core - net8.0 - dll + nupkg ${project.version} ch.cyberduck Cyberduck.Core.Native - net8.0 - dll + nupkg ${project.version} runtime ch.cyberduck Cyberduck.Protocols - net8.0 - dll + nupkg ${project.version} ch.cyberduck Cyberduck.Cryptomator - net8.0 - dll + nupkg ${project.version} ch.cyberduck Cyberduck.Cli - dll + nupkg ${project.version} - + \ No newline at end of file diff --git a/core/dll/Cyberduck.Core.msbuildproj b/core/dll/Cyberduck.Core.ikvmproj similarity index 82% rename from core/dll/Cyberduck.Core.msbuildproj rename to core/dll/Cyberduck.Core.ikvmproj index 39d59a7e8f..9a5bcebf58 100644 --- a/core/dll/Cyberduck.Core.msbuildproj +++ b/core/dll/Cyberduck.Core.ikvmproj @@ -4,8 +4,6 @@ net472;net8.0 - - diff --git a/core/dll/Directory.Build.props b/core/dll/Directory.Build.props index 415d5cdf9b..0857403257 100644 --- a/core/dll/Directory.Build.props +++ b/core/dll/Directory.Build.props @@ -15,10 +15,10 @@ - - $(MSBuildThisFileDirectory) - + + $(MSBuildThisFileDirectory) + - + - + \ No newline at end of file diff --git a/core/dll/build.xml b/core/dll/build.xml index c49487124e..3d0f208acb 100644 --- a/core/dll/build.xml +++ b/core/dll/build.xml @@ -24,13 +24,21 @@ - + - - + + + + + + + + + + diff --git a/core/dll/pom.xml b/core/dll/pom.xml index 789b49dcfd..8df60430c3 100644 --- a/core/dll/pom.xml +++ b/core/dll/pom.xml @@ -50,22 +50,16 @@ build-helper-maven-plugin - install-dll - verify + install-nupkg + package attach-artifact - net472 - dll - ${project.build.directory}/net472/Cyberduck.Core.dll - - - net8.0 - dll - ${project.build.directory}/net8.0/Cyberduck.Core.dll + nupkg + ${project.build.directory}/Cyberduck.Core.${project.version}.nupkg @@ -102,6 +96,14 @@ ${jna-version} runtime + + net.java.dev.jna + jnidispatch + aarch64 + dll + ${jna-version} + runtime + diff --git a/core/i18n-gen/i18n-gen.targets b/core/i18n-gen/i18n-gen.targets index ff9b37d2bf..a3065ae2df 100644 --- a/core/i18n-gen/i18n-gen.targets +++ b/core/i18n-gen/i18n-gen.targets @@ -4,15 +4,16 @@ + AssemblyFile="$(i18n_gen_dll)" + TaskFactory="TaskHostFactory" /> + AssemblyFile="$(i18n_gen_dll)" + TaskFactory="TaskHostFactory" /> + OutputItemType="Analyzer" + ReferenceOutputAssembly="False" + SetPlatform="Platform=" /> - + \ No newline at end of file diff --git a/core/native/Directory.Build.props b/core/native/Directory.Build.props index 415d5cdf9b..0857403257 100644 --- a/core/native/Directory.Build.props +++ b/core/native/Directory.Build.props @@ -15,10 +15,10 @@ - - $(MSBuildThisFileDirectory) - + + $(MSBuildThisFileDirectory) + - + - + \ No newline at end of file diff --git a/core/native/build.xml b/core/native/build.xml index 914ac71531..b216c68a96 100644 --- a/core/native/build.xml +++ b/core/native/build.xml @@ -21,27 +21,33 @@ --> - + - - + + - - + + + + + + + + - + - + \ No newline at end of file diff --git a/core/native/build.proj b/core/native/dirs.proj similarity index 74% rename from core/native/build.proj rename to core/native/dirs.proj index 0f8972db81..9ee449db01 100644 --- a/core/native/build.proj +++ b/core/native/dirs.proj @@ -2,6 +2,7 @@ + - + \ No newline at end of file diff --git a/core/native/pom.xml b/core/native/pom.xml index 2f6e453318..5cb612c9f4 100644 --- a/core/native/pom.xml +++ b/core/native/pom.xml @@ -32,7 +32,7 @@ build-helper-maven-plugin - install-dll + install-nupkg package attach-artifact @@ -40,14 +40,8 @@ - net472 - 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 + nupkg + ${project.build.directory}/Cyberduck.Core.Native.${project.version}.nupkg @@ -83,15 +77,7 @@ ch.cyberduck Cyberduck.Core - net472 - dll - ${project.version} - - - ch.cyberduck - Cyberduck.Core - net8.0 - dll + nupkg ${project.version} @@ -108,4 +94,4 @@ test - + \ No newline at end of file diff --git a/core/native/refresh/Directory.Build.props b/core/native/refresh/Directory.Build.props index 415d5cdf9b..05a101d4b8 100644 --- a/core/native/refresh/Directory.Build.props +++ b/core/native/refresh/Directory.Build.props @@ -15,10 +15,11 @@ - - $(MSBuildThisFileDirectory) - + + Cyberduck.Core.Refresh + $(MSBuildThisFileDirectory) + - + - + \ No newline at end of file diff --git a/core/native/refresh/build.xml b/core/native/refresh/build.xml index 90d718df51..8e018ae69c 100644 --- a/core/native/refresh/build.xml +++ b/core/native/refresh/build.xml @@ -24,18 +24,24 @@ - + - + - + + + + + + + diff --git a/core/native/refresh/dirs.proj b/core/native/refresh/dirs.proj new file mode 100644 index 0000000000..1498044290 --- /dev/null +++ b/core/native/refresh/dirs.proj @@ -0,0 +1,6 @@ + + + + + + diff --git a/core/native/refresh/pom.xml b/core/native/refresh/pom.xml index 9228acedf7..26a47b8d7d 100644 --- a/core/native/refresh/pom.xml +++ b/core/native/refresh/pom.xml @@ -28,7 +28,7 @@ build-helper-maven-plugin - install-dll + install-nupkg package attach-artifact @@ -36,14 +36,8 @@ - net472 - 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 + nupkg + ${project.build.directory}/Cyberduck.Core.Refresh.${project.version}.nupkg @@ -59,15 +53,7 @@ ch.cyberduck Cyberduck.Core.Native - net472 - dll - ${project.version} - - - ch.cyberduck - Cyberduck.Core.Native - net8.0 - dll + nupkg ${project.version} 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 b2429b5cd3..f9afe52990 100644 --- a/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj +++ b/core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj @@ -18,7 +18,7 @@ net472;net8.0-windows10.0.22621.0 10.0.14393.0 - x64 + x64;arm64 12.0 true true @@ -31,7 +31,6 @@ - all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/core/native/refresh/src/main/nuget/Cyberduck.Core.Refresh.nuspec b/core/native/refresh/src/main/nuget/Cyberduck.Core.Refresh.nuspec new file mode 100644 index 0000000000..7c5e02ba93 --- /dev/null +++ b/core/native/refresh/src/main/nuget/Cyberduck.Core.Refresh.nuspec @@ -0,0 +1,34 @@ + + + + $id$ + $version$ + $description$ + $authors$ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/native/refresh/src/main/nuget/build/net8.0-windows10.0.22621.0/Cyberduck.Core.Refresh.targets b/core/native/refresh/src/main/nuget/build/net8.0-windows10.0.22621.0/Cyberduck.Core.Refresh.targets new file mode 100644 index 0000000000..a6c412e656 --- /dev/null +++ b/core/native/refresh/src/main/nuget/build/net8.0-windows10.0.22621.0/Cyberduck.Core.Refresh.targets @@ -0,0 +1,7 @@ + + + + $(MSBuildThisFileDirectory)../../lib/net8.0-windows10.0.22621.0/win-$(Platform)/Cyberduck.Core.Refresh.dll + + + \ No newline at end of file diff --git a/core/native/refresh/src/main/nuget/nuget.proj b/core/native/refresh/src/main/nuget/nuget.proj new file mode 100644 index 0000000000..b67ea958fc --- /dev/null +++ b/core/native/refresh/src/main/nuget/nuget.proj @@ -0,0 +1,8 @@ + + + netstandard2.0 + true + false + Cyberduck.Core.Refresh.nuspec + + diff --git a/core/native/src/main/Cyberduck.Core.Native.nuspec b/core/native/src/main/Cyberduck.Core.Native.nuspec new file mode 100644 index 0000000000..0a672abe1e --- /dev/null +++ b/core/native/src/main/Cyberduck.Core.Native.nuspec @@ -0,0 +1,34 @@ + + + + $id$ + $version$ + $description$ + $authors$ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/native/src/main/Directory.Build.props b/core/native/src/main/Directory.Build.props new file mode 100644 index 0000000000..f09eb05b70 --- /dev/null +++ b/core/native/src/main/Directory.Build.props @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/core/native/src/main/build/net8.0-windows10.0.22621.0/Cyberduck.Core.Native.targets b/core/native/src/main/build/net8.0-windows10.0.22621.0/Cyberduck.Core.Native.targets new file mode 100644 index 0000000000..bc0498253e --- /dev/null +++ b/core/native/src/main/build/net8.0-windows10.0.22621.0/Cyberduck.Core.Native.targets @@ -0,0 +1,7 @@ + + + + $(MSBuildThisFileDirectory)../../lib/net8.0-windows10.0.22621.0/win-$(Platform)/Cyberduck.Core.Native.dll + + + \ No newline at end of file diff --git a/core/native/src/main/nuget.proj b/core/native/src/main/nuget.proj new file mode 100644 index 0000000000..6b158b5b19 --- /dev/null +++ b/core/native/src/main/nuget.proj @@ -0,0 +1,8 @@ + + + netstandard2.0 + true + false + Cyberduck.Core.Native.nuspec + + diff --git a/core/src/main/csharp/Cyberduck.Core.Native.csproj b/core/src/main/csharp/Cyberduck.Core.Native.csproj index d8948205cd..0b2aa81ced 100644 --- a/core/src/main/csharp/Cyberduck.Core.Native.csproj +++ b/core/src/main/csharp/Cyberduck.Core.Native.csproj @@ -15,10 +15,16 @@ - - net472;net8.0-windows10.0.22621.0 - 10.0.14393.0 + + net472 + + x64 + + + net472;net8.0-windows10.0.22621.0 + x64;arm64 + 10.0.14393.0 true @@ -27,7 +33,6 @@ - all diff --git a/core/src/main/csharp/Directory.Build.props b/core/src/main/csharp/Directory.Build.props index 4a975e0eeb..64e75b0a91 100644 --- a/core/src/main/csharp/Directory.Build.props +++ b/core/src/main/csharp/Directory.Build.props @@ -16,9 +16,10 @@ + Cyberduck.Core.Native <_CoreBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/ - - + + \ No newline at end of file diff --git a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj b/cryptomator/dll/Cyberduck.Cryptomator.ikvmproj similarity index 83% rename from cryptomator/dll/Cyberduck.Cryptomator.msbuildproj rename to cryptomator/dll/Cyberduck.Cryptomator.ikvmproj index 8622a7d14b..9ed7fe53f7 100644 --- a/cryptomator/dll/Cyberduck.Cryptomator.msbuildproj +++ b/cryptomator/dll/Cyberduck.Cryptomator.ikvmproj @@ -1,16 +1,12 @@ - net472;net8.0 - - - \ No newline at end of file diff --git a/cryptomator/dll/build.xml b/cryptomator/dll/build.xml index f5d9e5435c..da5be489dd 100644 --- a/cryptomator/dll/build.xml +++ b/cryptomator/dll/build.xml @@ -15,18 +15,26 @@ --> - + - + - - + + - + + + + + + + + + \ No newline at end of file diff --git a/cryptomator/dll/pom.xml b/cryptomator/dll/pom.xml index 7744f72686..11b2d6059b 100644 --- a/cryptomator/dll/pom.xml +++ b/cryptomator/dll/pom.xml @@ -62,7 +62,7 @@ build-helper-maven-plugin - install-dll + install-nupkg verify attach-artifact @@ -70,14 +70,8 @@ - net472 - dll - ${project.build.directory}/net472/Cyberduck.Cryptomator.dll - - - net8.0 - dll - ${project.build.directory}/net8.0/Cyberduck.Cryptomator.dll + nupkg + ${project.build.directory}/Cyberduck.Cryptomator.${project.version}.nupkg @@ -96,15 +90,7 @@ ch.cyberduck Cyberduck.Core - net472 - dll - ${project.version} - - - ch.cyberduck - Cyberduck.Core - net8.0 - dll + nupkg ${project.version} diff --git a/protocols/dll/Cyberduck.Protocols.msbuildproj b/importer/dll/Cyberduck.Importer.ikvmproj similarity index 83% rename from protocols/dll/Cyberduck.Protocols.msbuildproj rename to importer/dll/Cyberduck.Importer.ikvmproj index 8622a7d14b..9ed7fe53f7 100644 --- a/protocols/dll/Cyberduck.Protocols.msbuildproj +++ b/importer/dll/Cyberduck.Importer.ikvmproj @@ -1,16 +1,12 @@ - net472;net8.0 - - - \ No newline at end of file diff --git a/importer/dll/build.xml b/importer/dll/build.xml index 547ea69d8d..2a10835591 100644 --- a/importer/dll/build.xml +++ b/importer/dll/build.xml @@ -24,13 +24,21 @@ - + - - + + + + + + + + + + diff --git a/importer/dll/pom.xml b/importer/dll/pom.xml index 46f30b6610..25b3655a1e 100644 --- a/importer/dll/pom.xml +++ b/importer/dll/pom.xml @@ -47,7 +47,7 @@ build-helper-maven-plugin - install-dll + install-nupkg verify attach-artifact @@ -55,14 +55,8 @@ - net472 - dll - ${project.build.directory}/net472/Cyberduck.Importer.dll - - - net8.0 - dll - ${project.build.directory}/net8.0/Cyberduck.Importer.dll + nupkg + ${project.build.directory}/Cyberduck.Importer.${project.version}.nupkg @@ -81,15 +75,7 @@ ch.cyberduck Cyberduck.Core - net472 - dll - ${project.version} - - - ch.cyberduck - Cyberduck.Core - net8.0 - dll + nupkg ${project.version} diff --git a/pom.xml b/pom.xml index fc309eab5d..f9590696aa 100644 --- a/pom.xml +++ b/pom.xml @@ -623,35 +623,35 @@ ${project.build.directory}/lib - net472,net8.0 + net472,net8.0,net8.0-x64,net8.0-arm64,aarch64,x86_64 dll true true - copy-dependencies-dll-net472-target + copy-dependencies-dll-x64-target generate-sources copy-dependencies - ${project.build.directory}/lib/net472 - net472 + ${project.build.directory}/lib/x64 + x86_64 dll true true - copy-dependencies-dll-net8.0-target + copy-dependencies-dll-arm64-target generate-sources copy-dependencies - ${project.build.directory}/lib/net8.0 - net8.0 + ${project.build.directory}/lib/arm64 + aarch64 dll true true @@ -1052,6 +1052,19 @@ maven-dependency-plugin + + generate-nupkgs + generate-sources + + copy-dependencies + collect + + + nupkg + ${project.build.directory}/.nuget/packages.list + ${project.build.directory}/.nuget/cache + + copy-dependencies-jar-target @@ -1062,9 +1075,57 @@ + + maven-antrun-plugin + + + unpack-nupkg + process-sources + + run + + + + + + + + + + run-msbuild-props-target + generate-sources + + run + + + + + + + + + + + + + + pack-nupkg + package + + run + + + + + + + + + + - \ No newline at end of file + diff --git a/importer/dll/Cyberduck.Importer.msbuildproj b/protocols/dll/Cyberduck.Protocols.ikvmproj similarity index 80% rename from importer/dll/Cyberduck.Importer.msbuildproj rename to protocols/dll/Cyberduck.Protocols.ikvmproj index 8622a7d14b..5ad594aa05 100644 --- a/importer/dll/Cyberduck.Importer.msbuildproj +++ b/protocols/dll/Cyberduck.Protocols.ikvmproj @@ -1,16 +1,12 @@ - net472;net8.0 - - - - \ No newline at end of file + diff --git a/protocols/dll/build.xml b/protocols/dll/build.xml index 296b9012ad..4cdf34143f 100644 --- a/protocols/dll/build.xml +++ b/protocols/dll/build.xml @@ -21,17 +21,25 @@ --> - + - + - - + + - + + + + + + + + + \ No newline at end of file diff --git a/protocols/dll/pom.xml b/protocols/dll/pom.xml index eabec321f9..52c4948ccf 100644 --- a/protocols/dll/pom.xml +++ b/protocols/dll/pom.xml @@ -47,7 +47,7 @@ build-helper-maven-plugin - install-dll + install-nupkg verify attach-artifact @@ -55,14 +55,8 @@ - net472 - dll - ${project.build.directory}/net472/Cyberduck.Protocols.dll - - - net8.0 - dll - ${project.build.directory}/net8.0/Cyberduck.Protocols.dll + nupkg + ${project.build.directory}/Cyberduck.Protocols.${project.version}.nupkg @@ -81,15 +75,7 @@ ch.cyberduck Cyberduck.Core - net472 - dll - ${project.version} - - - ch.cyberduck - Cyberduck.Core - net8.0 - dll + nupkg ${project.version} diff --git a/src/main/msbuild/Cyberduck.Common.props b/src/main/msbuild/Cyberduck.Common.props index e9ebf0061f..f76a2640bf 100644 --- a/src/main/msbuild/Cyberduck.Common.props +++ b/src/main/msbuild/Cyberduck.Common.props @@ -13,23 +13,34 @@ false $(TargetBuildDir) - $(ArtifactsPath)obj\$(projectName)\ + $(ArtifactsPath)obj\$(MSBuildProjectName)\ $(ArtifactsPath) false 12 + $(TargetBuildDir).nuget\packages\;$(RestoreAdditionalProjectFallbackFolders) + + - - false diff --git a/src/main/msbuild/Cyberduck.Common.targets b/src/main/msbuild/Cyberduck.Common.targets index 62ecf99f2f..6702cc8776 100644 --- a/src/main/msbuild/Cyberduck.Common.targets +++ b/src/main/msbuild/Cyberduck.Common.targets @@ -18,4 +18,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.References.props b/src/main/msbuild/Cyberduck.References.props index 83c7da8e29..d4ca367ce9 100644 --- a/src/main/msbuild/Cyberduck.References.props +++ b/src/main/msbuild/Cyberduck.References.props @@ -2,16 +2,16 @@ - $(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.proj + $(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.ikvmproj $(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj - $(CyberduckDir)cli\dll\Cyberduck.Cli.proj + $(CyberduckDir)cli\dll\Cyberduck.Cli.ikvmproj - $(CyberduckDir)core\dll\Cyberduck.Core.proj + $(CyberduckDir)core\dll\Cyberduck.Core.ikvmproj $(CyberduckDir)core\src\main\csharp\Cyberduck.Core.Native.csproj @@ -20,22 +20,33 @@ $(CyberduckDir)core\native\refresh\src\main\csharp\Cyberduck.Core.Refresh.csproj - $(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.proj + $(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.ikvmproj - $(CyberduckDir)importer\dll\Cyberduck.Importer.proj + $(CyberduckDir)importer\dll\Cyberduck.Importer.ikvmproj - $(CyberduckDir)protocols\dll\Cyberduck.Protocols.proj + $(CyberduckDir)protocols\dll\Cyberduck.Protocols.ikvmproj - - - - Cyberduck.%(Identity) - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.wxs.props b/src/main/msbuild/Cyberduck.wxs.props deleted file mode 100644 index e5c4f6cf7a..0000000000 --- a/src/main/msbuild/Cyberduck.wxs.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/msbuild/Cyberduck.wxs.targets b/src/main/msbuild/Cyberduck.wxs.targets index 165ee016f2..df44acd565 100644 --- a/src/main/msbuild/Cyberduck.wxs.targets +++ b/src/main/msbuild/Cyberduck.wxs.targets @@ -1,5 +1,7 @@ + + diff --git a/windows/Directory.Build.props b/windows/Directory.Build.props index 423651ecc5..a358691050 100644 --- a/windows/Directory.Build.props +++ b/windows/Directory.Build.props @@ -17,7 +17,6 @@ $(MSBuildThisFileDirectory) - false diff --git a/windows/build.xml b/windows/build.xml index 170392f0ee..2184cdc27f 100755 --- a/windows/build.xml +++ b/windows/build.xml @@ -30,13 +30,13 @@ - + - + @@ -74,12 +74,11 @@ - + - diff --git a/windows/build.proj b/windows/dirs.proj similarity index 100% rename from windows/build.proj rename to windows/dirs.proj