Skip to content

Commit c15e6c6

Browse files
AliveDevilAliveDevil
committed
Package NuGet
1 parent 6308a4f commit c15e6c6

File tree

73 files changed

+574
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+574
-552
lines changed

‎Cyberduck.sln‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "i18n-gen", "core\i18n-gen\i
5151
EndProject
5252
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "package", "windows\src\main\package\package.wapproj", "{55CDD736-9A8A-4091-AC99-60E2F9C73269}"
5353
EndProject
54-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}"
54+
Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.ikvmproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}"
5555
EndProject
56-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}"
56+
Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.ikvmproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}"
5757
EndProject
58-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.msbuildproj", "{C9B1C169-1354-4348-9938-7892399C6336}"
58+
Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.ikvmproj", "{C9B1C169-1354-4348-9938-7892399C6336}"
5959
EndProject
60-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}"
60+
Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.ikvmproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}"
6161
EndProject
62-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}"
62+
Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.ikvmproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}"
6363
EndProject
64-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}"
64+
Project("{DAEA77DE-8320-43BA-BA7C-EF5C12478AB5}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.ikvmproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}"
6565
EndProject
6666
Global
6767
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -105,10 +105,10 @@ Global
105105
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.Build.0 = Debug|x86
106106
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.ActiveCfg = Release|x86
107107
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.Build.0 = Release|x86
108-
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.ActiveCfg = Debug|x86
109-
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.Build.0 = Debug|x86
110-
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.ActiveCfg = Release|x86
111-
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.Build.0 = Release|x86
108+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.ActiveCfg = Debug|x64
109+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.Build.0 = Debug|x64
110+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.ActiveCfg = Release|x64
111+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.Build.0 = Release|x64
112112
{F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.ActiveCfg = Debug|x64
113113
{F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.Build.0 = Debug|x64
114114
{F6975079-F730-4A31-9909-DE536E524764}.Release|x64.ActiveCfg = Release|x64

‎Directory.Build.Java.props‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Directory.Build.props‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,11 @@
1616

1717
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1818

19-
<PropertyGroup Label="AssemblyInfo">
20-
<Company>iterate GmbH</Company>
21-
<Description>Libre FTP, SFTP, WebDAV, S3 and OpenStack Swift browser for Mac and Windows.</Description>
22-
</PropertyGroup>
23-
2419
<PropertyGroup>
2520
<CyberduckDir>$(MSBuildThisFileDirectory)</CyberduckDir>
2621
<BuildSupportDir>$(CyberduckDir)src\main\msbuild\</BuildSupportDir>
27-
<TargetBuildDir>$(ModulePath)target\</TargetBuildDir>
28-
<LibDir>$(TargetBuildDir)lib\</LibDir>
29-
<GeneratedMSBuildDir>$(TargetBuildDir)generated\msbuild\</GeneratedMSBuildDir>
30-
31-
<ArtifactsPath>$(TargetBuildDir)</ArtifactsPath>
32-
<UseArtifactsOutput>false</UseArtifactsOutput>
33-
34-
<BaseIntermediateOutputPath>$(ArtifactsPath)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
35-
<BaseOutputPath>$(ArtifactsPath)</BaseOutputPath>
36-
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
37-
<OutputPath>$(BaseOutputPath)</OutputPath>
38-
39-
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
40-
<LangVersion>12</LangVersion>
41-
42-
<BuildProjectReferences Condition=" '$(BuildProjectReferences)'=='' And '$(BuildingInsideVisualStudio)'!='True' ">false</BuildProjectReferences>
4322
</PropertyGroup>
44-
45-
<ItemDefinitionGroup>
46-
<CyberduckReference>
47-
<ProjectPath />
48-
</CyberduckReference>
49-
</ItemDefinitionGroup>
5023

51-
<Import Project="$(GeneratedMSBuildDir)Version.props" Condition="Exists('$(GeneratedMSBuildDir)Version.props')" />
24+
<Import Project="$(BuildSupportDir)Cyberduck.Default.props" />
5225

53-
</Project>
26+
</Project>

‎Directory.Build.targets‎

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -16,84 +16,6 @@
1616

1717
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1818

19-
<Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.41" />
20-
21-
<PropertyGroup>
22-
<AssemblySearchPaths>$(LibDir);$(AssemblySearchPaths)</AssemblySearchPaths>
23-
</PropertyGroup>
24-
25-
<PropertyGroup Condition=" '$(TargetFramework)' != '' ">
26-
<LibDirFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net472'))">net472</LibDirFramework>
27-
<LibDirFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">net8.0</LibDirFramework>
28-
<AssemblySearchPaths Condition=" '$(LibDirFramework)' != '' ">$(LibDir)$(LibDirFramework)\;$(AssemblySearchPaths)</AssemblySearchPaths>
29-
</PropertyGroup>
30-
31-
<PropertyGroup Condition=" '$(TargetFramework)' != 'net472' ">
32-
<DefaultItemExcludes>$(DefaultItemExcludes);**/*net472*</DefaultItemExcludes>
33-
</PropertyGroup>
34-
<PropertyGroup Condition=" !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
35-
<DefaultItemExcludes>$(DefaultItemExcludes);**/*net8.0*</DefaultItemExcludes>
36-
</PropertyGroup>
37-
38-
<ItemGroup>
39-
<CyberduckReference Update="Bonjour">
40-
<ProjectPath>$(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.msbuildproj</ProjectPath>
41-
</CyberduckReference>
42-
<CyberduckReference Update="Bonjour.Native">
43-
<ProjectPath>$(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj</ProjectPath>
44-
</CyberduckReference>
45-
<CyberduckReference Update="Cli">
46-
<ProjectPath>$(CyberduckDir)cli\dll\Cyberduck.Cli.msbuildproj</ProjectPath>
47-
</CyberduckReference>
48-
<CyberduckReference Update="Core">
49-
<ProjectPath>$(CyberduckDir)core\dll\Cyberduck.Core.msbuildproj</ProjectPath>
50-
</CyberduckReference>
51-
<CyberduckReference Update="Core.Native">
52-
<ProjectPath>$(CyberduckDir)core\src\main\csharp\Cyberduck.Core.Native.csproj</ProjectPath>
53-
</CyberduckReference>
54-
<CyberduckReference Update="Core.Refresh">
55-
<ProjectPath>$(CyberduckDir)core\native\refresh\src\main\csharp\Cyberduck.Core.Refresh.csproj</ProjectPath>
56-
</CyberduckReference>
57-
<CyberduckReference Update="Cryptomator">
58-
<ProjectPath>$(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.msbuildproj</ProjectPath>
59-
</CyberduckReference>
60-
<CyberduckReference Update="Importer">
61-
<ProjectPath>$(CyberduckDir)importer\dll\Cyberduck.Importer.msbuildproj</ProjectPath>
62-
</CyberduckReference>
63-
<CyberduckReference Update="Protocols">
64-
<ProjectPath>$(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj</ProjectPath>
65-
</CyberduckReference>
66-
67-
<CyberduckProjectReference Include="@(CyberduckReference->HasMetadata('ProjectPath'))" Condition=" '$(BuildingInsideVisualStudio)'=='true' Or '$(BuildProjectReferences)'!='false' " />
68-
<CyberduckAssemblyReference Include="@(CyberduckReference)" Exclude="@(CyberduckProjectReference)" />
69-
<ProjectReference Include="@(CyberduckProjectReference->'%(ProjectPath)')">
70-
<Name>Cyberduck.%(Identity)</Name>
71-
</ProjectReference>
72-
<Reference Include="@(CyberduckAssemblyReference->'Cyberduck.%(Identity)')">
73-
<JavaClasspath>\\?\</JavaClasspath>
74-
</Reference>
75-
</ItemGroup>
76-
77-
<PropertyGroup>
78-
<!-- Fix .NET 8 Sdk RuntimeIdentifiers to align with .NET 9 Sdk -->
79-
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='win7-x86'">win-x86</RuntimeIdentifier>
80-
<RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='win7-x64'">win-x64</RuntimeIdentifier>
81-
</PropertyGroup>
82-
83-
<PropertyGroup Condition=" '$(NETCoreSdkVersion)'!='' ">
84-
<!-- Treat SDK 6.0.301 as last known to work. -->
85-
<NETSDKBeforeFeature>$([MSBuild]::VersionLessThanOrEquals('$(NETCoreSdkVersion)', '6.0.301'))</NETSDKBeforeFeature>
86-
<NETSDKAfterFix>$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '6.0.401'))</NETSDKAfterFix>
87-
<CoreCompileDependsOn Condition="!($(NETSDKBeforeFeature) or $(NETSDKAfterFix))">SDKFix_RemoveDuplicateAnalyzers;$(CoreCompileDependsOn)</CoreCompileDependsOn>
88-
</PropertyGroup>
89-
90-
<Target Name="SDKFix_RemoveDuplicateAnalyzers">
91-
<ItemGroup>
92-
<FilteredAnalyzer Include="@(Analyzer-&gt;Distinct())" />
93-
<Analyzer Remove="@(Analyzer)" />
94-
<Analyzer Include="@(FilteredAnalyzer)" />
95-
<FilteredAnalyzer Remove="@(FilteredAnalyzer)" />
96-
</ItemGroup>
97-
</Target>
19+
<Import Project="$(BuildSupportDir)Cyberduck.Default.targets" />
9820

9921
</Project>

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
</ItemGroup>
5151

5252
<PropertyGroup>
53-
<PackageVersions>@(PackageVersion->'%(Identity)'->Replace('.', '')->'Pkg%(Identity)Version=%(Version)')</PackageVersions>
53+
<PackageVersions>@(PackageVersion->'%(Identity)'->Replace('.', '_')->'Pkg%(Identity)Version=%(Version)')</PackageVersions>
5454
</PropertyGroup>
5555
</Project>

‎bonjour/dll/Cyberduck.Bonjour.msbuildproj‎ renamed to ‎bonjour/dll/Cyberduck.Bonjour.ikvmproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<Project Sdk="IKVM.NET.Sdk">
2-
32
<PropertyGroup>
43
<!--
54
Only really used in Cyberduck.
65
-->
76
<TargetFramework>net472</TargetFramework>
87
</PropertyGroup>
98

10-
<Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
11-
129
<ItemGroup>
1310
<CyberduckReference Include="Core" />
1411
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
1512

1613
<Convert Include="$(TargetBuildDir)*.jar" />
1714
</ItemGroup>
18-
1915
</Project>

‎bonjour/dll/build.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,26 @@
2121
-->
2222
<project name="Cyberduck Native Libraries" basedir=".">
2323

24-
<import file="../../build.xml"/>
24+
<import file="../../build.xml" />
2525

2626
<target name="restore" depends="msbuild">
27-
<msbuild buildfile="Cyberduck.Bonjour.msbuildproj">
27+
<msbuild buildfile="Cyberduck.Bonjour.ikvmproj">
2828
<target name="Restore" />
2929
</msbuild>
3030
</target>
3131

32-
<target name="build" if="platform.windows" depends="restore,msbuild">
33-
<msbuild buildfile="Cyberduck.Bonjour.msbuildproj">
32+
<target name="build" depends="restore,msbuild">
33+
<msbuild buildfile="Cyberduck.Bonjour.ikvmproj">
3434
<property name="Configuration" value="${msbuild.configuration}" />
3535
</msbuild>
3636
</target>
3737

38-
</project>
38+
<target name="pack" depends="msbuild">
39+
<msbuild buildfile="Cyberduck.Bonjour.ikvmproj">
40+
<target name="Pack" />
41+
42+
<property name="Configuration" value="${msbuild.configuration}" />
43+
</msbuild>
44+
</target>
45+
46+
</project>

‎bonjour/dll/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,16 @@
5050
<artifactId>build-helper-maven-plugin</artifactId>
5151
<executions>
5252
<execution>
53-
<id>install-dll</id>
54-
<phase>verify</phase>
53+
<id>install-nupkg</id>
54+
<phase>package</phase>
5555
<goals>
5656
<goal>attach-artifact</goal>
5757
</goals>
5858
<configuration>
5959
<artifacts>
6060
<artifact>
61-
<classifier>net472</classifier>
62-
<type>dll</type>
63-
<file>${project.build.directory}/net472/Cyberduck.Bonjour.dll</file>
61+
<type>nupkg</type>
62+
<file>${project.build.directory}/Cyberduck.Bonjour.${project.version}.nupkg</file>
6463
</artifact>
6564
</artifacts>
6665
</configuration>
@@ -76,9 +75,8 @@
7675
<dependency>
7776
<groupId>ch.cyberduck</groupId>
7877
<artifactId>Cyberduck.Core</artifactId>
79-
<classifier>net472</classifier>
78+
<type>nupkg</type>
8079
<version>${project.version}</version>
81-
<type>dll</type>
8280
</dependency>
8381
</dependencies>
8482
</profile>

‎bonjour/native/Directory.Build.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515

1616
<Project>
1717

18-
<PropertyGroup>
19-
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
20-
</PropertyGroup>
18+
<PropertyGroup>
19+
<AssemblyName>Cyberduck.Bonjour.Native</AssemblyName>
20+
<ModulePath Condition="'$(ModulePath)'==''">$(MSBuildThisFileDirectory)</ModulePath>
21+
</PropertyGroup>
2122

22-
<Import Project="../Directory.Build.props" />
23+
<Import Project="../Directory.Build.props" />
2324

24-
</Project>
25+
</Project>

‎bonjour/native/build.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,13 @@
3737
<property name="Configuration" value="${msbuild.configuration}"/>
3838
</msbuild>
3939
</target>
40+
41+
<target name="pack" depends="msbuild">
42+
<!-- Create DLL Cyberduck.Bonjour.Native -->
43+
<msbuild buildfile="src/main/nuget/nuget.proj">
44+
<target name="Restore;Pack"/>
45+
46+
<property name="Configuration" value="${msbuild.configuration}"/>
47+
</msbuild>
48+
</target>
4049
</project>

0 commit comments

Comments
 (0)