Skip to content

Commit

Permalink
Migrate to netcoreapp3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
AliveDevil committed Oct 24, 2023
1 parent 3fef1fb commit d6781be
Show file tree
Hide file tree
Showing 39 changed files with 592 additions and 399 deletions.
35 changes: 35 additions & 0 deletions Cyberduck.sln
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ 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", "{700080FF-8673-400D-8E0A-80F5B9ECC6A1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Bonjour", "bonjour\dll\Cyberduck.Bonjour.msbuildproj", "{8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Protocols", "protocols\dll\Cyberduck.Protocols.msbuildproj", "{9EC33FB0-4334-403D-9E69-0586F7E6695F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cryptomator", "cryptomator\dll\Cyberduck.Cryptomator.msbuildproj", "{C5D057E6-48B7-48C5-A7E2-66A21258BD04}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cyberduck.Cli", "cli\dll\Cyberduck.Cli.msbuildproj", "{82651949-B606-4CEF-BEEF-117466CC70BB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Windows = Debug|Windows
Expand Down Expand Up @@ -116,6 +126,26 @@ Global
{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
{700080FF-8673-400D-8E0A-80F5B9ECC6A1}.Debug|Windows.ActiveCfg = Debug|Any CPU
{700080FF-8673-400D-8E0A-80F5B9ECC6A1}.Debug|Windows.Build.0 = Debug|Any CPU
{700080FF-8673-400D-8E0A-80F5B9ECC6A1}.Release|Windows.ActiveCfg = Release|Any CPU
{700080FF-8673-400D-8E0A-80F5B9ECC6A1}.Release|Windows.Build.0 = Release|Any CPU
{8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}.Debug|Windows.ActiveCfg = Debug|Any CPU
{8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}.Debug|Windows.Build.0 = Debug|Any CPU
{8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}.Release|Windows.ActiveCfg = Release|Any CPU
{8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB}.Release|Windows.Build.0 = Release|Any CPU
{9EC33FB0-4334-403D-9E69-0586F7E6695F}.Debug|Windows.ActiveCfg = Debug|Any CPU
{9EC33FB0-4334-403D-9E69-0586F7E6695F}.Debug|Windows.Build.0 = Debug|Any CPU
{9EC33FB0-4334-403D-9E69-0586F7E6695F}.Release|Windows.ActiveCfg = Release|Any CPU
{9EC33FB0-4334-403D-9E69-0586F7E6695F}.Release|Windows.Build.0 = Release|Any CPU
{C5D057E6-48B7-48C5-A7E2-66A21258BD04}.Debug|Windows.ActiveCfg = Debug|Any CPU
{C5D057E6-48B7-48C5-A7E2-66A21258BD04}.Debug|Windows.Build.0 = Debug|Any CPU
{C5D057E6-48B7-48C5-A7E2-66A21258BD04}.Release|Windows.ActiveCfg = Release|Any CPU
{C5D057E6-48B7-48C5-A7E2-66A21258BD04}.Release|Windows.Build.0 = Release|Any CPU
{82651949-B606-4CEF-BEEF-117466CC70BB}.Debug|Windows.ActiveCfg = Debug|Any CPU
{82651949-B606-4CEF-BEEF-117466CC70BB}.Debug|Windows.Build.0 = Debug|Any CPU
{82651949-B606-4CEF-BEEF-117466CC70BB}.Release|Windows.ActiveCfg = Release|Any CPU
{82651949-B606-4CEF-BEEF-117466CC70BB}.Release|Windows.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -138,6 +168,11 @@ Global
{D1286C4A-9D6A-4904-B9AD-CB7688483EDB} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
{ABB0D3AD-BCDA-4F73-88C3-C67B76AAB6FE} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
{55CDD736-9A8A-4091-AC99-60E2F9C73269} = {7D32EE61-B6F0-4978-B500-45172B181283}
{700080FF-8673-400D-8E0A-80F5B9ECC6A1} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
{8F1F7D55-70A4-4E9A-BF0A-AF27369C67FB} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
{9EC33FB0-4334-403D-9E69-0586F7E6695F} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
{C5D057E6-48B7-48C5-A7E2-66A21258BD04} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
{82651949-B606-4CEF-BEEF-117466CC70BB} = {72B4BA09-65D8-4C49-930E-B14104B2AB1B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {289E6003-15D5-4377-ADA6-2E7093785BCD}
Expand Down
6 changes: 6 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
<LangVersion>10</LangVersion>
</PropertyGroup>

<PropertyGroup>
<DisableImplicitIkvmPackageReference>true</DisableImplicitIkvmPackageReference>
<DisableImplicitIkvmMSBuildPackageReference>true</DisableImplicitIkvmMSBuildPackageReference>
<UseIkvmTasks>true</UseIkvmTasks>
</PropertyGroup>

<ItemDefinitionGroup>
<CyberduckReference>
<ProjectPath />
Expand Down
15 changes: 15 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,30 @@
<Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.41" />

<ItemGroup>
<CyberduckReference Update="Core">
<ProjectPath>$(CyberduckDir)core\dll\Cyberduck.Core.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Core.Native">
<ProjectPath>$(CyberduckDir)core\src\main\csharp\Cyberduck.Core.Native.csproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Core.Refresh">
<ProjectPath>$(CyberduckDir)core\native\refresh\src\main\csharp\Cyberduck.Core.Refresh.csproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Bonjour">
<ProjectPath>$(CyberduckDir)bonjour\dll\Cyberduck.Bonjour.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Bonjour.Native">
<ProjectPath>$(CyberduckDir)bonjour\src\main\csharp\Cyberduck.Bonjour.Native.csproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Cryptomator">
<ProjectPath>$(CyberduckDir)cryptomator\dll\Cyberduck.Cryptomator.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Protocols">
<ProjectPath>$(CyberduckDir)protocols\dll\Cyberduck.Protocols.msbuildproj</ProjectPath>
</CyberduckReference>
<CyberduckReference Update="Cli">
<ProjectPath>$(CyberduckDir)cli\dll\Cyberduck.Cli.msbuildproj</ProjectPath>
</CyberduckReference>
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<ItemGroup>
<PackageReference Update="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.100" />
<PackageReference Update="ExceptionReporter " Version="2.4.2" />
<PackageReference Update="IKVM" Version="8.6.92" />
<PackageReference Update="IKVM.Image.JRE" Version="8.6.92" />
<PackageReference Update="IKVM.MSBuild" Version="8.6.92" />
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.1.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Update="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
Expand Down
21 changes: 21 additions & 0 deletions bonjour/dll/Cyberduck.Bonjour.msbuildproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project Sdk="IKVM.Net.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<LangVersion>1.8</LangVersion>
<ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
</PropertyGroup>

<ItemGroup>
<CyberduckReference Include="Core" />
<PackageReference Include="IKVM" />
<PackageReference Include="IKVM.MSBuild" />
</ItemGroup>

<ItemGroup>
<Convert Include="$(TargetDir)bonjour.jar" />
<Convert Include="$(TargetDir)dnssd.jar" />
</ItemGroup>

</Project>
9 changes: 9 additions & 0 deletions bonjour/dll/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>

<PropertyGroup>
<ModulePath>$(MSBuildThisFileDirectory)</ModulePath>
</PropertyGroup>

<Import Project="../Directory.Build.props" />

</Project>
76 changes: 30 additions & 46 deletions bonjour/dll/build.xml
Original file line number Diff line number Diff line change
@@ -1,54 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* $Revision: 6757 $
* $Date: 2010-08-25 13:25:44 +0200 (Mi, 25 Aug 2010) $
*
* Copyright (c) 2005-2012 David Kocher. All rights reserved.
* http://cyberduck.io/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.package
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Bug fixes, suggestions and comments should be sent to:
* dkocher@cyberduck.io
-->
<project name="Cyberduck Native Libraries" basedir=".">
<project name="Cyberduck.Bonjour" basedir=".">

<import file="../../build.xml"/>

<property name="ikvm.home" value="${build}/ikvm"/>
<condition property="msbuild.configuration" value="Debug">
<equals arg1="${configuration}" arg2="debug" />
</condition>
<condition property="msbuild.configuration" value="Release">
<equals arg1="${configuration}" arg2="release" />
</condition>

<target name="dll" if="platform.windows">
<taskdef name="ikvmc" classname="net.ikvm.ant.IkvmcTask">
<classpath path="${lib.ext}/ant-ikvmc.0.5.jar"/>
<target name="init-msbuild">
<taskdef name="msbuild"
classname="org.apache.ant.dotnet.build.MSBuildTask">
<classpath path="${lib.ext}/ant-dotnet-1.1.jar"/>
</taskdef>
<mkdir dir="${build}"/>
<!-- Create DLL Cyberduck.Bonjour -->
<ikvmc target="library" out="${build}/Cyberduck.Bonjour.dll" home="${ikvm.home}"
classloader="ikvm.runtime.AppDomainAssemblyClassLoader" version="${version}.${revision}" debug="${ikvm.debug}"
verbose="false">
<reference path="${build}/Cyberduck.Core.dll"/>
<arg value="-skipDuplicates"/>
<fileset dir="${build}">
<include name="*.jar"/>
<exclude name="asm-*.jar"/>
<exclude name="cglib-*.jar"/>
<exclude name="*-sources.jar"/>
<exclude name="*-tests.jar"/>
</fileset>
<outputfilter>
<contains>IKVMC0109</contains>
<contains>class is already available in referenced assembly</contains>
</outputfilter>
</ikvmc>
</target>

<target name="build" depends="version,dll" />
<target name="restore" depends="init-msbuild">
<msbuild buildfile="${module}\Cyberduck.Bonjour.msbuildproj">
<target name="Restore" />
</msbuild>
</target>

<target name="build-windows" depends="init-msbuild,version,restore" if="platform.windows">
<msbuild buildfile="${home}\Cyberduck.sln">
<target name="src\libs\Cyberduck_Bonjour" />

<property name="Configuration" value="${msbuild.configuration}" />
<property name="Copyright" value="${copyright}" />
<property name="Version" value="${version}.${revision}" />
</msbuild>
</target>

<target name="_build" depends="build-windows" />

<target name="build" depends="_build,version" />
</project>
20 changes: 0 additions & 20 deletions bonjour/dll/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,6 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-runtime</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>ch.iterate</groupId>
<artifactId>ikvm</artifactId>
<type>zip</type>
<version>${ikvm-version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
6 changes: 4 additions & 2 deletions bonjour/native/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,17 @@

<target name="build" depends="init-msbuild, version">
<!-- Create DLL Cyberduck.Bonjour.Native -->
<msbuild buildfile="../src/main/csharp/Cyberduck.Bonjour.Native.csproj">
<target name="Build"/>
<msbuild buildfile="${home}\Cyberduc.sln">
<target name="src\libs\Cyberduck_Bonjour_Native"/>

<property name="Version"
value="${version}.${revision}"/>
<property name="ShortVersion"
value="${version} (${revision})"/>
<property name="Configuration"
value="${msbuild.configuration}"/>
<property name="BuildProjectReferences"
value="false"/>
</msbuild>
</target>
</project>
20 changes: 0 additions & 20 deletions bonjour/native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,6 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-runtime</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>ch.iterate</groupId>
<artifactId>ikvm</artifactId>
<type>zip</type>
<version>${ikvm-version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
9 changes: 3 additions & 6 deletions bonjour/src/main/csharp/Cyberduck.Bonjour.Native.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<CyberduckReference Include="Bonjour" />
</ItemGroup>

<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Windows.Forms" />

<Reference Include="@(IKVMReferences)" />
<PackageReference Include="IKVM" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 20 additions & 0 deletions cli/dll/Cyberduck.Cli.msbuildproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="IKVM.Net.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<LangVersion>1.8</LangVersion>
<ClassLoader>ikvm.runtime.AppDomainAssemblyClassLoader</ClassLoader>
</PropertyGroup>

<ItemGroup>
<CyberduckReference Include="Core;Protocols;Cryptomator" />
<PackageReference Include="IKVM" />
<PackageReference Include="IKVM.MSBuild" />
</ItemGroup>

<ItemGroup>
<Convert Include="$(TargetDir)cli.jar" />
<Convert Include="$(TargetDir)commons-cli.jar" />
<Convert Include="$(TargetDir)jansi.jar" />
</ItemGroup>
</Project>
Loading

0 comments on commit d6781be

Please sign in to comment.