Skip to content

Commit 3bdb5a8

Browse files
dkocherdkocher
authored
Merge pull request #16157 from iterate-ch/feature/10-ikvmnet
Migrate to ikvmnet
2 parents 6aa913b + 5abf67e commit 3bdb5a8

File tree

148 files changed

+1954
-2370
lines changed

Some content is hidden

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

148 files changed

+1954
-2370
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,msbuildproj}]
1616
indent_size = 2
1717

1818
# XML config files

‎.github/workflows/build.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
permissions:
1111
checks: write
1212
contents: read
13+
packages: read
1314
runs-on: ${{ matrix.os }}
1415
strategy:
1516
fail-fast: false
@@ -35,6 +36,20 @@ jobs:
3536
if: runner.os == 'windows'
3637
with:
3738
msbuild-architecture: x64
39+
- name: "NuGet"
40+
if: runner.os == 'windows'
41+
env:
42+
NugetCredentials: "Username=${{ github.actor }};Password=${{ secrets.GITHUB_TOKEN }}"
43+
run: |
44+
echo "NuGetPackageSourceCredentials_gh-ikvmnet=${{ env.NugetCredentials }}" >> $env:GITHUB_ENV
45+
echo "NuGetPackageSourceCredentials_gh-iterate-ch=${{ env.NugetCredentials }}" >> $env:GITHUB_ENV
46+
- name: Cache local Maven repository
47+
uses: actions/cache@v4
48+
with:
49+
path: ~/.m2/repository
50+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
51+
restore-keys: |
52+
${{ runner.os }}-maven-
3853
- name: Build with Maven
3954
run: mvn --no-transfer-progress verify -DskipITs -DskipSign ${{ env.args }} --batch-mode -Drevision=0
4055
- name: Publish Test Report

‎.github/workflows/snapshot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
- master
77
jobs:
88
snapshot:
9+
permissions:
10+
checks: write
11+
contents: read
12+
packages: read
913
runs-on: ${{ matrix.os }}
1014
strategy:
1115
fail-fast: false

‎Cyberduck.sln‎

