Cyberduck CLI Windows Arm64

.editorconfig

@@ -12,7 +12,7 @@ insert_final_newline = true
 charset = utf-8-bom
 
 # XML project files
-[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj,msbuildproj}]
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj,ikvmproj}]
 indent_size = 2
 
 # XML config files

Directory.Build.props

@@ -16,46 +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')" />
-
-  <PropertyGroup>
-    <SignToolExecutablePath>$(PATH)</SignToolExecutablePath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)src\main\msbuild\BannedSymbols.*.txt" Link="%(Filename)%(Extension)" />
-  </ItemGroup>
+  <Import Project="$(BuildSupportDir)Cyberduck.Default.props" />
 
-</Project>
+</Project>

Directory.Build.targets

@@ -16,124 +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>
-
-  <PropertyGroup>
-    <_SignToolArgs Condition="'$(SignTool)'=='cng'">_SignToolArgsCNG</_SignToolArgs>
-    <_SignToolArgs Condition="'$(_SignToolArgs)'==''">_SignToolArgsCertificateStore</_SignToolArgs>
-
-    <SignToolArgsDependsOn>$(_SignToolArgs);SignToolExecutablePath</SignToolArgsDependsOn>
-  </PropertyGroup>
-
-  <Target Name="SignToolExecutablePath" Returns="$(SignToolExecutablePath);$(SignToolExecutable)">
-    <PropertyGroup>
-      <SignToolExecutable Condition="'$(SignToolExecutable)'==''">SignTool.exe</SignToolExecutable>
-      <SignToolExecutablePath>$(WindowsSdk_ExecutablePath);$(SignToolExecutablePath)</SignToolExecutablePath>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="SignToolArgsBase" Returns="$(SignToolArgsBase)">
-    <PropertyGroup>
-      <SignToolArgsBase>sign /d "Cyberduck" /fd sha256 /tr "http://timestamp.acs.microsoft.com" /td "sha256" /a</SignToolArgsBase>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="SignToolArgs" DependsOnTargets="$(SignToolArgsDependsOn)">
-    <Error Text="'$(SignTool)' unsupported." Condition="'$(_SignToolArgs)'==''" />
-    <PropertyGroup>
-      <SignToolArgs>"$(SignToolExecutable)" $(SignToolArgsBase)</SignToolArgs>
-    </PropertyGroup>
-    <ItemGroup>
-      <SignToolEnvironmentVariable Include="PATH=$([MSBuild]::Escape('$(SignToolExecutablePath)'))" />
-    </ItemGroup>
-  </Target>
-  <Target Name="_SignToolArgsCertificateStore" DependsOnTargets="SignToolArgsBase" Returns="$(SignToolArgsBase)">
-    <PropertyGroup>
-      <SignToolArgsBase>$(SignToolArgsBase) /sm /n "iterate GmbH"</SignToolArgsBase>
-    </PropertyGroup>
-  </Target>
-  <Target Name="_SignToolArgsCNG" DependsOnTargets="SignToolArgsBase" Returns="$(SignToolArgsBase)">
-    <PropertyGroup>
-      <SignToolArgsBase>$(SignToolArgsBase) /f "$(CyberduckDir)setup\cert\certificate.crt" /csp "$(SignToolCSP)" /kc "$(SignToolKC)"</SignToolArgsBase>
-    </PropertyGroup>
-  </Target>
+  <Import Project="$(BuildSupportDir)Cyberduck.Default.targets" />
 
 </Project>

Directory.Packages.props

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.100" />
+    <PackageVersion Include="ExceptionReporter " Version="2.4.2" />
+    <PackageVersion Include="IKVM" Version="8.13.3" />
+    <PackageVersion Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" Version="1.1.0" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.1.0" />
+    <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
+    <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
+    <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22000.196" />
+    <PackageVersion Include="NUnit" Version="4.2.0" />
+    <PackageVersion Include="NUnit.Console" Version="3.17.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageVersion Include="ObjectListView.Official" Version="2.9.1" />
+    <PackageVersion Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.2.3" />
+    <PackageVersion Include="ReactiveUI" Version="17.1.50" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="17.1.50" />
+    <PackageVersion Include="StructureMap" Version="2.6.4.1" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.3" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
+    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.Runtime.Caching" Version="8.0.0" />
+    <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
+    <PackageVersion Include="WixToolset.Bal.wixext" Version="5.0.2" />
+    <PackageVersion Include="WixToolset.Heat" Version="5.0.2" />
+    <PackageVersion Include="WixToolset.NetFx.wixext" Version="5.0.2" />
+    <PackageVersion Include="WixToolset.Util.wixext" Version="5.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <PackageVersions>@(PackageVersion->'%(Identity)'->Replace('.', '_')->'Pkg%(Identity)Version=%(Version)')</PackageVersions>
+  </PropertyGroup>
+</Project>

bonjour/dll/Cyberduck.Bonjour.msbuildproj → bonjour/dll/Cyberduck.Bonjour.ikvmproj

@@ -1,19 +1,18 @@
 <Project Sdk="IKVM.NET.Sdk">
-
   <PropertyGroup>
     <!--
       Only really used in Cyberduck.
     -->
     <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 
-  <Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
-
   <ItemGroup>
     <CyberduckReference Include="Core" />
-    <PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
+    <PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
 
     <Convert Include="$(TargetBuildDir)*.jar" />
   </ItemGroup>
-
 </Project>

bonjour/dll/build.xml

@@ -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

@@ -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>