Skip to content

Commit f483255

Browse files
AliveDevilAliveDevil
committed
Packaging
1 parent c15e6c6 commit f483255

23 files changed

+238
-825
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ insert_final_newline = true
1212
charset = utf-8-bom
1313

1414
# XML project files
15-
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj}]
15+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj,ikvmproj}]
1616
indent_size = 2
1717

1818
# XML config files

‎Cyberduck.sln‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "duck", "duck", "{457F1D6D-8
2626
EndProject
2727
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cyberduck", "Cyberduck", "{7D32EE61-B6F0-4978-B500-45172B181283}"
2828
EndProject
29-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsVersionCustomAction", "windows\src\main\wix\WindowsVersionCustomAction\WindowsVersionCustomAction.vcxproj", "{FBA5EFE2-362B-4BAD-A748-3248F79468AC}"
30-
EndProject
3129
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Cyberduck.Bootstrapper", "windows\src\main\wix\Bootstrapper\Cyberduck.Bootstrapper.wixproj", "{00858CE5-437F-46BE-8A2E-519B552DBF7D}"
3230
EndProject
3331
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Cyberduck.Bundle", "windows\src\main\wix\Bundle\Cyberduck.Bundle.wixproj", "{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}"
3432
EndProject
35-
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "duck.bootstrapper", "cli\src\main\wix\Bootstrapper\duck.bootstrapper.wixproj", "{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}"
33+
Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "duck.bootstrapper", "cli\src\main\wix\Bootstrapper\duck.bootstrapper.wixproj", "{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}"
3634
EndProject
3735
Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "duck.bundle", "cli\src\main\wix\Bundle\duck.bundle.wixproj", "{F6975079-F730-4A31-9909-DE536E524764}"
3836
EndProject
@@ -93,18 +91,14 @@ Global
9391
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|x64.Build.0 = Debug|x64
9492
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|x64.ActiveCfg = Release|x64
9593
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|x64.Build.0 = Release|x64
96-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|x64.ActiveCfg = Debug|Win32
97-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|x64.Build.0 = Debug|Win32
98-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|x64.ActiveCfg = Release|Win32
99-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|x64.Build.0 = Release|Win32
100-
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.ActiveCfg = Debug|x86
101-
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.Build.0 = Debug|x86
102-
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.ActiveCfg = Release|x86
103-
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.Build.0 = Release|x86
104-
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.ActiveCfg = Debug|x86
105-
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.Build.0 = Debug|x86
106-
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.ActiveCfg = Release|x86
107-
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.Build.0 = Release|x86
94+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.ActiveCfg = Debug|x64
95+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.Build.0 = Debug|x64
96+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.ActiveCfg = Release|x64
97+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.Build.0 = Release|x64
98+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.ActiveCfg = Debug|x64
99+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.Build.0 = Debug|x64
100+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.ActiveCfg = Release|x64
101+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.Build.0 = Release|x64
108102
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.ActiveCfg = Debug|x64
109103
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.Build.0 = Debug|x64
110104
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.ActiveCfg = Release|x64
@@ -165,7 +159,6 @@ Global
165159
{B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
166160
{457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
167161
{7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
168-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC} = {7D32EE61-B6F0-4978-B500-45172B181283}
169162
{00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283}
170163
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283}
171164
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04} = {457F1D6D-8AEC-42E2-9211-2A8405C95019}

‎cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
22
<Package Name="Cyberduck CLI"
3-
Manufacturer="iterate GmbH"
4-
Version="$(ProductVersion)"
5-
UpgradeCode="98B2B672-3720-4CAC-BF3E-220757500AE0">
3+
Manufacturer="iterate GmbH"
4+
Version="$(ProductVersion)"
5+
UpgradeCode="98B2B672-3720-4CAC-BF3E-220757500AE0">
66
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
77
<MediaTemplate EmbedCab="true" />
88

99
<StandardDirectory Id="ProgramFiles64Folder">
10-
<Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)">
11-
<Files Include="$(duck.TargetDir)**" />
10+
<Directory Id="INSTALLFOLDER"
11+
Name="!(bind.Property.ProductName)">
12+
<Files Include="$(duck.TargetDir)**">
13+
<Exclude Files="**.pdb" />
14+
</Files>
1215