Lines changed: 102 additions & 61 deletions
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,84 +51,126 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}"
55+
EndProject
56+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}"
57+
EndProject
58+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.msbuildproj", "{C9B1C169-1354-4348-9938-7892399C6336}"
59+
EndProject
60+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}"
61+
EndProject
62+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}"
63+
EndProject
64+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}"
65+
EndProject
5566
Global
5667
GlobalSection(SolutionConfigurationPlatforms) = preSolution
57-
Debug|Windows = Debug|Windows
58-
Release|Windows = Release|Windows
68+
Debug|x64 = Debug|x64
69+
Release|x64 = Release|x64
5970
EndGlobalSection
6071
GlobalSection(ProjectConfigurationPlatforms) = postSolution
61-
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.ActiveCfg = Debug|x64
62-
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.Build.0 = Debug|x64
63-
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|Windows.ActiveCfg = Release|x64
64-
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|Windows.Build.0 = Release|x64
65-
{1926AB55-690C-4081-99D5-170847C206D9}.Debug|Windows.ActiveCfg = Debug|x64
66-
{1926AB55-690C-4081-99D5-170847C206D9}.Debug|Windows.Build.0 = Debug|x64
67-
{1926AB55-690C-4081-99D5-170847C206D9}.Release|Windows.ActiveCfg = Release|x64
68-
{1926AB55-690C-4081-99D5-170847C206D9}.Release|Windows.Build.0 = Release|x64
69-
{581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|Windows.ActiveCfg = Debug|x64
70-
{581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|Windows.Build.0 = Debug|x64
71-
{581C7683-D22D-4346-B3BF-DC2936231C46}.Release|Windows.ActiveCfg = Release|x64
72-
{581C7683-D22D-4346-B3BF-DC2936231C46}.Release|Windows.Build.0 = Release|x64
73-
{2287E64E-3515-4324-9833-553348295C15}.Debug|Windows.ActiveCfg = Debug|x64
74-
{2287E64E-3515-4324-9833-553348295C15}.Debug|Windows.Build.0 = Debug|x64
75-
{2287E64E-3515-4324-9833-553348295C15}.Release|Windows.ActiveCfg = Release|x64
76-
{2287E64E-3515-4324-9833-553348295C15}.Release|Windows.Build.0 = Release|x64
77-
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|Windows.ActiveCfg = Debug|x64
78-
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|Windows.Build.0 = Debug|x64
79-
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.ActiveCfg = Release|x64
80-
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.Build.0 = Release|x64
81-
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.ActiveCfg = Debug|x64
82-
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.Build.0 = Debug|x64
83-
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.ActiveCfg = Release|x64
84-
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.Build.0 = Release|x64
85-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.ActiveCfg = Debug|Win32
86-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.Build.0 = Debug|Win32
87-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.ActiveCfg = Release|Win32
88-
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.Build.0 = Release|Win32
89-
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.ActiveCfg = Debug|x86
90-
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.Build.0 = Debug|x86
91-
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.ActiveCfg = Release|x86
92-
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.Build.0 = Release|x86
93-
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.ActiveCfg = Debug|x86
94-
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.Build.0 = Debug|x86
95-
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.ActiveCfg = Release|x86
96-
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.Build.0 = Release|x86
97-
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.ActiveCfg = Debug|x86
98-
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.Build.0 = Debug|x86
99-
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.ActiveCfg = Release|x86
100-
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.Build.0 = Release|x86
101-
{F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.ActiveCfg = Debug|x86
102-
{F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.Build.0 = Debug|x86
103-
{F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.ActiveCfg = Release|x86
104-
{F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.Build.0 = Release|x86
105-
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.ActiveCfg = Debug|x64
106-
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.Build.0 = Debug|x64
107-
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.ActiveCfg = Release|x64
108-
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.Build.0 = Release|x64
109-
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.ActiveCfg = Debug|Any CPU
110-
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.Build.0 = Debug|Any CPU
111-
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.ActiveCfg = Release|Any CPU
112-
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.Build.0 = Release|Any CPU
113-
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.ActiveCfg = Debug|x64
114-
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Build.0 = Debug|x64
115-
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Deploy.0 = Debug|x64
116-
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.ActiveCfg = Release|x64
117-
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.Build.0 = Release|x64
118-
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.Deploy.0 = Release|x64
72+
{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|x64.ActiveCfg = Debug|Any CPU
73+
{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|x64.Build.0 = Debug|Any CPU
74+
{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|x64.ActiveCfg = Release|Any CPU
75+
{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|x64.Build.0 = Release|Any CPU
76+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|x64.ActiveCfg = Debug|Any CPU
77+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|x64.Build.0 = Debug|Any CPU
78+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|x64.ActiveCfg = Release|Any CPU
79+
{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|x64.Build.0 = Release|Any CPU
80+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|x64.ActiveCfg = Debug|Any CPU
81+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|x64.Build.0 = Debug|Any CPU
82+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|x64.ActiveCfg = Release|Any CPU
83+
{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|x64.Build.0 = Release|Any CPU
84+
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|x64.ActiveCfg = Debug|x64
85+
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|x64.Build.0 = Debug|x64
86+
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|x64.ActiveCfg = Release|x64
87+
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|x64.Build.0 = Release|x64
88+
{1926AB55-690C-4081-99D5-170847C206D9}.Debug|x64.ActiveCfg = Debug|Any CPU
89+
{1926AB55-690C-4081-99D5-170847C206D9}.Debug|x64.Build.0 = Debug|Any CPU
90+
{1926AB55-690C-4081-99D5-170847C206D9}.Release|x64.ActiveCfg = Release|Any CPU
91+
{1926AB55-690C-4081-99D5-170847C206D9}.Release|x64.Build.0 = Release|Any CPU
92+
{581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|x64.ActiveCfg = Debug|x64
93+
{581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|x64.Build.0 = Debug|x64
94+
{581C7683-D22D-4346-B3BF-DC2936231C46}.Release|x64.ActiveCfg = Release|x64
95+
{581C7683-D22D-4346-B3BF-DC2936231C46}.Release|x64.Build.0 = Release|x64
96+
{2287E64E-3515-4324-9833-553348295C15}.Debug|x64.ActiveCfg = Debug|x64
97+
{2287E64E-3515-4324-9833-553348295C15}.Debug|x64.Build.0 = Debug|x64
98+
{2287E64E-3515-4324-9833-553348295C15}.Release|x64.ActiveCfg = Release|x64
99+
{2287E64E-3515-4324-9833-553348295C15}.Release|x64.Build.0 = Release|x64
100+
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|x64.ActiveCfg = Debug|x64
101+
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|x64.Build.0 = Debug|x64
102+
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|x64.ActiveCfg = Release|x64
103+
{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|x64.Build.0 = Release|x64
104+
{9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|x64.ActiveCfg = Debug|Any CPU
105+
{9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|x64.Build.0 = Debug|Any CPU
106+
{9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|x64.ActiveCfg = Release|Any CPU
107+
{9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|x64.Build.0 = Release|Any CPU
108+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|x64.ActiveCfg = Debug|Any CPU
109+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|x64.Build.0 = Debug|Any CPU
110+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|x64.ActiveCfg = Release|Any CPU
111+
{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|x64.Build.0 = Release|Any CPU
112+
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|x64.ActiveCfg = Debug|x64
113+
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|x64.Build.0 = Debug|x64
114+
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|x64.ActiveCfg = Release|x64
115+
{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|x64.Build.0 = Release|x64
116+
{C9B1C169-1354-4348-9938-7892399C6336}.Debug|x64.ActiveCfg = Debug|Any CPU
117+
{C9B1C169-1354-4348-9938-7892399C6336}.Debug|x64.Build.0 = Debug|Any CPU
118+
{C9B1C169-1354-4348-9938-7892399C6336}.Release|x64.ActiveCfg = Release|Any CPU
119+
{C9B1C169-1354-4348-9938-7892399C6336}.Release|x64.Build.0 = Release|Any CPU
120+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|x64.ActiveCfg = Debug|Win32
121+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|x64.Build.0 = Debug|Win32
122+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|x64.ActiveCfg = Release|Win32
123+
{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|x64.Build.0 = Release|Win32
124+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.ActiveCfg = Debug|x86
125+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.Build.0 = Debug|x86
126+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.ActiveCfg = Release|x86
127+
{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.Build.0 = Release|x86
128+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.ActiveCfg = Debug|x86
129+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.Build.0 = Debug|x86
130+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.ActiveCfg = Release|x86
131+
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.Build.0 = Release|x86
132+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.ActiveCfg = Debug|x86
133+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.Build.0 = Debug|x86
134+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.ActiveCfg = Release|x86
135+
{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.Build.0 = Release|x86
136+
{F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.ActiveCfg = Debug|x86
137+
{F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.Build.0 = Debug|x86
138+
{F6975079-F730-4A31-9909-DE536E524764}.Release|x64.ActiveCfg = Release|x86
139+
{F6975079-F730-4A31-9909-DE536E524764}.Release|x64.Build.0 = Release|x86
140+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|x64.ActiveCfg = Debug|x64
141+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|x64.Build.0 = Debug|x64
142+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|x64.ActiveCfg = Release|x64
143+
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|x64.Build.0 = Release|x64
144+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|x64.ActiveCfg = Debug|Any CPU
145+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|x64.Build.0 = Debug|Any CPU
146+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|x64.ActiveCfg = Release|Any CPU
147+
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|x64.Build.0 = Release|Any CPU
148+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.ActiveCfg = Debug|x64
149+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.Build.0 = Debug|x64
150+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.Deploy.0 = Debug|x64
151+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.ActiveCfg = Release|x64
152+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.Build.0 = Release|x64
153+
{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.Deploy.0 = Release|x64
119154
EndGlobalSection
120155
GlobalSection(SolutionProperties) = preSolution
121156
HideSolutionNode = FALSE
122157
EndGlobalSection
123158
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}
124162
{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
125163
{1926AB55-690C-4081-99D5-170847C206D9} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
126164
{581C7683-D22D-4346-B3BF-DC2936231C46} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
127165
{2287E64E-3515-4324-9833-553348295C15} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
128166
{72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
129167
{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}
130170
{B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
131171
{457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
132172
{7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
173+
{C9B1C169-1354-4348-9938-7892399C6336} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
133174
{FBA5EFE2-362B-4BAD-A748-3248F79468AC} = {7D32EE61-B6F0-4978-B500-45172B181283}
134175
{00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283}
135176
{65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283}

‎Directory.Build.Java.props‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project>
2+
3+
<PropertyGroup Label="IKVM">
4+
<ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
5+
<EnableDefaultItems>false</EnableDefaultItems>
6+
<LangVersion>1.8</LangVersion>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Label="MSBuild">
10+
<!--
11+
Skip expected diagnostics.
12+
Catch authoring/dependency issues in automated Tests.
13+
14+
IKVM0100: Class Not Found
15+
IKVM0101: Class Format Error (not Java 8)
16+
IKVM0105: Missing Class
17+
IKVM0111: Emitted NoClassDefFoundError
18+
-->
19+
<NoWarn>IKVM0100;IKVM0101;IKVM0105;IKVM0111;$(NoWarn)</NoWarn>
20+
</PropertyGroup>
21+
22+
</Project>

‎Directory.Build.props‎

Lines changed: 35 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,46 +16,38 @@
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-
24-
<PropertyGroup>
25-
<CyberduckDir>$(MSBuildThisFileDirectory)</CyberduckDir>
26-
<TargetBuildDir>$(ModulePath)target\</TargetBuildDir>
27-
28-
<BaseIntermediateOutputPath>$(TargetBuildDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
29-
<BaseOutputPath>$(TargetBuildDir)</BaseOutputPath>
30-
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
31-
<OutputPath>$(BaseOutputPath)</OutputPath>
32-
33-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
34-
<LangVersion>12</LangVersion>
35-
</PropertyGroup>
36-
37-
<ItemDefinitionGroup>
38-
<CyberduckReference>
39-
<ProjectPath />
40-
</CyberduckReference>
41-
</ItemDefinitionGroup>
42-
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>
61-
</Project>
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+
24+
<PropertyGroup>
25+
<CyberduckDir>$(MSBuildThisFileDirectory)</CyberduckDir>
26+
<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>
43+
</PropertyGroup>
44+
45+
<ItemDefinitionGroup>
46+
<CyberduckReference>
47+
<ProjectPath />
48+
</CyberduckReference>
49+
</ItemDefinitionGroup>
50+
51+
<Import Project="$(GeneratedMSBuildDir)Version.props" Condition="Exists('$(GeneratedMSBuildDir)Version.props')" />
52+
53+
</Project>

0 commit comments

Comments
 (0)