GitHub/cyberduck
1
0
Fork 0
mirror of https://github.com/iterate-ch/cyberduck.git synced 2026-05-26 19:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Package NuGet

Browse Source
This commit is contained in:
AliveDevil
2025-03-10 14:33:37 +01:00
parent c12d6076f4
commit 537dcce1fb
73 changed files with 575 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cyberduck.sln
+10 -10
View File
@@ -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
Directory.Build.Java.props
-22
View File
@@ -1,22 +0,0 @@
<Project>
<PropertyGroup Label="IKVM">
<ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
<EnableDefaultItems>false</EnableDefaultItems>
<LangVersion>1.8</LangVersion>
</PropertyGroup>
<PropertyGroup Label="MSBuild">
<!--
Skip expected diagnostics.
Catch authoring/dependency issues in automated Tests.
IKVM0100: Class Not Found
IKVM0101: Class Format Error (not Java 8)
IKVM0105: Missing Class
IKVM0111: Emitted NoClassDefFoundError
-->
<NoWarn>IKVM0100;IKVM0101;IKVM0105;IKVM0111;$(NoWarn)</NoWarn>
</PropertyGroup>
</Project>
Directory.Build.props
+2 -29
View File
@@ -16,38 +16,11 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="AssemblyInfo">
<Company>iterate GmbH</Company>
<Description>Libre FTP, SFTP, WebDAV, S3 and OpenStack Swift browser for Mac and Windows.</Description>
</PropertyGroup>
<PropertyGroup>
<CyberduckDir>$(MSBuildThisFileDirectory)</CyberduckDir>
<BuildSupportDir>$(CyberduckDir)src\main\msbuild\</BuildSupportDir>
<TargetBuildDir>$(ModulePath)target\</TargetBuildDir>
<LibDir>$(TargetBuildDir)lib\</LibDir>
<GeneratedMSBuildDir>$(TargetBuildDir)generated\msbuild\</GeneratedMSBuildDir>
<ArtifactsPath>$(TargetBuildDir)</ArtifactsPath>
<UseArtifactsOutput>false</UseArtifactsOutput>
<BaseIntermediateOutputPath>$(ArtifactsPath)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
<BaseOutputPath>$(ArtifactsPath)</BaseOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
<OutputPath>$(BaseOutputPath)</OutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<LangVersion>12</LangVersion>
<BuildProjectReferences Condition=" '$(BuildProjectReferences)'=='' And '$(BuildingInsideVisualStudio)'!='True' ">false</BuildProjectReferences>
</PropertyGroup>
<ItemDefinitionGroup>
<CyberduckReference>
<ProjectPath />
</CyberduckReference>
</ItemDefinitionGroup>
<Import Project="$(GeneratedMSBuildDir)Version.props" Condition="Exists('$(GeneratedMSBuildDir)Version.props')" />
<Import Project="$(BuildSupportDir)Cyberduck.Default.props" />
</Project>
</Project>
Directory.Build.targets
+1 -79
View File
@@ -16,84 +16,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.41" />
<PropertyGroup>
<AssemblySearchPaths>$(LibDir);$(AssemblySearchPaths)</AssemblySearchPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' != '' ">
<LibDirFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net472'))">net472</LibDirFramework>
<LibDirFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">net8.0</LibDirFramework>
<AssemblySearchPaths Condition=" '$(LibDirFramework)' != '' ">$(LibDir)$(LibDirFramework)\;$(AssemblySearchPaths)</AssemblySearchPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' != 'net472' ">
<DefaultItemExcludes>$(DefaultItemExcludes);**/*net472*</DefaultItemExcludes>
</PropertyGroup>
<PropertyGroup Condition=" !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
<DefaultItemExcludes>$(DefaultItemExcludes);**/*net8.0*</DefaultItemExcludes>
</PropertyGroup>
<ItemGroup>
<CyberduckReference Update="Bonjour">
<ProjectPath>$(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Bonjour.Native">
<ProjectPath>$(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Cli">
<ProjectPath>$(CyberduckDir)cli\dll\Cyberduck.Cli.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Core">
<ProjectPath>$(CyberduckDir)core\dll\Cyberduck.Core.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Core.Native">
<ProjectPath>$(CyberduckDir)core\src\main\csharp\Cyberduck.Core.Native.csproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Core.Refresh">
<ProjectPath>$(CyberduckDir)core\native\refresh\src\main\csharp\Cyberduck.Core.Refresh.csproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Cryptomator">
<ProjectPath>$(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Importer">
<ProjectPath>$(CyberduckDir)importer\dll\Cyberduck.Importer.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Protocols">
<ProjectPath>$(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckProjectReference Include="@(CyberduckReference->HasMetadata('ProjectPath'))" Condition=" '$(BuildingInsideVisualStudio)'=='true' Or '$(BuildProjectReferences)'!='false' " />
<CyberduckAssemblyReference Include="@(CyberduckReference)" Exclude="@(CyberduckProjectReference)" />
<ProjectReference Include="@(CyberduckProjectReference->'%(ProjectPath)')">
<Name>Cyberduck.%(Identity)</Name>
</ProjectReference>
<Reference Include="@(CyberduckAssemblyReference->'Cyberduck.%(Identity)')">
<JavaClasspath>\\?\</JavaClasspath>
</Reference>
</ItemGroup>
<PropertyGroup>
<!-- Fix .NET 8 Sdk RuntimeIdentifiers to align with .NET 9 Sdk -->
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='win7-x86'">win-x86</RuntimeIdentifier>
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='win7-x64'">win-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition=" '$(NETCoreSdkVersion)'!='' ">
<!-- Treat SDK 6.0.301 as last known to work. -->
<NETSDKBeforeFeature>$([MSBuild]::VersionLessThanOrEquals('$(NETCoreSdkVersion)', '6.0.301'))</NETSDKBeforeFeature>
<NETSDKAfterFix>$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '6.0.401'))</NETSDKAfterFix>
<CoreCompileDependsOn Condition="!($(NETSDKBeforeFeature) or $(NETSDKAfterFix))">SDKFix_RemoveDuplicateAnalyzers;$(CoreCompileDependsOn)</CoreCompileDependsOn>
</PropertyGroup>
<Target Name="SDKFix_RemoveDuplicateAnalyzers">
<ItemGroup>
<FilteredAnalyzer Include="@(Analyzer-&gt;Distinct())" />
<Analyzer Remove="@(Analyzer)" />
<Analyzer Include="@(FilteredAnalyzer)" />
<FilteredAnalyzer Remove="@(FilteredAnalyzer)" />
</ItemGroup>
</Target>
<Import Project="$(BuildSupportDir)Cyberduck.Default.targets" />
</Project>
Directory.Packages.props
+1 -1
View File
@@ -50,6 +50,6 @@
</ItemGroup>
<PropertyGroup>
<PackageVersions>@(PackageVersion->'%(Identity)'->Replace('.', '')->'Pkg%(Identity)Version=%(Version)')</PackageVersions>
<PackageVersions>@(PackageVersion->'%(Identity)'->Replace('.', '_')->'Pkg%(Identity)Version=%(Version)')</PackageVersions>
</PropertyGroup>
</Project>
bonjour/dll/Cyberduck.Bonjour.msbuildproj → bonjour/dll/Cyberduck.Bonjour.ikvmproj
-4
View File
@@ -1,5 +1,4 @@
<Project Sdk="IKVM.NET.Sdk">
<PropertyGroup>
<!--
Only really used in Cyberduck.
@@ -7,13 +6,10 @@
<TargetFramework>net472</TargetFramework>
</PropertyGroup>
<Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
<ItemGroup>
<CyberduckReference Include="Core" />
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
<Convert Include="$(TargetBuildDir)*.jar" />
</ItemGroup>
</Project>
bonjour/dll/build.xml
+13 -5
View File
@@ -21,18 +21,26 @@
-->
<project name="Cyberduck Native Libraries" basedir=".">
<import file="../../build.xml"/>
<import file="../../build.xml" />
<target name="restore" depends="msbuild">
<msbuild buildfile="Cyberduck.Bonjour.msbuildproj">
<msbuild buildfile="Cyberduck.Bonjour.ikvmproj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" if="platform.windows" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Bonjour.msbuildproj">
<target name="build" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Bonjour.ikvmproj">
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
<target name="pack" depends="msbuild">
<msbuild buildfile="Cyberduck.Bonjour.ikvmproj">
<target name="Pack" />
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
bonjour/dll/pom.xml
+5 -7
View File
@@ -50,17 +50,16 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>install-dll</id>
<phase>verify</phase>
<id>install-nupkg</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<classifier>net472</classifier>
<type>dll</type>
<file>${project.build.directory}/net472/Cyberduck.Bonjour.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Bonjour.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -76,9 +75,8 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net472</classifier>
<type>nupkg</type>
<version>${project.version}</version>
<type>dll</type>
</dependency>
</dependencies>
</profile>
bonjour/native/Directory.Build.props
+6 -5
View File
@@ -15,10 +15,11 @@
<Project>
<PropertyGroup>
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Cyberduck.Bonjour.Native</AssemblyName>
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="../Directory.Build.props" />
<Import Project="../Directory.Build.props" />
</Project>
</Project>
bonjour/native/build.xml
+9
View File
@@ -37,4 +37,13 @@
<property name="Configuration" value="${msbuild.configuration}"/>
</msbuild>
</target>
<target name="pack" depends="msbuild">
<!-- Create DLL Cyberduck.Bonjour.Native -->
<msbuild buildfile="src/main/nuget/nuget.proj">
<target name="Restore;Pack"/>
<property name="Configuration" value="${msbuild.configuration}"/>
</msbuild>
</target>
</project>
bonjour/native/pom.xml
+4 -6
View File
@@ -28,7 +28,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>install-dll</id>
<id>install-nupkg</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
@@ -36,9 +36,8 @@
<configuration>
<artifacts>
<artifact>
<classifier>net472</classifier>
<type>dll</type>
<file>${project.build.directory}/net472/Cyberduck.Bonjour.Native.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Bonjour.Native.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -54,8 +53,7 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Bonjour</artifactId>
<classifier>net472</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
</dependencies>
bonjour/native/src/main/nuget/Cyberduck.Bonjour.Native.nuspec
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>$id$</id>
<version>$version$</version>
<description>$description$</description>
<authors>$authors$</authors>
<dependencies>
<group targetFramework="net472">
<dependency id="Cyberduck.Bonjour" version="$version$" />
<dependency id="Microsoft.CSharp" version="$PkgMicrosoft_CSharpVersion$" />
</group>
</dependencies>
</metadata>
<files>
<file src="$buildDir$net472/Cyberduck.Bonjour.Native.dll" target="lib/net472" />
</files>
</package>
bonjour/native/src/main/nuget/nuget.proj
+9
View File
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.Net.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NuspecFile>Cyberduck.Bonjour.Native.nuspec</NuspecFile>
</PropertyGroup>
</Project>
bonjour/src/main/csharp/Directory.Build.props → bonjour/src/main/Directory.Build.props
View File
bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj
-1
View File
@@ -13,7 +13,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="IKVM" />
<PackageReference Include="Microsoft.CSharp" />
</ItemGroup>
bonjour/src/main/csharp/nuget.proj
+8
View File
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.Net.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NuspecFile>Cyberduck.Core.Native.nuspec</NuspecFile>
</PropertyGroup>
</Project>
build.xml
+18 -7
View File
@@ -127,23 +127,34 @@
</tstamp>
</target>
<target name="msbuild" depends="version">
<!--
Windows
-->
<target name="msbuild">
<taskdef name="msbuild" classname="org.apache.ant.dotnet.build.MSBuildTask">
<classpath path="${lib.ext}/ant-dotnet-1.1.jar"/>
<classpath path="${lib.ext}/ant-dotnet-1.1.jar" />
</taskdef>
<condition property="msbuild.configuration" value="Debug">
<equals arg1="${configuration}" arg2="debug"/>
<equals arg1="${configuration}" arg2="debug" />
</condition>
<property name="msbuild.configuration" value="Release"/>
<property name="msbuild.configuration" value="Release" />
</target>
<target name="msbuild-props" depends="version">
<condition property="msbuild.sign" value="false">
<isset property="skipSign"/>
</condition>
<property name="msbuild.sign" value=""/>
<copy todir="${build}/generated/msbuild" overwrite="True">
<resources>
<fileset dir="${home}/src/template/msbuild" erroronmissingdir="false"/>
<fileset dir="${module}/src/template/msbuild" erroronmissingdir="false"/>
<fileset dir="${home}/src/template/msbuild" erroronmissingdir="false" />
<fileset dir="${module}/src/template/msbuild" erroronmissingdir="false" />
</resources>
<filterchain>
<expandproperties/>
<expandproperties />
</filterchain>
</copy>
</target>
cli/dll/Cyberduck.Cli.msbuildproj → cli/dll/Cyberduck.Cli.ikvmproj
-4
View File
@@ -1,16 +1,12 @@
<Project Sdk="IKVM.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
<ItemGroup>
<CyberduckReference Include="Core;Protocols;Cryptomator" />
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
<Convert Include="$(TargetBuildDir)*.jar" />
</ItemGroup>
</Project>
cli/dll/build.xml
+13 -5
View File
@@ -16,17 +16,25 @@
-->
<project name="Cyberduck Native Libraries" basedir=".">
<import file="../../build.xml"/>
<import file="../../build.xml" />
<target name="restore" depends="msbuild">
<msbuild buildfile="Cyberduck.Cli.msbuildproj">
<msbuild buildfile="Cyberduck.Cli.ikvmproj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" if="platform.windows" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Cli.msbuildproj">
<target name="build" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Cli.ikvmproj">
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
<target name="pack" depends="msbuild">
<msbuild buildfile="Cyberduck.Cli.ikvmproj">
<target name="Pack" />
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
cli/dll/pom.xml
+5 -15
View File
@@ -70,8 +70,8 @@
<configuration>
<artifacts>
<artifact>
<type>dll</type>
<file>${project.build.directory}/net8.0/Cyberduck.Cli.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Cli.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -90,29 +90,19 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core.Native</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Protocols</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Cryptomator</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
</dependencies>
cli/src/main/csharp/Properties/PublishProfiles/win-arm64.pubxml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
</PropertyGroup>
</Project>
cli/src/main/csharp/Properties/PublishProfiles/win-x64.pubxml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
</PropertyGroup>
</Project>
cli/src/main/csharp/duck.csproj
+5 -19
View File
@@ -5,7 +5,7 @@
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
<Platforms>x64;arm64</Platforms>
<SelfContained>true</SelfContained>
<PublishProfile>win-$(Platform)</PublishProfile>
</PropertyGroup>
<ItemGroup>
@@ -13,18 +13,9 @@
</ItemGroup>
<ItemGroup>
<Content Include="$(CyberduckDir)Acknowledgments.rtf">
<Link>$(Filename)$(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(CyberduckDir)i18n/src/main/resources/en.lproj/License.txt">
<Link>$(Filename)$(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(TargetBuildDir)lib\jnidispatch.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>$(Filename)$(Extension)</Link>
</Content>
<Content Include="$(CyberduckDir)Acknowledgments.rtf" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(CyberduckDir)i18n/src/main/resources/en.lproj/License.txt" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(TargetBuildDir)lib\$(Platform)\jnidispatch.dll" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(CyberduckDir)bookmarks/*.duck">
<Link>bookmarks/%(Filename)%(Extension)</Link>
@@ -40,9 +31,4 @@
<None Include="$(CyberduckDir)App.config" Link="App.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="IKVM" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
</ItemGroup>
</Project>
</Project>
cli/src/main/wix/Bootstrapper/Cyberduck CLI Bundle.wxs
+9 -23
View File
@@ -1,29 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<Bundle Name="Cyberduck CLI" Version="!(bind.packageVersion.Setup)" Manufacturer="iterate GmbH" UpgradeCode="46C3FB4E-2B23-4728-8196-BEA25ADE868A" IconSourceFile="$(CyberduckDir)cyberduck-application.ico">
<BootstrapperApplication>
<bal:WixStandardBootstrapperApplication LicenseUrl="" LogoFile="$(SetupDir)banner.png" LogoSideFile="$(SetupDir)welcome.bmp" Theme="hyperlinkSidebarLicense" />
</BootstrapperApplication>
<Variable Name="InstallFolder" Type="formatted" Value="[ProgramFiles64Folder]Cyberduck CLI" />
<util:RegistrySearch Id="InstallFolderSearch" Root="HKLM" Key="Software\[WixBundleManufacturer]\[WixBundleName]" Value="InstallDir" Variable="InstallFolder" />
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Bundle Name="Cyberduck CLI" Version="!(bind.packageVersion.Setup)" Manufacturer="iterate GmbH"
UpgradeCode="46C3FB4E-2B23-4728-8196-BEA25ADE868A" IconSourceFile="$(var.CyberduckDir)cyberduck-application.ico">
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense">
<bal:WixStandardBootstrapperApplication LicenseUrl=""
LogoFile="$(var.SetupDir)banner.png" LogoSideFile="$(var.SetupDir)welcome.bmp" />
</BootstrapperApplicationRef>
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]Cyberduck CLI" />
<util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="Software\[WixBundleManufacturer]\[WixBundleName]" Value="InstallDir" Variable="PreviousInstallFolder" />
<util:RegistrySearch Id="CurrentBuild" Variable="CBNumber" Result="value" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber"/>
<util:DirectorySearch Path="[PreviousInstallFolder]" Variable="InstallFolder" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" />
<bal:Condition Message="Windows 10 Anniversary Update (14393) or later is required to run this application.">
<![CDATA[VersionNT >= v10.0 AND CBNumber >= 14393]]>
</bal:Condition>
<bal:Condition Message="Windows 10 Anniversary Update (14393) or later is required to run this application." Condition="WindowsBuildNumber &gt;= 14393" />
<Chain>
<PackageGroupRef Id="NetFx472Web" />
<RollbackBoundary />
<MsiPackage
Id="Setup"
Compressed="yes"
SourceFile="$(var.CLI-WiX.TargetPath)"
Vital="yes">
<MsiPackage Id="Setup" Compressed="yes" SourceFile="$(duck.bundle.TargetPath)" Vital="yes">
<MsiProperty Name="INSTALLLOCATION" Value="[InstallFolder]" />
</MsiPackage>
</Chain>
cli/src/main/wix/Bootstrapper/duck.bootstrapper.wixproj
+6 -65
View File
@@ -1,74 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" TreatAsLocalProperty="SignOutput" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)'))" />
<Project Sdk="WixToolset.Sdk">
<PropertyGroup>
<ProductVersion>3.14</ProductVersion>
<ProjectGuid>ef87de0e-bc36-4d3c-8852-c8ad11d01f04</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>duck-$(Version)</OutputName>
<OutputName>duck-$(FileVersion)-$(Platform)</OutputName>
<Platforms>x64;arm64</Platforms>
<OutputType>Bundle</OutputType>
<DefineConstants>CyberduckDir=$(CyberduckDir);SetupDir=$(SetupDir)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<SignOutput Condition=" '$(SignOutput)' == '' ">false</SignOutput>
<DefineConstants>Debug;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<SignOutput Condition=" '$(SignOutput)' == '' ">true</SignOutput>
</PropertyGroup>
<ItemGroup>
<Compile Include="Cyberduck CLI Bundle.wxs" />
<PackageReference Include="WixToolset.Bal.wixext" />
<PackageReference Include="WixToolset.Util.wixext" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
<Error Text="The WiX Toolset v3.14 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
</Target>
<ItemGroup>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
<Name>WixNetFxExtension</Name>
</WixExtension>
<WixExtension Include="WixBalExtension">
<HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
<Name>WixBalExtension</Name>
</WixExtension>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
<ProjectReference Include="../Bundle/duck.bundle.wixproj" />
</ItemGroup>
<Target Name="UsesFrameworkSdk">
<GetFrameworkSdkPath>
<Output TaskParameter="Path" PropertyName="FrameworkSdkPath" />
</GetFrameworkSdkPath>
<PropertyGroup>
<WinSDK>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0@InstallationFolder)</WinSDK>
<WinSDK Condition="('@(WinSDK)'=='')">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots@KitsRoot10)</WinSDK>
<Win10SDKBinPath>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)bin\</Win10SDKBinPath>
<Win10SDKVersion>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion).0\</Win10SDKVersion>
<Win10SDKVerBinPath>$(Win10SDKBinPath)$(Win10SDKVersion)</Win10SDKVerBinPath>
</PropertyGroup>
</Target>
<Target Name="UsesSignTool" DependsOnTargets="UsesFrameworkSdk">
<PropertyGroup>
<SignToolPath Condition="('@(SignToolPath)'=='') and Exists('$(FrameworkSdkPath)bin\signtool.exe')">$(FrameworkSdkPath)bin\signtool.exe</SignToolPath>
<SignToolPath Condition="('@(SignToolPath)'=='') and Exists('$(WinSDK)\bin\x86\signtool.exe')">$(WinSDK)\bin\x86\signtool.exe</SignToolPath>
<SignToolPath Condition="('@(SignToolPath)'=='') and Exists('$(Win10SDKVerBinPath)x86\signtool.exe')">$(Win10SDKVerBinPath)x86\signtool.exe</SignToolPath>
</PropertyGroup>
</Target>
<Target Name="SignBundleEngine" DependsOnTargets="UsesSignTool">
<Exec Command="&quot;$(SignToolPath)&quot; sign /d &quot;Cyberduck CLI&quot; /fd sha256 /tr http://timestamp.entrust.net/TSS/RFC3161sha2TS /td sha256 /a /sm /n &quot;iterate GmbH&quot; &quot;@(SignBundleEngine)&quot;" />
</Target>
<Target Name="SignBundle" Condition="'$(SignOutput)' == 'true'" DependsOnTargets="UsesSignTool">
<Exec Command="&quot;$(SignToolPath)&quot; sign /d &quot;Cyberduck CLI&quot; /fd sha256 /tr http://timestamp.entrust.net/TSS/RFC3161sha2TS /td sha256 /a /sm /n &quot;iterate GmbH&quot; &quot;@(SignBundle)&quot;" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs
+2 -2
View File
@@ -1,14 +1,14 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Package Name="Cyberduck CLI"
Manufacturer="iterate GmbH"
Version="!(bind.Property.ProductVersion)"
Version="$(ProductVersion)"
UpgradeCode="98B2B672-3720-4CAC-BF3E-220757500AE0">
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate EmbedCab="true" />
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)">
<Files Include="!(bindpath.duck)../**" />
<Files Include="$(duck.TargetDir)**" />
<Component Id="SetEnvironment" Guid="B429556B-9604-45DD-896C-4AE7BFFBE9EB">
<Environment Id="PathVar"
cli/src/main/wix/Bundle/duck.bundle.wixproj
+10 -5
View File
@@ -1,12 +1,17 @@
<Project Sdk="WixToolset.Sdk">
<PropertyGroup>
<OutputName>duck-$(Version)</OutputName>
<OutputName>duck-$(FileVersion)-$(Platform)</OutputName>
<Platforms>x64;arm64</Platforms>
<DefineConstants>
ProductVersion=$(FileVersion)
</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<SignOutput Condition=" '$(SignOutput)' == '' ">false</SignOutput>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<SignOutput Condition=" '$(SignOutput)' == '' ">true</SignOutput>
</PropertyGroup>
<ItemGroup>
<BindPath Include="$(CyberduckDir)profiles\default\" BindName="ProfilesPath" />
<PackageReference Include="WixToolset.Heat" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\csharp\duck.csproj" Publish="true" />
</ItemGroup>
cli/src/main/wix/Directory.Build.props
+9 -9
View File
@@ -15,14 +15,14 @@
<Project>
<PropertyGroup>
<_CliBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</_CliBasePath>
</PropertyGroup>
<Import Project="$(_CliBasePath)windows/Directory.Build.props" />
<PropertyGroup>
<_CliBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</_CliBasePath>
</PropertyGroup>
<Import Project="$(_CliBasePath)windows/Directory.Build.props" />
<PropertyGroup>
<OutputPath>$(OutputPath)$(Configuration)</OutputPath>
<SetupDir>$(CyberduckDir)setup\wix\</SetupDir>
</PropertyGroup>
<PropertyGroup>
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
<SetupDir>$(CyberduckDir)setup\wix\</SetupDir>
</PropertyGroup>
</Project>
</Project>
cli/windows/Directory.Build.props
-1
View File
@@ -17,7 +17,6 @@
<PropertyGroup>
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Props', $(MSBuildThisFileDirectory)../))" />
cli/windows/build.xml
+4 -11
View File
@@ -23,7 +23,7 @@
<property name="chocolatey.target" value="${build.deploy}"/>
<target name="restore" depends="msbuild">
<msbuild buildfile="build.proj">
<msbuild buildfile="dirs.proj">
<target name="Restore"/>
<property name="Exe" value="true"/>
@@ -32,7 +32,7 @@
</target>
<target name="build" depends="restore,msbuild">
<msbuild buildfile="build.proj">
<msbuild buildfile="dirs.proj">
<target name="Build"/>
<property name="Configuration" value="${msbuild.configuration}"/>
@@ -40,19 +40,12 @@
</msbuild>
</target>
<target name="package" depends="restore,msbuild">
<condition property="msbuild.sign" value="false">
<istrue value="${skip}"/>
</condition>
<property name="msbuild.sign" value=""/>
<msbuild buildfile="build.proj">
<target name="package" depends="msbuild">
<msbuild buildfile="dirs.proj">
<target name="Build"/>
<property name="BuildProjectReferences" value="false"/>
<property name="Configuration" value="${msbuild.configuration}"/>
<property name="Installer" value="true" />
<property name="SignOutput" value="${msbuild.sign}" />
</msbuild>
</target>
cli/windows/build.proj → cli/windows/dirs.proj
+3 -1
View File
@@ -2,10 +2,12 @@
<ItemGroup Condition=" '$(Exe)'=='True' ">
<ProjectReference Include="..\src\main\csharp\duck.csproj" SetPlatform="Platform=x64" />
<ProjectReference Include="..\src\main\csharp\duck.csproj" SetPlatform="Platform=arm64" />
</ItemGroup>
<ItemGroup Condition=" '$(Installer)'=='True' ">
<ProjectReference Include="..\src\main\wix\Bundle\duck.bundle.wixproj" />
<ProjectReference Include="..\src\main\wix\Bundle\duck.bundle.wixproj" SetPlatform="Platform=x64" />
<ProjectReference Include="..\src\main\wix\Bundle\duck.bundle.wixproj" SetPlatform="Platform=arm64" />
<ProjectReference Include="..\src\main\wix\Bootstrapper\duck.bootstrapper.wixproj" />
</ItemGroup>
cli/windows/pom.xml
+10 -10
View File
@@ -72,6 +72,10 @@
</target>
</configuration>
</execution>
<execution>
<id>pack-nupkg</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
@@ -83,39 +87,35 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core.Native</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Protocols</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Cryptomator</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Cli</artifactId>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
</project>
core/dll/Cyberduck.Core.msbuildproj → core/dll/Cyberduck.Core.ikvmproj
-2
View File
@@ -4,8 +4,6 @@
<TargetFrameworks>net472;net8.0</TargetFrameworks>
</PropertyGroup>
<Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
<ItemGroup>
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
core/dll/Directory.Build.props
+5 -5
View File
@@ -15,10 +15,10 @@
<Project>
<PropertyGroup>
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<PropertyGroup>
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="../Directory.Build.props" />
<Import Project="../Directory.Build.props" />
</Project>
</Project>
core/dll/build.xml
+11 -3
View File
@@ -24,13 +24,21 @@
<import file="../../build.xml" />
<target name="restore" depends="msbuild">
<msbuild buildfile="Cyberduck.Core.msbuildproj">
<msbuild buildfile="Cyberduck.Core.ikvmproj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" if="platform.windows" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Core.msbuildproj">
<target name="build" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Core.ikvmproj">
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
<target name="pack" depends="msbuild">
<msbuild buildfile="Cyberduck.Core.ikvmproj">
<target name="Pack" />
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
core/dll/pom.xml
+12 -10
View File
@@ -50,22 +50,16 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>install-dll</id>
<phase>verify</phase>
<id>install-nupkg</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<classifier>net472</classifier>
<type>dll</type>
<file>${project.build.directory}/net472/Cyberduck.Core.dll</file>
</artifact>
<artifact>
<classifier>net8.0</classifier>
<type>dll</type>
<file>${project.build.directory}/net8.0/Cyberduck.Core.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Core.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -102,6 +96,14 @@
<version>${jna-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jnidispatch</artifactId>
<classifier>aarch64</classifier>
<type>dll</type>
<version>${jna-version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</profile>
</profiles>
core/i18n-gen/i18n-gen.targets
+8 -7
View File
@@ -4,15 +4,16 @@
</PropertyGroup>
<UsingTask TaskName="ResourceGenTask"
AssemblyFile="$(i18n_gen_dll)"
TaskFactory="TaskHostFactory" />
AssemblyFile="$(i18n_gen_dll)"
TaskFactory="TaskHostFactory" />
<UsingTask TaskName="ImageDiscoverTask"
AssemblyFile="$(i18n_gen_dll)"
TaskFactory="TaskHostFactory" />
AssemblyFile="$(i18n_gen_dll)"
TaskFactory="TaskHostFactory" />
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)i18n-gen.csproj"
OutputItemType="Analyzer"
ReferenceOutputAssembly="False" />
OutputItemType="Analyzer"
ReferenceOutputAssembly="False"
SetPlatform="Platform=" />
</ItemGroup>
</Project>
</Project>
core/native/Directory.Build.props
+5 -5
View File
@@ -15,10 +15,10 @@
<Project>
<PropertyGroup>
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<PropertyGroup>
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="../Directory.Build.props" />
<Import Project="../Directory.Build.props" />
</Project>
</Project>
core/native/build.xml
+13 -7
View File
@@ -21,27 +21,33 @@
-->
<project name="Cyberduck Native Libraries" basedir=".">
<import file="../../build.xml"/>
<import file="../../build.xml" />
<target name="restore" depends="msbuild">
<msbuild buildfile="build.proj">
<target name="Restore"/>
<msbuild buildfile="dirs.proj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" depends="restore,msbuild">
<msbuild buildfile="build.proj">
<target name="Build"/>
<msbuild buildfile="dirs.proj">
<target name="Build" />
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
<target name="pack" depends="msbuild">
<msbuild buildfile="src/main/nuget.proj">
<target name="Restore;Pack" />
</msbuild>
</target>
<target name="test" depends="msbuild" unless="${skip}">
<msbuild buildfile="../src/test/csharp/Cyberduck.Core.Test.csproj">
<target name="Test"/>
<target name="Test" />
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
</project>
core/native/build.proj → core/native/dirs.proj
+2 -1
View File
@@ -2,6 +2,7 @@
<ItemGroup>
<ProjectReference Include="..\i18n-gen\i18n-gen.csproj" />
<ProjectReference Include="..\src\main\csharp\Cyberduck.Core.Native.csproj" SetPlatform="Platform=x64" />
<ProjectReference Include="..\src\main\csharp\Cyberduck.Core.Native.csproj" SetPlatform="Platform=arm64" />
<ProjectReference Include="..\src\test\csharp\Cyberduck.Core.Test.csproj" SetPlatform="Platform=x64" />
</ItemGroup>
</Project>
</Project>
core/native/pom.xml
+5 -19
View File
@@ -32,7 +32,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>install-dll</id>
<id>install-nupkg</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
@@ -40,14 +40,8 @@
<configuration>
<artifacts>
<artifact>
<classifier>net472</classifier>
<type>dll</type>
<file>${project.build.directory}/net472/Cyberduck.Core.Native.dll</file>
</artifact>
<artifact>
<classifier>net8.0</classifier>
<type>dll</type>
<file>${project.build.directory}/net8.0-windows10.0.22621.0/Cyberduck.Core.Native.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Core.Native.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -83,15 +77,7 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net472</classifier>
<type>dll</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -108,4 +94,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
core/native/refresh/Directory.Build.props
+6 -5
View File
@@ -15,10 +15,11 @@
<Project>
<PropertyGroup>
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Cyberduck.Core.Refresh</AssemblyName>
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>
<Import Project="../Directory.Build.props" />
<Import Project="../Directory.Build.props" />
</Project>
</Project>
core/native/refresh/build.xml
+9 -3
View File
@@ -24,18 +24,24 @@
<import file="../../../build.xml"/>
<target name="restore" depends="msbuild">
<msbuild buildfile="src/main/csharp/Cyberduck.Core.Refresh.csproj">
<msbuild buildfile="dirs.proj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" depends="restore,msbuild">
<!-- Create DLL Cyberduck.Core.Refresh -->
<msbuild buildfile="src/main/csharp/Cyberduck.Core.Refresh.csproj">
<msbuild buildfile="dirs.proj">
<target name="Build"/>
<property name="Configuration" value="${msbuild.configuration}" />
<property name="Platform" value="x64" />
</msbuild>
</target>
<target name="pack" depends="msbuild">
<!-- Create DLL Cyberduck.Core.Refresh -->
<msbuild buildfile="src/main/nuget/nuget.proj">
<target name="Restore;Pack"/>
</msbuild>
</target>
</project>
core/native/refresh/dirs.proj
+6
View File
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.Build.Traversal">
<ItemGroup>
<ProjectReference Include="src/main/csharp/Cyberduck.Core.Refresh.csproj" SetPlatform="Platform=x64" />
<ProjectReference Include="src/main/csharp/Cyberduck.Core.Refresh.csproj" SetPlatform="Platform=arm64" />
</ItemGroup>
</Project>
core/native/refresh/pom.xml
+4 -18
View File
@@ -28,7 +28,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>install-dll</id>
<id>install-nupkg</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
@@ -36,14 +36,8 @@
<configuration>
<artifacts>
<artifact>
<classifier>net472</classifier>
<type>dll</type>
<file>${project.build.directory}/net472/Cyberduck.Core.Refresh.dll</file>
</artifact>
<artifact>
<classifier>net8.0</classifier>
<type>dll</type>
<file>${project.build.directory}/net8.0-windows10.0.22621.0/Cyberduck.Core.Refresh.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Core.Refresh.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -59,15 +53,7 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core.Native</artifactId>
<classifier>net472</classifier>
<type>dll</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core.Native</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
</dependencies>
core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj
+1 -2
View File
@@ -18,7 +18,7 @@
<PropertyGroup>
<TargetFrameworks>net472;net8.0-windows10.0.22621.0</TargetFrameworks>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<Platforms>x64</Platforms>
<Platforms>x64;arm64</Platforms>
<LangVersion>12.0</LangVersion>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
@@ -31,7 +31,6 @@
<ItemGroup>
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" />
<PackageReference Include="IKVM" />
<PackageReference Include="Microsoft.Windows.CsWin32">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
core/native/refresh/src/main/nuget/Cyberduck.Core.Refresh.nuspec
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>$id$</id>
<version>$version$</version>
<description>$description$</description>
<authors>$authors$</authors>
<dependencies>
<group>
<dependency id="Cyberduck.Core" version="$version$" />
<dependency id="Cyberduck.Core.Native" version="$version$" />
<dependency id="DotNetProjects.Extended.Wpf.Toolkit" version="$PkgDotNetProjects_Extended_Wpf_ToolkitVersion$" />
<dependency id="ReactiveUI.WPF" version="$PkgReactiveUI_WPFVersion$" />
<dependency id="System.Memory" version="$PkgSystem_MemoryVersion$" />
<dependency id="System.Runtime.Caching" version="$PkgSystem_Runtime_CachingVersion$" />
</group>
<group targetFramework="net472">
</group>
<group targetFramework="net8.0-windows10.0.22621.0">
</group>
</dependencies>
</metadata>
<files>
<file src="$buildDir$x64/net472/Cyberduck.Core.Refresh.dll" target="lib/net472" />
<file src="$buildDir$x64/net8.0-windows10.0.22621.0/Cyberduck.Core.Refresh.dll" target="lib/net8.0-windows10.0.22621.0/win-x64" />
<file src="$buildDir$arm64/net8.0-windows10.0.22621.0/Cyberduck.Core.Refresh.dll" target="lib/net8.0-windows10.0.22621.0/win-arm64" />
<file src="build/**" target="" />
</files>
</package>
core/native/refresh/src/main/nuget/build/net8.0-windows10.0.22621.0/Cyberduck.Core.Refresh.targets
+7
View File
@@ -0,0 +1,7 @@
<Project>
<ItemGroup>
<Reference Include="Cyberduck.Core.Refresh">
<HintPath>$(MSBuildThisFileDirectory)../../lib/net8.0-windows10.0.22621.0/win-$(Platform)/Cyberduck.Core.Refresh.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
core/native/refresh/src/main/nuget/nuget.proj
+8
View File
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.Net.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NuspecFile>Cyberduck.Core.Refresh.nuspec</NuspecFile>
</PropertyGroup>
</Project>
core/native/src/main/Cyberduck.Core.Native.nuspec
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>$id$</id>
<version>$version$</version>
<description>$description$</description>
<authors>$authors$</authors>
<dependencies>
<group>
<dependency id="Cyberduck.Core" version="$version$" />
<dependency id="Microsoft.Toolkit.Uwp.Notifications" version="$PkgMicrosoft_Toolkit_Uwp_NotificationsVersion$" />
<dependency id="ReactiveUI" version="$PkgReactiveUIVersion$" />
</group>
<group targetFramework="net472">
<dependency id="Microsoft.Windows.SDK.Contracts" version="$PkgMicrosoft_Windows_SDK_ContractsVersion$" />
</group>
<group targetFramework="net8.0-windows10.0.22621.0">
<dependency id="System.Configuration.ConfigurationManager" version="$PkgSystem_Configuration_ConfigurationManagerVersion$" />
<dependency id="System.Security.Cryptography.ProtectedData" version="$PkgSystem_Security_Cryptography_ProtectedDataVersion$" />
</group>
</dependencies>
</metadata>
<files>
<file src="$buildDir$x64/net472/Cyberduck.Core.Native.dll" target="lib/net472" />
<file src="$buildDir$x64/net8.0-windows10.0.22621.0/Cyberduck.Core.Native.dll" target="lib/net8.0-windows10.0.22621.0/win-x64" />
<file src="$buildDir$arm64/net8.0-windows10.0.22621.0/Cyberduck.Core.Native.dll" target="lib/net8.0-windows10.0.22621.0/win-arm64" />
<file src="build/**" target="" />
</files>
</package>
core/native/src/main/Directory.Build.props
+20
View File
@@ -0,0 +1,20 @@
<!--
~ Copyright (c) 2002-2019 iterate GmbH. All rights reserved.
~ https://cyberduck.io/
~
~ This program is free software; you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
-->
<Project>
<Import Project="../../../src/main/csharp/Directory.Build.props" />
</Project>
core/native/src/main/build/net8.0-windows10.0.22621.0/Cyberduck.Core.Native.targets
+7
View File
@@ -0,0 +1,7 @@
<Project>
<ItemGroup>
<Reference Include="Cyberduck.Core.Native">
<HintPath>$(MSBuildThisFileDirectory)../../lib/net8.0-windows10.0.22621.0/win-$(Platform)/Cyberduck.Core.Native.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
core/native/src/main/nuget.proj
+8
View File
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.Net.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput>
<NuspecFile>Cyberduck.Core.Native.nuspec</NuspecFile>
</PropertyGroup>
</Project>
core/src/main/csharp/Cyberduck.Core.Native.csproj
+9 -4
View File
@@ -15,10 +15,16 @@
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TargetFrameworks>net472;net8.0-windows10.0.22621.0</TargetFrameworks>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<PropertyGroup Condition="'$(Platform)'=='x64'">
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net472'">
<Platforms>x64</Platforms>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net8.0-windows10.0.22621.0</TargetFrameworks>
<Platforms Condition="'$(Platforms)'==''">x64;arm64</Platforms>
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
@@ -27,7 +33,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="IKVM" />
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" />
<PackageReference Include="Microsoft.Windows.CsWin32">
<PrivateAssets>all</PrivateAssets>
core/src/main/csharp/Directory.Build.props
+3 -2
View File
@@ -16,9 +16,10 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AssemblyName>Cyberduck.Core.Native</AssemblyName>
<_CoreBasePath>$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Directory.Build.props'))/</_CoreBasePath>
</PropertyGroup>
<Import Project="$(_CoreBasePath)native/Directory.Build.props" />
</Project>
</Project>
cryptomator/dll/Cyberduck.Cryptomator.msbuildproj → cryptomator/dll/Cyberduck.Cryptomator.ikvmproj
-4
View File
@@ -1,16 +1,12 @@
<Project Sdk="IKVM.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
</PropertyGroup>
<Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
<ItemGroup>
<CyberduckReference Include="Core" />
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
<Convert Include="$(TargetBuildDir)*.jar" />
</ItemGroup>
</Project>
cryptomator/dll/build.xml
+13 -5
View File
@@ -15,18 +15,26 @@
-->
<project name="Cyberduck Native Libraries" basedir=".">
<import file="../../build.xml"/>
<import file="../../build.xml" />
<target name="restore" depends="msbuild">
<msbuild buildfile="Cyberduck.Cryptomator.msbuildproj">
<msbuild buildfile="Cyberduck.Cryptomator.ikvmproj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" if="platform.windows" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Cryptomator.msbuildproj">
<target name="build" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Cryptomator.ikvmproj">
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
<target name="pack" depends="msbuild">
<msbuild buildfile="Cyberduck.Cryptomator.ikvmproj">
<target name="Pack" />
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
cryptomator/dll/pom.xml
+4 -18
View File
@@ -62,7 +62,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>install-dll</id>
<id>install-nupkg</id>
<phase>verify</phase>
<goals>
<goal>attach-artifact</goal>
@@ -70,14 +70,8 @@
<configuration>
<artifacts>
<artifact>
<classifier>net472</classifier>
<type>dll</type>
<file>${project.build.directory}/net472/Cyberduck.Cryptomator.dll</file>
</artifact>
<artifact>
<classifier>net8.0</classifier>
<type>dll</type>
<file>${project.build.directory}/net8.0/Cyberduck.Cryptomator.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Cryptomator.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -96,15 +90,7 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net472</classifier>
<type>dll</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
</dependencies>
protocols/dll/Cyberduck.Protocols.msbuildproj → importer/dll/Cyberduck.Importer.ikvmproj
-4
View File
@@ -1,16 +1,12 @@
<Project Sdk="IKVM.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
</PropertyGroup>
<Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
<ItemGroup>
<CyberduckReference Include="Core" />
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
<Convert Include="$(TargetBuildDir)*.jar" />
</ItemGroup>
</Project>
importer/dll/build.xml
+11 -3
View File
@@ -24,13 +24,21 @@
<import file="../../build.xml"/>
<target name="restore" depends="msbuild">
<msbuild buildfile="Cyberduck.Importer.msbuildproj">
<msbuild buildfile="Cyberduck.Importer.ikvmproj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" if="platform.windows" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Importer.msbuildproj">
<target name="build" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Importer.ikvmproj">
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
<target name="pack" depends="msbuild">
<msbuild buildfile="Cyberduck.Importer.ikvmproj">
<target name="Pack" />
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
importer/dll/pom.xml
+4 -18
View File
@@ -47,7 +47,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>install-dll</id>
<id>install-nupkg</id>
<phase>verify</phase>
<goals>
<goal>attach-artifact</goal>
@@ -55,14 +55,8 @@
<configuration>
<artifacts>
<artifact>
<classifier>net472</classifier>
<type>dll</type>
<file>${project.build.directory}/net472/Cyberduck.Importer.dll</file>
</artifact>
<artifact>
<classifier>net8.0</classifier>
<type>dll</type>
<file>${project.build.directory}/net8.0/Cyberduck.Importer.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Importer.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -81,15 +75,7 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net472</classifier>
<type>dll</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
</dependencies>
pom.xml
+69 -8
View File
@@ -623,35 +623,35 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<excludeClassifiers>net472,net8.0</excludeClassifiers>
<excludeClassifiers>net472,net8.0,net8.0-x64,net8.0-arm64,aarch64,x86_64</excludeClassifiers>
<includeTypes>dll</includeTypes>
<stripClassifier>true</stripClassifier>
<stripVersion>true</stripVersion>
</configuration>
</execution>
<execution>
<id>copy-dependencies-dll-net472-target</id>
<id>copy-dependencies-dll-x64-target</id>
<phase>generate-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib/net472</outputDirectory>
<classifier>net472</classifier>
<outputDirectory>${project.build.directory}/lib/x64</outputDirectory>
<includeClassifiers>x86_64</includeClassifiers>
<includeTypes>dll</includeTypes>
<stripClassifier>true</stripClassifier>
<stripVersion>true</stripVersion>
</configuration>
</execution>
<execution>
<id>copy-dependencies-dll-net8.0-target</id>
<id>copy-dependencies-dll-arm64-target</id>
<phase>generate-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib/net8.0</outputDirectory>
<classifier>net8.0</classifier>
<outputDirectory>${project.build.directory}/lib/arm64</outputDirectory>
<includeClassifiers>aarch64</includeClassifiers>
<includeTypes>dll</includeTypes>
<stripClassifier>true</stripClassifier>
<stripVersion>true</stripVersion>
@@ -1052,6 +1052,19 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>generate-nupkgs</id>
<phase>generate-sources</phase>
<goals>
<goal>copy-dependencies</goal>
<goal>collect</goal>
</goals>
<configuration>
<includeTypes>nupkg</includeTypes>
<outputFile>${project.build.directory}/.nuget/packages.list</outputFile>
<outputDirectory>${project.build.directory}/.nuget/cache</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-dependencies-jar-target</id>
<configuration>
@@ -1062,9 +1075,57 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>unpack-nupkg</id>
<phase>process-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="home" value="${main.basedir}" />
<ant antfile="${project.basedir}/build.xml" target="nuget-unpack" dir="." />
</target>
</configuration>
</execution>
<execution>
<id>run-msbuild-props-target</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="home" value="${main.basedir}" />
<property name="version" value="${project.version}" />
<property name="revision" value="${git.commitsCount}" />
<property name="hash" value="${git.revision}" />
<property name="sparkle.feed" value="${sparkle.feed}" />
<ant antfile="${project.basedir}/build.xml" target="msbuild-props" dir="." />
</target>
</configuration>
</execution>
<execution>
<id>pack-nupkg</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="home" value="${main.basedir}" />
<ant antfile="${project.basedir}/build.xml" target="pack" dir="." />
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
</project>
</project>
importer/dll/Cyberduck.Importer.msbuildproj → protocols/dll/Cyberduck.Protocols.ikvmproj
+1 -5
View File
@@ -1,16 +1,12 @@
<Project Sdk="IKVM.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net8.0</TargetFrameworks>
</PropertyGroup>
<Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
<ItemGroup>
<CyberduckReference Include="Core" />
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
<Convert Include="$(TargetBuildDir)*.jar" />
</ItemGroup>
</Project>
</Project>
protocols/dll/build.xml
+13 -5
View File
@@ -21,17 +21,25 @@
-->
<project name="Cyberduck Native Libraries" basedir=".">
<import file="../../build.xml"/>
<import file="../../build.xml" />
<target name="restore" depends="msbuild">
<msbuild buildfile="Cyberduck.Protocols.msbuildproj">
<msbuild buildfile="Cyberduck.Protocols.ikvmproj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" if="platform.windows" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Protocols.msbuildproj">
<target name="build" depends="restore,msbuild">
<msbuild buildfile="Cyberduck.Protocols.ikvmproj">
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
<target name="pack" depends="msbuild">
<msbuild buildfile="Cyberduck.Protocols.ikvmproj">
<target name="Pack" />
<property name="Configuration" value="${msbuild.configuration}" />
</msbuild>
</target>
</project>
protocols/dll/pom.xml
+4 -18
View File
@@ -47,7 +47,7 @@
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>install-dll</id>
<id>install-nupkg</id>
<phase>verify</phase>
<goals>
<goal>attach-artifact</goal>
@@ -55,14 +55,8 @@
<configuration>
<artifacts>
<artifact>
<classifier>net472</classifier>
<type>dll</type>
<file>${project.build.directory}/net472/Cyberduck.Protocols.dll</file>
</artifact>
<artifact>
<classifier>net8.0</classifier>
<type>dll</type>
<file>${project.build.directory}/net8.0/Cyberduck.Protocols.dll</file>
<type>nupkg</type>
<file>${project.build.directory}/Cyberduck.Protocols.${project.version}.nupkg</file>
</artifact>
</artifacts>
</configuration>
@@ -81,15 +75,7 @@
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net472</classifier>
<type>dll</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core</artifactId>
<classifier>net8.0</classifier>
<type>dll</type>
<type>nupkg</type>
<version>${project.version}</version>
</dependency>
</dependencies>
src/main/msbuild/Cyberduck.Common.props
+14 -3
View File
@@ -13,23 +13,34 @@
<UseArtifactsOutput>false</UseArtifactsOutput>
<ArtifactsPath>$(TargetBuildDir)</ArtifactsPath>
<BaseIntermediateOutputPath>$(ArtifactsPath)obj\$(projectName)\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath>$(ArtifactsPath)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
<BaseOutputPath>$(ArtifactsPath)</BaseOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<LangVersion>12</LangVersion>
<!--
NuGet hates same-version packages (i.e. -SNAPSHOT).
With some Maven-trickery (and PowerShell) extract the .nupkg from Maven
Into a common folder (ModulePath\target\.nuget\packages), and specify as fallback folder.
Now, NuGet will first check in this folder, before checking in nuget.config
for suitable remotes - which is set to a non-existing source, for fast build failure:
<packageSource key="MavenFailNuget">
<package pattern="Cyberduck*" />
</packageSource>
As Maven is enforcing dependency versions here this is safe.
-->
<RestoreAdditionalProjectFallbackFolders Condition="Exists('$(TargetBuildDir).nuget\packages\')">$(TargetBuildDir).nuget\packages\;$(RestoreAdditionalProjectFallbackFolders)</RestoreAdditionalProjectFallbackFolders>
</PropertyGroup>
<Import Project="$(GeneratedMSBuildDir)Version.props" Condition="Exists('$(GeneratedMSBuildDir)Version.props')" />
<ItemDefinitionGroup>
<CyberduckReference>
<ProjectPath />
</CyberduckReference>
</ItemDefinitionGroup>
<Import Project="$(GeneratedMSBuildDir)Version.props" Condition="Exists('$(GeneratedMSBuildDir)Version.props')" />
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<SignOutput Condition=" '$(SignOutput)' == '' ">false</SignOutput>
</PropertyGroup>
src/main/msbuild/Cyberduck.Common.targets
+1 -1
View File
@@ -18,4 +18,4 @@
<Import Project="Cyberduck.NuGet.targets" />
</Project>
</Project>
src/main/msbuild/Cyberduck.References.props
+23 -12
View File
@@ -2,16 +2,16 @@
<ItemGroup>
<CyberduckReference Update="Bonjour">
<ProjectPath>$(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.proj</ProjectPath>
<ProjectPath>$(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.ikvmproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Bonjour.Native">
<ProjectPath>$(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Cli">
<ProjectPath>$(CyberduckDir)cli\dll\Cyberduck.Cli.proj</ProjectPath>
<ProjectPath>$(CyberduckDir)cli\dll\Cyberduck.Cli.ikvmproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Core">
<ProjectPath>$(CyberduckDir)core\dll\Cyberduck.Core.proj</ProjectPath>
<ProjectPath>$(CyberduckDir)core\dll\Cyberduck.Core.ikvmproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Core.Native">
<ProjectPath>$(CyberduckDir)core\src\main\csharp\Cyberduck.Core.Native.csproj</ProjectPath>
@@ -20,22 +20,33 @@
<ProjectPath>$(CyberduckDir)core\native\refresh\src\main\csharp\Cyberduck.Core.Refresh.csproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Cryptomator">
<ProjectPath>$(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.proj</ProjectPath>
<ProjectPath>$(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.ikvmproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Importer">
<ProjectPath>$(CyberduckDir)importer\dll\Cyberduck.Importer.proj</ProjectPath>
<ProjectPath>$(CyberduckDir)importer\dll\Cyberduck.Importer.ikvmproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Protocols">
<ProjectPath>$(CyberduckDir)protocols\dll\Cyberduck.Protocols.proj</ProjectPath>
<ProjectPath>$(CyberduckDir)protocols\dll\Cyberduck.Protocols.ikvmproj</ProjectPath>
</CyberduckReference>
<CyberduckProjectReference Include="@(CyberduckReference->HasMetadata('ProjectPath'))" Condition=" '$(BuildingInsideVisualStudio)'=='true' " />
<CyberduckPackageReference Include="@(CyberduckReference->'Cyberduck.%(Identity)')" Exclude="@(CyberduckProjectReference)" />
<ProjectReference Include="@(CyberduckProjectReference->'%(ProjectPath)')">
<Name>Cyberduck.%(Identity)</Name>
</ProjectReference>
<PackageReference Include="@(CyberduckPackageReference)" />
<CyberduckReferenceIdentity Include="@(CyberduckReference->'Cyberduck.%(Identity)')" />
<CyberduckReferenceWithProjectPath Include="@(CyberduckReferenceIdentity->HasMetadata('ProjectPath'))" />
<!-- Any CyberduckReference that doesn't have a ProjectPath should be included by PackageReference, by default -->
<CyberduckPackageReference Include="@(CyberduckReferenceIdentity)" Exclude="@(CyberduckReferenceWithProjectPath)" />
</ItemGroup>
<!-- If in VisualStudio reference Projects directly -->
<ItemGroup Condition="'$(BuildingInsideVisualStudio)'=='True'">
<ProjectReference Include="@(CyberduckReferenceWithProjectPath->'%(ProjectPath)')" Name="%(Identity)" />
</ItemGroup>
<!-- Else use PackageReferences -->
<ItemGroup Condition="'$(BuildingInsideVisualStudio)'!='True'">
<CyberduckPackageReference Include="@(CyberduckReferenceIdentity)" Exclude="@(CyberduckPackageReference)" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="@(CyberduckPackageReference)" Version="$(Version)" />
<PackageReference Include="@(CyberduckPackageReference)" />
</ItemGroup>
</Project>
src/main/msbuild/Cyberduck.wxs.props
-5
View File
@@ -1,5 +0,0 @@
<Project>
<Import Project="Microsoft.WindowsSdk.props" />
</Project>
src/main/msbuild/Cyberduck.wxs.targets
+2
View File
@@ -1,5 +1,7 @@
<Project>
<Import Project="Microsoft.WindowsSdk.props" />
<Target Name="SignMsi" DependsOnTargets="UsesSignTool">
<Exec Command="$(SignTool) &quot;%(SignMsi.FullPath)&quot;" EnvironmentVariables="$(SignToolPath)" />
</Target>
windows/Directory.Build.props
-1
View File
@@ -17,7 +17,6 @@
<PropertyGroup>
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<Import Project="../Directory.Build.props" />
windows/build.xml
+3 -4
View File
@@ -30,13 +30,13 @@
<property name="chocolatey.target" value="${build.deploy}"/>
<target name="restore" depends="msbuild">
<msbuild buildfile="build.proj">
<msbuild buildfile="dirs.proj">
<target name="Restore" />
</msbuild>
</target>
<target name="build" depends="restore,msbuild">
<msbuild buildfile="build.proj">
<msbuild buildfile="dirs.proj">
<target name="Build" />
<property name="BuildModule" value="Project" />
@@ -74,12 +74,11 @@
<globmapper from="*.template" to="*"/>
</copy>
<msbuild buildfile="build.proj">
<msbuild buildfile="dirs.proj">
<target name="Build" />
<property name="BuildModule" value="Installer" />
<property name="Configuration" value="${msbuild.configuration}" />
<property name="SignOutput" value="${msbuild.sign}" />
</msbuild>
</target>
windows/build.proj → windows/dirs.proj
View File