Skip to content

Commit a089fd8

Browse files
AliveDevilAliveDevil
committed
Migrate to ikvmnet
1 parent a57784e commit a089fd8

Some content is hidden

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

61 files changed

+817
-656
lines changed

‎.github/workflows/build.yml

+7
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ jobs:
3131
if: runner.os == 'windows'
3232
with:
3333
msbuild-architecture: x64
34+
- name: "NuGet"
35+
if: runner.os == 'windows'
36+
env:
37+
NugetCredentials: "Username=${{ github.actor }};Password=${{ secrets.GITHUB_TOKEN }}"
38+
run: |
39+
echo "NuGetPackageSourceCredentials_gh-ikvmnet=${{ env.NugetCredentials }}" >> $env:GITHUB_ENV
40+
echo "NuGetPackageSourceCredentials_gh-iterate-ch=${{ env.NugetCredentials }}" >> $env:GITHUB_ENV
3441
- name: Cache local Maven repository
3542
uses: actions/cache@v4
3643
with:

‎Cyberduck.sln

+131-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 17
43
VisualStudioVersion = 17.0.31825.309
@@ -52,12 +51,36 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "i18n-gen", "core\i18n-gen\i
5251
EndProject
5352
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "package", "windows\src\main\package\package.wapproj", "{55CDD736-9A8A-4091-AC99-60E2F9C73269}"
5453
EndProject
54+
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}"
55+
EndProject
56+
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}"
57+
EndProject
58+
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.msbuildproj", "{C9B1C169-1354-4348-9938-7892399C6336}"
59+
EndProject
60+
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}"
61+
EndProject
62+
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}"
63+
EndProject
64+
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}"
65+
EndProject
5566
Global
5667
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5768
Debug|Windows = Debug|Windows
5869
Release|Windows = Release|Windows
5970
EndGlobalSection
6071
GlobalSection(ProjectConfigurationPlatforms) = postSolution
72+
{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|Windows.ActiveCfg = Debug|Any CPU
73+
{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|Windows.Build.0 = Debug|Any CPU
74+
{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|Windows.ActiveCfg = Release|Any CPU
75+
{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|Windows.Build.0 = Release|Any CPU
76+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|Windows.ActiveCfg = Debug|Any CPU
77+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|Windows.Build.0 = Debug|Any CPU
78+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|Windows.ActiveCfg = Release|Any CPU
79+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|Windows.Build.0 = Release|Any CPU
80+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|Windows.ActiveCfg = Debug|Any CPU
81+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|Windows.Build.0 = Debug|Any CPU
82+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|Windows.ActiveCfg = Release|Any CPU
83+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|Windows.Build.0 = Release|Any CPU
6184
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.ActiveCfg = Debug|x64
6285
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.Build.0 = Debug|x64
6386
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|Windows.ActiveCfg = Release|x64
@@ -78,12 +101,113 @@ Global
78101
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|Windows.Build.0 = Debug|x64
79102
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.ActiveCfg = Release|x64
80103
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.Build.0 = Release|x64
104+
{9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|Windows.ActiveCfg = Debug|Any CPU
105+
{9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|Windows.Build.0 = Debug|Any CPU
106+
{9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|Windows.ActiveCfg = Release|Any CPU
107+
{9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|Windows.Build.0 = Release|Any CPU
108+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|Windows.ActiveCfg = Debug|Any CPU
109+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|Windows.Build.0 = Debug|Any CPU
110+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|Windows.ActiveCfg = Release|Any CPU
111+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|Windows.Build.0 = Release|Any CPU
81112
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.ActiveCfg = Debug|x64
82113
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.Build.0 = Debug|x64
83114
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.ActiveCfg = Release|x64
84115
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.Build.0 = Release|x64
116+
{C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.ActiveCfg = Debug|Any CPU
117+
{C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.Build.0 = Debug|Any CPU
118+
{C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.ActiveCfg = Release|Any CPU
119+
{C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.Build.0 = Release|Any CPU
120+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.ActiveCfg = Debug|Win32
121+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.Build.0 = Debug|Win32
122+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.ActiveCfg = Release|Win32
123+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.Build.0 = Release|Win32
124+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.ActiveCfg = Debug|x86
125+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.Build.0 = Debug|x86
126+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.ActiveCfg = Release|x86
127+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.Build.0 = Release|x86
128+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.ActiveCfg = Debug|x86
129+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.Build.0 = Debug|x86
130+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.ActiveCfg = Release|x86
131+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.Build.0 = Release|x86
132+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.ActiveCfg = Debug|x86
133+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.Build.0 = Debug|x86
134+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.ActiveCfg = Release|x86
135+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.Build.0 = Release|x86
136+
{F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.ActiveCfg = Debug|x86
137+
{F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.Build.0 = Debug|x86
138+
{F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.ActiveCfg = Release|x86
139+
{F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.Build.0 = Release|x86
140+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.ActiveCfg = Debug|x64
141+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.Build.0 = Debug|x64
142+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.ActiveCfg = Release|x64
143+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.Build.0 = Release|x64
144+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.ActiveCfg = Debug|Any CPU
145+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.Build.0 = Debug|Any CPU
146+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.ActiveCfg = Release|Any CPU
147+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.Build.0 = Release|Any CPU
148+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.ActiveCfg = Debug|x64
149+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Build.0 = Debug|x64
150+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Deploy.0 = Debug|x64
151+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.ActiveCfg = Release|x64
152+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.Build.0 = Release|x64
153+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.Deploy.0 = Release|x64
154+
EndGlobalSection
155+
GlobalSection(SolutionProperties) = preSolution
156+
HideSolutionNode = FALSE
157+
EndGlobalSection
158+
GlobalSection(NestedProjects) = preSolution
159+
{1B4DFDAD-C676-4338-B435-F2F62D79E096} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
160+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
161+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
162+
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
163+
{1926AB55-690C-4081-99D5-170847C206D9} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
164+
{581C7683-D22D-4346-B3BF-DC2936231C46} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
165+
{2287E64E-3515-4324-9833-553348295C15} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
166+
{72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
167+
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
168+
{9C7B827F-AE30-44C4-A210-E49DF883C720} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
169+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
170+
{B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
171+
{457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
172+
{7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
173+
{C9B1C169-1354-4348-9938-7892399C6336} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
174+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC} = {7D32EE61-B6F0-4978-B500-45172B181283}
175+
{00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283}
176+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283}
177+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04} = {457F1D6D-8AEC-42E2-9211-2A8405C95019}
178+
{F6975079-F730-4A31-9909-DE536E524764} = {457F1D6D-8AEC-42E2-9211-2A8405C95019}
179+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
180+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
181+
{55CDD736-9A8A-4091-AC99-60E2F9C73269} = {7D32EE61-B6F0-4978-B500-45172B181283}
182+
EndGlobalSection
183+
GlobalSection(ExtensibilityGlobals) = postSolution
184+
SolutionGuid = {289E6003-15D5-4377-ADA6-2E7093785BCD}
185+
EndGlobalSection
186+
EndGlobal
187+
|Windows.ActiveCfg = Debug|Any CPU
188+
{C9B1C169-1354-4348-9938-7892399C6336}.Debug|Windows.Build.0 = Debug|Any CPU
189+
{C9B1C169-1354-4348-9938-7892399C6336}.Release|Any CPU.ActiveCfg = Release|Any CPU
190+
{C9B1C169-1354-4348-9938-7892399C6336}.Release|Any CPU.Build.0 = Release|Any CPU
191+
{C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.ActiveCfg = Release|Any CPU
192+
{C9B1C169-1354-4348-9938-7892399C6336}.Release|Windows.Build.0 = Release|Any CPU
193+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Any CPU.ActiveCfg = Debug|x64
194+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Any CPU.Build.0 = Debug|x64
195+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Any CPU.ActiveCfg = Release|x64
196+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Any CPU.Build.0 = Release|x64
197+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Any CPU.ActiveCfg = Debug|x86
198+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Any CPU.Build.0 = Debug|x86
199+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Any CPU.ActiveCfg = Release|x86
200+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Any CPU.Build.0 = Release|x86
201+
{F6975079-F730-4A31-9909-DE536E524764}.Debug|Any CPU.ActiveCfg = Debug|x86
202+
{F6975079-F730-4A31-9909-DE536E524764}.Debug|Any CPU.Build.0 = Debug|x86
203+
{F6975079-F730-4A31-9909-DE536E524764}.Release|Any CPU.ActiveCfg = Release|x86
204+
{F6975079-F730-4A31-9909-DE536E524764}.Release|Any CPU.Build.0 = Release|x86
205+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Any CPU.ActiveCfg = Debug|Win32
206+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Any CPU.Build.0 = Debug|Win32
85207
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.ActiveCfg = Debug|Win32
86208
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.Build.0 = Debug|Win32
209+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Any CPU.ActiveCfg = Release|Win32
210+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Any CPU.Build.0 = Release|Win32
87211
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.ActiveCfg = Release|Win32
88212
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.Build.0 = Release|Win32
89213
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.ActiveCfg = Debug|x86
@@ -121,15 +245,21 @@ Global
121245
HideSolutionNode = FALSE
122246
EndGlobalSection
123247
GlobalSection(NestedProjects) = preSolution
248+
{1B4DFDAD-C676-4338-B435-F2F62D79E096} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
249+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
250+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
124251
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
125252
{1926AB55-690C-4081-99D5-170847C206D9} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
126253
{581C7683-D22D-4346-B3BF-DC2936231C46} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
127254
{2287E64E-3515-4324-9833-553348295C15} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
128255
{72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
129256
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
257+
{9C7B827F-AE30-44C4-A210-E49DF883C720} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
258+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
130259
{B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
131260
{457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
132261
{7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
262+
{C9B1C169-1354-4348-9938-7892399C6336} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
133263
{FBA5EFE2-362B-4BAD-A748-3248F79468AC} = {7D32EE61-B6F0-4978-B500-45172B181283}
134264
{00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283}
135265
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283}

‎Directory.Build.Java.props

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<LangVersion>1.8</LangVersion>
5+
<EnableDefaultItems>false</EnableDefaultItems>
6+
<CompileStatically>true</CompileStatically>
7+
<ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
8+
</PropertyGroup>
9+
10+
</Project>

‎Directory.Build.props

+1-18
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<OutputPath>$(BaseOutputPath)</OutputPath>
3232

3333
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
34+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
3435
<LangVersion>12</LangVersion>
3536
</PropertyGroup>
3637

@@ -40,22 +41,4 @@
4041
</CyberduckReference>
4142
</ItemDefinitionGroup>
4243

43-
<ItemGroup>
44-
<IKVM Include="IKVM.OpenJDK.Beans" />
45-
<IKVM Include="IKVM.OpenJDK.Charsets" />
46-
<IKVM Include="IKVM.OpenJDK.Core" />
47-
<IKVM Include="IKVM.OpenJDK.Jdbc" />
48-
<IKVM Include="IKVM.OpenJDK.Localedata" />
49-
<IKVM Include="IKVM.OpenJDK.Security" />
50-
<IKVM Include="IKVM.OpenJDK.Text" />
51-
<IKVM Include="IKVM.OpenJDK.XML.API" />
52-
<IKVM Include="IKVM.OpenJDK.XML.Bind" />
53-
<IKVM Include="IKVM.OpenJDK.XML.Parse" />
54-
<IKVM Include="IKVM.OpenJDK.XML.Transform" />
55-
<IKVM Include="IKVM.OpenJDK.XML.XPath" />
56-
<IKVM Include="IKVM.Runtime" />
57-
<IKVM Include="IKVM.Runtime.JNI" />
58-
59-
<IKVMReferences Include="@(IKVM)" HintPath="$(TargetBuildDir)ikvm\bin\%(Identity).dll" />
60-
</ItemGroup>
6144
</Project>

‎Directory.Build.targets

+22-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,32 @@
1919
<Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.41" />
2020

2121
<ItemGroup>
22+
<CyberduckReference Update="Bonjour">
23+
<ProjectPath>$(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.msbuildproj</ProjectPath>
24+
</CyberduckReference>
25+
<CyberduckReference Update="Bonjour.Native">
26+
<ProjectPath>$(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj</ProjectPath>
27+
</CyberduckReference>
28+
<CyberduckReference Update="Cli">
29+
<ProjectPath>$(CyberduckDir)cli\dll\Cyberduck.Cli.msbuildproj</ProjectPath>
30+
</CyberduckReference>
31+
<CyberduckReference Update="Core">
32+
<ProjectPath>$(CyberduckDir)core\dll\Cyberduck.Core.msbuildproj</ProjectPath>
33+
</CyberduckReference>
2234
<CyberduckReference Update="Core.Native">
2335
<ProjectPath>$(CyberduckDir)core\src\main\csharp\Cyberduck.Core.Native.csproj</ProjectPath>
2436
</CyberduckReference>
2537
<CyberduckReference Update="Core.Refresh">
2638
<ProjectPath>$(CyberduckDir)core\native\refresh\src\main\csharp\Cyberduck.Core.Refresh.csproj</ProjectPath>
2739
</CyberduckReference>
28-
<CyberduckReference Update="Bonjour.Native">
29-
<ProjectPath>$(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj</ProjectPath>
40+
<CyberduckReference Update="Cryptomator">
41+
<ProjectPath>$(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.msbuildproj</ProjectPath>
42+
</CyberduckReference>
43+
<CyberduckReference Update="Importer">
44+
<ProjectPath>$(CyberduckDir)importer\dll\Cyberduck.Importer.msbuildproj</ProjectPath>
45+
</CyberduckReference>
46+
<CyberduckReference Update="Protocols">
47+
<ProjectPath>$(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj</ProjectPath>
3048
</CyberduckReference>
3149
</ItemGroup>
3250

@@ -57,5 +75,7 @@
5775
<FilteredAnalyzer Remove="@(FilteredAnalyzer)" />
5876
</ItemGroup>
5977
</Target>
78+
79+
<Target Name="_ExportReference" />
6080

6181
</Project>

‎Packages.props

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<PackageReference Update="CommunityToolkit.Mvvm" Version="8.2.2" />
2020
<PackageReference Update="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.100" />
2121
<PackageReference Update="ExceptionReporter " Version="2.4.2" />
22+
<PackageReference Update="IKVM" Version="8.10.0-dev.62" />
2223
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.1.0" />
2324
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0" />
2425
<PackageReference Update="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
@@ -37,4 +38,4 @@
3738

3839
<GlobalPackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true" />
3940
</ItemGroup>
40-
</Project>
41+
</Project>

‎bonjour/dll/Cyberduck.Bonjour.msbuildproj

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="IKVM.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net472</TargetFramework>
4+
</PropertyGroup>
5+
6+
<ItemGroup>
7+
<CyberduckReference Include="Core" />
8+
9+
<Convert Include="$(TargetBuildDir)ch.cyberduck.bonjour.jar" />
10+
<Convert Include="$(TargetBuildDir)com.apple.dnssd.jar" />
11+
</ItemGroup>
12+
</Project>

‎bonjour/dll/Directory.Build.props

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
~ Copyright (c) 2002-2019 iterate GmbH. All rights reserved.
3+
~ https://cyberduck.io/
4+
~
5+
~ This program is free software; you can redistribute it and/or modify
6+
~ it under the terms of the GNU General Public License as published by
7+
~ the Free Software Foundation, either version 3 of the License, or
8+
~ (at your option) any later version.
9+
~
10+
~ This program is distributed in the hope that it will be useful,
11+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
~ GNU General Public License for more details.
14+
-->
15+
16+
<Project>
17+
18+
<PropertyGroup>
19+
<ModulePath Condition=" '$(ModulePath)' == '' ">$(MSBuildThisFileDirectory)</ModulePath>
20+
</PropertyGroup>
21+
22+
<Import Project="../Directory.Build.props" />
23+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.Java.props', '$(MSBuildThisFileDirectory)../'))" />
24+
25+
</Project>

0 commit comments

Comments
 (0)