Migrate to ikvmnet

.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}]
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,wixproj,msbuildproj}]
 indent_size = 2
 
 # XML config files

.github/workflows/build.yml

@@ -10,6 +10,7 @@ jobs:
     permissions:
       checks: write
       contents: read
+      packages: read
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -35,6 +36,20 @@ jobs:
         if: runner.os == 'windows'
         with:
           msbuild-architecture: x64
+      - name: "NuGet"
+        if: runner.os == 'windows'
+        env:
+          NugetCredentials: "Username=${{ github.actor }};Password=${{ secrets.GITHUB_TOKEN }}"
+        run: |
+          echo "NuGetPackageSourceCredentials_gh-ikvmnet=${{ env.NugetCredentials }}" >> $env:GITHUB_ENV
+          echo "NuGetPackageSourceCredentials_gh-iterate-ch=${{ env.NugetCredentials }}" >> $env:GITHUB_ENV
+      - name: Cache local Maven repository
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
       - name: Build with Maven
         run: mvn --no-transfer-progress verify -DskipITs -DskipSign ${{ env.args }} --batch-mode -Drevision=0
       - name: Publish Test Report

Cyberduck.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31825.309
@@ -52,84 +51,126 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "i18n-gen", "core\i18n-gen\i
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "package", "windows\src\main\package\package.wapproj", "{55CDD736-9A8A-4091-AC99-60E2F9C73269}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Core", "core\dll\Cyberduck.Core.msbuildproj", "{1B4DFDAD-C676-4338-B435-F2F62D79E096}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Importer", "importer\dll\Cyberduck.Importer.msbuildproj", "{C9B1C169-1354-4348-9938-7892399C6336}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9C7B827F-AE30-44C4-A210-E49DF883C720}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{7EFC0398-8F4D-4850-BBE3-A0CC85410559}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{2D33598A-21A1-4117-82DC-250F4CE8D5E5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Windows = Debug|Windows
-		Release|Windows = Release|Windows
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.ActiveCfg = Debug|x64
-		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|Windows.Build.0 = Debug|x64
-		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|Windows.ActiveCfg = Release|x64
-		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|Windows.Build.0 = Release|x64
-		{1926AB55-690C-4081-99D5-170847C206D9}.Debug|Windows.ActiveCfg = Debug|x64
-		{1926AB55-690C-4081-99D5-170847C206D9}.Debug|Windows.Build.0 = Debug|x64
-		{1926AB55-690C-4081-99D5-170847C206D9}.Release|Windows.ActiveCfg = Release|x64
-		{1926AB55-690C-4081-99D5-170847C206D9}.Release|Windows.Build.0 = Release|x64
-		{581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|Windows.ActiveCfg = Debug|x64
-		{581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|Windows.Build.0 = Debug|x64
-		{581C7683-D22D-4346-B3BF-DC2936231C46}.Release|Windows.ActiveCfg = Release|x64
-		{581C7683-D22D-4346-B3BF-DC2936231C46}.Release|Windows.Build.0 = Release|x64
-		{2287E64E-3515-4324-9833-553348295C15}.Debug|Windows.ActiveCfg = Debug|x64
-		{2287E64E-3515-4324-9833-553348295C15}.Debug|Windows.Build.0 = Debug|x64
-		{2287E64E-3515-4324-9833-553348295C15}.Release|Windows.ActiveCfg = Release|x64
-		{2287E64E-3515-4324-9833-553348295C15}.Release|Windows.Build.0 = Release|x64
-		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|Windows.ActiveCfg = Debug|x64
-		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|Windows.Build.0 = Debug|x64
-		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.ActiveCfg = Release|x64
-		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|Windows.Build.0 = Release|x64
-		{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.ActiveCfg = Debug|x64
-		{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|Windows.Build.0 = Debug|x64
-		{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.ActiveCfg = Release|x64
-		{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|Windows.Build.0 = Release|x64
-		{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.ActiveCfg = Debug|Win32
-		{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|Windows.Build.0 = Debug|Win32
-		{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.ActiveCfg = Release|Win32
-		{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|Windows.Build.0 = Release|Win32
-		{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.ActiveCfg = Debug|x86
-		{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|Windows.Build.0 = Debug|x86
-		{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.ActiveCfg = Release|x86
-		{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|Windows.Build.0 = Release|x86
-		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.ActiveCfg = Debug|x86
-		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|Windows.Build.0 = Debug|x86
-		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.ActiveCfg = Release|x86
-		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|Windows.Build.0 = Release|x86
-		{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.ActiveCfg = Debug|x86
-		{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|Windows.Build.0 = Debug|x86
-		{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.ActiveCfg = Release|x86
-		{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|Windows.Build.0 = Release|x86
-		{F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.ActiveCfg = Debug|x86
-		{F6975079-F730-4A31-9909-DE536E524764}.Debug|Windows.Build.0 = Debug|x86
-		{F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.ActiveCfg = Release|x86
-		{F6975079-F730-4A31-9909-DE536E524764}.Release|Windows.Build.0 = Release|x86
-		{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.ActiveCfg = Debug|x64
-		{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|Windows.Build.0 = Debug|x64
-		{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.ActiveCfg = Release|x64
-		{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|Windows.Build.0 = Release|x64
-		{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|Windows.Build.0 = Debug|Any CPU
-		{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.ActiveCfg = Release|Any CPU
-		{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|Windows.Build.0 = Release|Any CPU
-		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.ActiveCfg = Debug|x64
-		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Build.0 = Debug|x64
-		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|Windows.Deploy.0 = Debug|x64
-		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.ActiveCfg = Release|x64
-		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.Build.0 = Release|x64
-		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|Windows.Deploy.0 = Release|x64
+		{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Debug|x64.Build.0 = Debug|Any CPU
+		{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|x64.ActiveCfg = Release|Any CPU
+		{1B4DFDAD-C676-4338-B435-F2F62D79E096}.Release|x64.Build.0 = Release|Any CPU
+		{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Debug|x64.Build.0 = Debug|Any CPU
+		{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|x64.ActiveCfg = Release|Any CPU
+		{2D33598A-21A1-4117-82DC-250F4CE8D5E5}.Release|x64.Build.0 = Release|Any CPU
+		{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Debug|x64.Build.0 = Debug|Any CPU
+		{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|x64.ActiveCfg = Release|Any CPU
+		{7EFC0398-8F4D-4850-BBE3-A0CC85410559}.Release|x64.Build.0 = Release|Any CPU
+		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|x64.ActiveCfg = Debug|x64
+		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Debug|x64.Build.0 = Debug|x64
+		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|x64.ActiveCfg = Release|x64
+		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766}.Release|x64.Build.0 = Release|x64
+		{1926AB55-690C-4081-99D5-170847C206D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1926AB55-690C-4081-99D5-170847C206D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{1926AB55-690C-4081-99D5-170847C206D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{1926AB55-690C-4081-99D5-170847C206D9}.Release|x64.Build.0 = Release|Any CPU
+		{581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|x64.ActiveCfg = Debug|x64
+		{581C7683-D22D-4346-B3BF-DC2936231C46}.Debug|x64.Build.0 = Debug|x64
+		{581C7683-D22D-4346-B3BF-DC2936231C46}.Release|x64.ActiveCfg = Release|x64
+		{581C7683-D22D-4346-B3BF-DC2936231C46}.Release|x64.Build.0 = Release|x64
+		{2287E64E-3515-4324-9833-553348295C15}.Debug|x64.ActiveCfg = Debug|x64
+		{2287E64E-3515-4324-9833-553348295C15}.Debug|x64.Build.0 = Debug|x64
+		{2287E64E-3515-4324-9833-553348295C15}.Release|x64.ActiveCfg = Release|x64
+		{2287E64E-3515-4324-9833-553348295C15}.Release|x64.Build.0 = Release|x64
+		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|x64.ActiveCfg = Debug|x64
+		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Debug|x64.Build.0 = Debug|x64
+		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|x64.ActiveCfg = Release|x64
+		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30}.Release|x64.Build.0 = Release|x64
+		{9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C7B827F-AE30-44C4-A210-E49DF883C720}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C7B827F-AE30-44C4-A210-E49DF883C720}.Release|x64.Build.0 = Release|Any CPU
+		{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Debug|x64.Build.0 = Debug|Any CPU
+		{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|x64.ActiveCfg = Release|Any CPU
+		{B31E6C36-D710-443F-8ED7-16BE3BD51FC4}.Release|x64.Build.0 = Release|Any CPU
+		{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|x64.ActiveCfg = Debug|x64
+		{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Debug|x64.Build.0 = Debug|x64
+		{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|x64.ActiveCfg = Release|x64
+		{B5565834-1164-4858-AF50-AE89CFC9BDD2}.Release|x64.Build.0 = Release|x64
+		{C9B1C169-1354-4348-9938-7892399C6336}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9B1C169-1354-4348-9938-7892399C6336}.Debug|x64.Build.0 = Debug|Any CPU
+		{C9B1C169-1354-4348-9938-7892399C6336}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9B1C169-1354-4348-9938-7892399C6336}.Release|x64.Build.0 = Release|Any CPU
+		{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|x64.ActiveCfg = Debug|Win32
+		{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Debug|x64.Build.0 = Debug|Win32
+		{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|x64.ActiveCfg = Release|Win32
+		{FBA5EFE2-362B-4BAD-A748-3248F79468AC}.Release|x64.Build.0 = Release|Win32
+		{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.ActiveCfg = Debug|x86
+		{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Debug|x64.Build.0 = Debug|x86
+		{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.ActiveCfg = Release|x86
+		{00858CE5-437F-46BE-8A2E-519B552DBF7D}.Release|x64.Build.0 = Release|x86
+		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.ActiveCfg = Debug|x86
+		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Debug|x64.Build.0 = Debug|x86
+		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.ActiveCfg = Release|x86
+		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85}.Release|x64.Build.0 = Release|x86
+		{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.ActiveCfg = Debug|x86
+		{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Debug|x64.Build.0 = Debug|x86
+		{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.ActiveCfg = Release|x86
+		{EF87DE0E-BC36-4D3C-8852-C8AD11D01F04}.Release|x64.Build.0 = Release|x86
+		{F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.ActiveCfg = Debug|x86
+		{F6975079-F730-4A31-9909-DE536E524764}.Debug|x64.Build.0 = Debug|x86
+		{F6975079-F730-4A31-9909-DE536E524764}.Release|x64.ActiveCfg = Release|x86
+		{F6975079-F730-4A31-9909-DE536E524764}.Release|x64.Build.0 = Release|x86
+		{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|x64.ActiveCfg = Debug|x64
+		{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Debug|x64.Build.0 = Debug|x64
+		{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|x64.ActiveCfg = Release|x64
+		{D1286C4A-9D6A-4904-B9AD-CB7688483EDB}.Release|x64.Build.0 = Release|x64
+		{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|x64.ActiveCfg = Release|Any CPU
+		{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE}.Release|x64.Build.0 = Release|Any CPU
+		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.ActiveCfg = Debug|x64
+		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.Build.0 = Debug|x64
+		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Debug|x64.Deploy.0 = Debug|x64
+		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.ActiveCfg = Release|x64
+		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.Build.0 = Release|x64
+		{55CDD736-9A8A-4091-AC99-60E2F9C73269}.Release|x64.Deploy.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{1B4DFDAD-C676-4338-B435-F2F62D79E096} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
+		{2D33598A-21A1-4117-82DC-250F4CE8D5E5} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
+		{7EFC0398-8F4D-4850-BBE3-A0CC85410559} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
 		{89D94AC6-3D04-4B67-A39B-C1DEFB8A1766} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
 		{1926AB55-690C-4081-99D5-170847C206D9} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
 		{581C7683-D22D-4346-B3BF-DC2936231C46} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
 		{2287E64E-3515-4324-9833-553348295C15} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
 		{72B4BA09-65D8-4C49-930E-B14104B2AB1B} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
 		{04AFCFBB-97D5-44EA-B087-F0CFAEB51E30} = {3FAE38FB-24D9-4F8C-81BA-68BAD19FC81D}
+		{9C7B827F-AE30-44C4-A210-E49DF883C720} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
+		{B31E6C36-D710-443F-8ED7-16BE3BD51FC4} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
 		{B5565834-1164-4858-AF50-AE89CFC9BDD2} = {8B08EF96-10D6-4F35-94C1-986F9F0F1506}
 		{457F1D6D-8AEC-42E2-9211-2A8405C95019} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
 		{7D32EE61-B6F0-4978-B500-45172B181283} = {0DF59FB4-AEA9-4213-A935-6DB851411B67}
+		{C9B1C169-1354-4348-9938-7892399C6336} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
 		{FBA5EFE2-362B-4BAD-A748-3248F79468AC} = {7D32EE61-B6F0-4978-B500-45172B181283}
 		{00858CE5-437F-46BE-8A2E-519B552DBF7D} = {7D32EE61-B6F0-4978-B500-45172B181283}
 		{65AB4CE3-5AF4-411A-928C-7FFD250C6D85} = {7D32EE61-B6F0-4978-B500-45172B181283}

Directory.Build.Java.props

@@ -0,0 +1,22 @@
+<Project>
+
+  <PropertyGroup Label="IKVM">
+    <ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
+    <EnableDefaultItems>false</EnableDefaultItems>
+    <LangVersion>1.8</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Label="MSBuild">
+    <!-- 
+      Skip expected diagnostics.
+      Catch authoring/dependency issues in automated Tests.
+
+      IKVM0100: Class Not Found
+      IKVM0101: Class Format Error (not Java 8)
+      IKVM0105: Missing Class
+      IKVM0111: Emitted NoClassDefFoundError
+    -->
+    <NoWarn>IKVM0100;IKVM0101;IKVM0105;IKVM0111;$(NoWarn)</NoWarn>
+  </PropertyGroup>
+
+</Project>

Directory.Build.props

@@ -16,46 +16,38 @@
 
 <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>
-        <TargetBuildDir>$(ModulePath)target\</TargetBuildDir>
-
-        <BaseIntermediateOutputPath>$(TargetBuildDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-        <BaseOutputPath>$(TargetBuildDir)</BaseOutputPath>
-        <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
-        <OutputPath>$(BaseOutputPath)</OutputPath>
-
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <LangVersion>12</LangVersion>
-    </PropertyGroup>
-
-    <ItemDefinitionGroup>
-        <CyberduckReference>
-            <ProjectPath />
-        </CyberduckReference>
-    </ItemDefinitionGroup>
-
-    <ItemGroup>
-        <IKVM Include="IKVM.OpenJDK.Beans" />
-        <IKVM Include="IKVM.OpenJDK.Charsets" />
-        <IKVM Include="IKVM.OpenJDK.Core" />
-        <IKVM Include="IKVM.OpenJDK.Jdbc" />
-        <IKVM Include="IKVM.OpenJDK.Localedata" />
-        <IKVM Include="IKVM.OpenJDK.Security" />
-        <IKVM Include="IKVM.OpenJDK.Text" />
-        <IKVM Include="IKVM.OpenJDK.XML.API" />
-        <IKVM Include="IKVM.OpenJDK.XML.Bind" />
-        <IKVM Include="IKVM.OpenJDK.XML.Parse" />
-        <IKVM Include="IKVM.OpenJDK.XML.Transform" />
-        <IKVM Include="IKVM.OpenJDK.XML.XPath" />
-        <IKVM Include="IKVM.Runtime" />
-        <IKVM Include="IKVM.Runtime.JNI" />
-
-        <IKVMReferences Include="@(IKVM)" HintPath="$(TargetBuildDir)ikvm\bin\%(Identity).dll" />
-    </ItemGroup>
-</Project>
+  <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')" />
+
+</Project>