13-
<Component Id="SetEnvironment" Guid="B429556B-9604-45DD-896C-4AE7BFFBE9EB">
16+
<Component Id="SetEnvironment"
17+
Guid="B429556B-9604-45DD-896C-4AE7BFFBE9EB">
1418
<Environment Id="PathVar"
15-
Action="set"
16-
Part="last"
17-
Name="PATH"
18-
Permanent="no"
19-
System="yes"
20-
Value="[INSTALLFOLDER]" />
19+
Action="set"
20+
Part="last"
21+
Name="PATH"
22+
Permanent="no"
23+
System="yes"
24+
Value="[INSTALLFOLDER]" />
2125
</Component>
2226
</Directory>
2327
</StandardDirectory>

‎cli/src/main/wix/Bundle/duck.bundle.wixproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
ProductVersion=$(FileVersion)
77
</DefineConstants>
88
</PropertyGroup>
9-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
10-
<SignOutput Condition=" '$(SignOutput)' == '' ">false</SignOutput>
11-
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
13-
<SignOutput Condition=" '$(SignOutput)' == '' ">true</SignOutput>
14-
</PropertyGroup>
159
<ItemGroup>
1610
<ProjectReference Include="..\..\csharp\duck.csproj" Publish="true" />
1711
</ItemGroup>

‎core/native/refresh/src/main/csharp/Cyberduck.Core.Refresh.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,13 @@
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
</PackageReference>
4242
<PackageReference Include="ReactiveUI.WPF" />
43-
<PackageReference Include="System.Memory" />
4443
<PackageReference Include="System.Runtime.Caching" />
4544
</ItemGroup>
4645

46+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
47+
<PackageReference Include="System.Memory" />
48+
</ItemGroup>
49+
4750
<ItemGroup>
4851
<ImageResource Include="$(CyberduckDir)img\*.png" />
4952
<ImageResource Include="$(CyberduckDir)img\*.tiff" />

‎core/native/refresh/src/main/nuget/Cyberduck.Core.Refresh.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<dependency id="Cyberduck.Core.Native" version="$version$" />
1313
<dependency id="DotNetProjects.Extended.Wpf.Toolkit" version="$PkgDotNetProjects_Extended_Wpf_ToolkitVersion$" />
1414
<dependency id="ReactiveUI.WPF" version="$PkgReactiveUI_WPFVersion$" />
15-
<dependency id="System.Memory" version="$PkgSystem_MemoryVersion$" />
1615
<dependency id="System.Runtime.Caching" version="$PkgSystem_Runtime_CachingVersion$" />
1716
</group>
1817

1918
<group targetFramework="net472">
19+
<dependency id="System.Memory" version="$PkgSystem_MemoryVersion$" />
2020
</group>
2121

2222
<group targetFramework="net8.0-windows10.0.22621.0">

‎core/src/main/csharp/Cyberduck.Core.Native.csproj‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,10 @@
1515

1616
<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1717

18-
<PropertyGroup Condition="'$(Platform)'=='x64'">
19-
<TargetFrameworks>net472</TargetFrameworks>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="'$(TargetFramework)'=='net472'">
22-
<Platforms>x64</Platforms>
23-
</PropertyGroup>
2418
<PropertyGroup>
25-
<TargetFrameworks Condition="'$(TargetFrameworks)'==''">net472;net8.0-windows10.0.22621.0</TargetFrameworks>
26-
<Platforms Condition="'$(Platforms)'==''">x64;arm64</Platforms>
19+
<TargetFrameworks>net472;net8.0-windows10.0.22621.0</TargetFrameworks>
2720
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
21+
<Platforms>x64;arm64</Platforms>
2822
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2923
</PropertyGroup>
3024

@@ -45,13 +39,13 @@
4539
<PackageReference Include="ReactiveUI" />
4640
</ItemGroup>
4741

48-
<ItemGroup Condition=" '$(TargetFramework)' != '' And $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net472')) ">
42+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
4943
<PackageReference Include="Microsoft.Windows.SDK.Contracts" />
5044
<Reference Include="Microsoft.VisualBasic" />
5145
<Reference Include="System.Configuration" />
5246
<Reference Include="System.Security" />
5347
</ItemGroup>
54-
<ItemGroup Condition=" '$(TargetFramework)' != '' And $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
48+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETCoreApp'">
5549
<PackageReference Include="System.Configuration.ConfigurationManager" />
5650
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
5751
</ItemGroup>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"msbuild-sdks": {
3-
"IKVM.NET.Sdk": "8.11.0-dev.283",
3+
"IKVM.NET.Sdk": "8.11.2",
44
"Microsoft.Build.NoTargets": "3.7.56",
55
"Microsoft.Build.Traversal": "4.1.0",
66
"WixToolset.Sdk": "5.0.2"

‎windows/dirs.proj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup Condition=" '$(BuildInstaller)'=='True' ">
18-
<ProjectReference Include="src\main\wix\WindowsVersionCustomAction\WindowsVersionCustomAction.vcxproj" SetPlatform="Platform=Win32" />
19-
<ProjectReference Include="src\main\wix\Bundle\Cyberduck.Bundle.wixproj" />
20-
<ProjectReference Include="src\main\wix\Bootstrapper\Cyberduck.Bootstrapper.wixproj" />
18+
<ProjectReference Include="src\main\wix\Bundle\Cyberduck.Bundle.wixproj" SetPlatform="Platform=x64" />
19+
<ProjectReference Include="src\main\wix\Bootstrapper\Cyberduck.Bootstrapper.wixproj" SetPlatform="Platform=x64" />
2120
<ProjectReference Include="src\main\package\package.wapproj" SetPlatform="Platform=x64" />
2221
</ItemGroup>
2322
</Project>

‎windows/pom.xml‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@
7676
</target>
7777
</configuration>
7878
</execution>
79+
<execution>
80+
<id>pack-nupkg</id>
81+
<phase>none</phase>
82+
</execution>
7983
</executions>
8084
</plugin>
8185
</plugins>
@@ -84,57 +88,49 @@
8488
<dependency>
8589
<groupId>ch.cyberduck</groupId>
8690
<artifactId>Cyberduck.Core</artifactId>
87-
<classifier>net472</classifier>
88-
<type>dll</type>
91+
<type>nupkg</type>
8992
<version>${project.version}</version>
9093
</dependency>
9194
<dependency>
9295
<groupId>ch.cyberduck</groupId>
9396
<artifactId>Cyberduck.Core.Native</artifactId>
94-
<classifier>net472</classifier>
95-
<type>dll</type>
97+
<type>nupkg</type>
9698
<version>${project.version}</version>
9799
</dependency>
98100
<dependency>
99101
<groupId>ch.cyberduck</groupId>
100102
<artifactId>Cyberduck.Core.Refresh</artifactId>
101-
<classifier>net472</classifier>
102-
<type>dll</type>
103+
<type>nupkg</type>
103104
<version>${project.version}</version>
104105
</dependency>
105106
<dependency>
106107
<groupId>ch.cyberduck</groupId>
107108
<artifactId>Cyberduck.Protocols</artifactId>
108-
<classifier>net472</classifier>
109-
<type>dll</type>
109+
<type>nupkg</type>
110110
<version>${project.version}</version>
111111
</dependency>
112112
<dependency>
113113
<groupId>ch.cyberduck</groupId>
114114
<artifactId>Cyberduck.Bonjour</artifactId>
115-
<classifier>net472</classifier>
116-
<type>dll</type>
115+
<type>nupkg</type>
117116
<version>${project.version}</version>
118117
</dependency>
119118
<dependency>
120119
<groupId>ch.cyberduck</groupId>
121120
<artifactId>Cyberduck.Bonjour.Native</artifactId>
122-
<classifier>net472</classifier>
123-
<type>dll</type>
121+
<type>nupkg</type>
124122
<version>${project.version}</version>
125123
</dependency>
126124
<dependency>
127125
<groupId>ch.cyberduck</groupId>
128126
<artifactId>Cyberduck.Importer</artifactId>
129-
<classifier>net472</classifier>
130-
<type>dll</type>
127+
<type>nupkg</type>
131128
<version>${project.version}</version>
132129
</dependency>
133130
<dependency>
134131
<groupId>ch.cyberduck</groupId>
135132
<artifactId>Cyberduck.Cryptomator</artifactId>
136-
<classifier>net472</classifier>
137-
<type>dll</type>
133+
<type>nupkg</type>
138134
<version>${project.version}</version>
139135
</dependency>
140136
<dependency>

0 commit comments

Comments
 (0)