Skip to content

Commit e21d81d

Browse files
AliveDevildkocher
AliveDevil
authored and
dkocher
committed
Use MSBuild Task to reduce manual dependency reviews
1 parent 6287706 commit e21d81d

File tree

8 files changed

+17
-183
lines changed

8 files changed

+17
-183
lines changed

‎Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<PackageReference Update="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.100" />
2121
<PackageReference Update="ExceptionReporter " Version="2.4.2" />
2222
<PackageReference Update="IKVM" Version="8.11.0-dev.283" />
23+
<PackageReference Update="iterate-ch.IKVM.MSBuild.SkipDuplicates" Version="1.0.0" />
2324
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="17.1.0" />
2425
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
2526
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0" />

‎bonjour/dll/Cyberduck.Bonjour.msbuildproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
<ItemGroup>
1313
<CyberduckReference Include="Core" />
14+
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
1415

15-
<Convert Include="$(TargetBuildDir)ch.cyberduck.bonjour.jar" />
16-
<Convert Include="$(TargetBuildDir)com.apple.dnssd.jar" />
16+
<Convert Include="$(TargetBuildDir)*.jar" />
1717
</ItemGroup>
1818

1919
</Project>

‎cli/dll/Cyberduck.Cli.msbuildproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
<ItemGroup>
1010
<CyberduckReference Include="Core;Bonjour;Protocols;Cryptomator" />
11+
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
1112

12-
<Convert Include="$(TargetBuildDir)ch.cyberduck.cli.jar" />
13-
<Convert Include="$(TargetBuildDir)commons-cli.commons-cli.jar" />
14-
<Convert Include="$(TargetBuildDir)org.fusesource.jansi.jansi.jar" />
13+
<Convert Include="$(TargetBuildDir)*.jar" />
1514
</ItemGroup>
1615

1716
</Project>

‎core/dll/Cyberduck.Core.msbuildproj‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,9 @@
77
<Import Project="$(BuildSupportDir)Cyberduck.Java.props" />
88

99
<ItemGroup>
10-
<Convert Include="$(TargetBuildDir)ch.cyberduck.core.jar" />
11-
<Convert Include="$(TargetBuildDir)ch.cyberduck.defaults.jar" />
12-
<Convert Include="$(TargetBuildDir)ch.iterate.s3.jets3t.jar" />
13-
<Convert Include="$(TargetBuildDir)com.auth0.java-jwt.jar" />
14-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.core.jackson-annotations.jar" />
15-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.core.jackson-core.jar" />
16-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.core.jackson-databind.jar" />
17-
<Convert Include="$(TargetBuildDir)com.google.code.findbugs.jsr305.jar" />
18-
<Convert Include="$(TargetBuildDir)com.google.code.gson.gson.jar" />
19-
<Convert Include="$(TargetBuildDir)com.google.errorprone.error_prone_annotations.jar" />
20-
<Convert Include="$(TargetBuildDir)com.google.guava.failureaccess.jar" />
21-
<Convert Include="$(TargetBuildDir)com.google.guava.guava.jar" />
22-
<Convert Include="$(TargetBuildDir)com.google.guava.listenablefuture.jar" />
23-
<Convert Include="$(TargetBuildDir)com.google.j2objc.j2objc-annotations.jar" />
24-
<Convert Include="$(TargetBuildDir)com.googlecode.plist.dd-plist.jar" />
25-
<Convert Include="$(TargetBuildDir)com.jamesmurty.utils.java-xmlbuilder.jar" />
26-
<Convert Include="$(TargetBuildDir)com.joyent.util.fast-md5.jar" />
27-
<Convert Include="$(TargetBuildDir)com.nulab-inc.zxcvbn.jar" />
28-
<Convert Include="$(TargetBuildDir)commons-codec.commons-codec.jar" />
29-
<Convert Include="$(TargetBuildDir)commons-io.commons-io.jar" />
30-
<Convert Include="$(TargetBuildDir)commons-logging.commons-logging.jar" />
31-
<Convert Include="$(TargetBuildDir)commons-net.commons-net.jar" />
32-
<Convert Include="$(TargetBuildDir)javax.activation.activation.jar" />
33-
<Convert Include="$(TargetBuildDir)net.iharder.base64.jar" />
34-
<Convert Include="$(TargetBuildDir)net.java.dev.jna.jna-min.jar" />
35-
<Convert Include="$(TargetBuildDir)net.java.dev.jna.jna-platform.jar" />
36-
<Convert Include="$(TargetBuildDir)org.apache.commons.commons-collections4.jar" />
37-
<Convert Include="$(TargetBuildDir)org.apache.commons.commons-lang3.jar" />
38-
<Convert Include="$(TargetBuildDir)org.apache.commons.commons-pool2.jar" />
39-
<Convert Include="$(TargetBuildDir)org.apache.commons.commons-text.jar" />
40-
<Convert Include="$(TargetBuildDir)org.apache.httpcomponents.httpclient-win.jar" />
41-
<Convert Include="$(TargetBuildDir)org.apache.httpcomponents.httpclient.jar" />
42-
<Convert Include="$(TargetBuildDir)org.apache.httpcomponents.httpcore.jar" />
43-
<Convert Include="$(TargetBuildDir)org.apache.httpcomponents.httpmime.jar" />
44-
<Convert Include="$(TargetBuildDir)org.apache.logging.log4j.log4j-api.jar" />
45-
<Convert Include="$(TargetBuildDir)org.apache.logging.log4j.log4j-core.jar" />
46-
<Convert Include="$(TargetBuildDir)org.apache.logging.log4j.log4j-slf4j-impl.jar" />
47-
<Convert Include="$(TargetBuildDir)org.bouncycastle.bcpkix-jdk18on.jar" />
48-
<Convert Include="$(TargetBuildDir)org.bouncycastle.bcprov-jdk18on.jar" />
49-
<Convert Include="$(TargetBuildDir)org.bouncycastle.bcutil-jdk18on.jar" />
50-
<Convert Include="$(TargetBuildDir)org.checkerframework.checker-qual.jar" />
51-
<Convert Include="$(TargetBuildDir)org.codehaus.jackson.jackson-core-asl.jar" />
52-
<Convert Include="$(TargetBuildDir)org.codehaus.jackson.jackson-mapper-asl.jar" />
53-
<Convert Include="$(TargetBuildDir)org.slf4j.jul-to-slf4j.jar" />
54-
<Convert Include="$(TargetBuildDir)org.slf4j.slf4j-api.jar" />
10+
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
11+
12+
<Convert Include="$(TargetBuildDir)*.jar" />
5513
</ItemGroup>
5614

5715
</Project>

‎cryptomator/dll/Cyberduck.Cryptomator.msbuildproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
<ItemGroup>
1010
<CyberduckReference Include="Core" />
11+
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
1112

12-
<Convert Include="$(TargetBuildDir)ch.cyberduck.cryptomator.jar" />
13-
<Convert Include="$(TargetBuildDir)ch.iterate.cryptomator.cryptolib.jar" />
14-
<Convert Include="$(TargetBuildDir)org.cryptomator.siv-mode.jar" />
13+
<Convert Include="$(TargetBuildDir)*.jar" />
1514
</ItemGroup>
1615

1716
</Project>

‎importer/dll/Cyberduck.Importer.msbuildproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<ItemGroup>
1010
<CyberduckReference Include="Core" />
11+
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
1112

12-
<Convert Include="$(TargetBuildDir)ch.cyberduck.binding.jar" />
13-
<Convert Include="$(TargetBuildDir)ch.cyberduck.importer.jar" />
13+
<Convert Include="$(TargetBuildDir)*.jar" />
1414
</ItemGroup>
1515

1616
</Project>

‎nuget.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,8 @@
1414
<packageSource key="gh-ikvmnet">
1515
<package pattern="IKVM*" />
1616
</packageSource>
17+
<packageSource key="gh-iterate-ch">
18+
<package pattern="iterate-ch.*" />
19+
</packageSource>
1720
</packageSourceMapping>
1821
</configuration>

‎protocols/dll/Cyberduck.Protocols.msbuildproj‎

Lines changed: 2 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -8,135 +8,9 @@
88

99
<ItemGroup>
1010
<CyberduckReference Include="Core" />
11+
<PackageReference Include="iterate-ch.IKVM.MSBuild.SkipDuplicates" />
1112

12-
<Convert Include="$(TargetBuildDir)ch.cyberduck.azure.jar" />
13-
<Convert Include="$(TargetBuildDir)ch.cyberduck.backblaze.jar" />
14-
<Convert Include="$(TargetBuildDir)ch.cyberduck.box.jar" />
15-
<Convert Include="$(TargetBuildDir)ch.cyberduck.brick.jar" />
16-
<Convert Include="$(TargetBuildDir)ch.cyberduck.ctera.jar" />
17-
<Convert Include="$(TargetBuildDir)ch.cyberduck.deepbox.jar" />
18-
<Convert Include="$(TargetBuildDir)ch.cyberduck.dracoon.jar" />
19-
<Convert Include="$(TargetBuildDir)ch.cyberduck.dropbox.jar" />
20-
<Convert Include="$(TargetBuildDir)ch.cyberduck.eue.jar" />
21-
<Convert Include="$(TargetBuildDir)ch.cyberduck.freenet.jar" />
22-
<Convert Include="$(TargetBuildDir)ch.cyberduck.ftp.jar" />
23-
<Convert Include="$(TargetBuildDir)ch.cyberduck.googledrive.jar" />
24-
<Convert Include="$(TargetBuildDir)ch.cyberduck.googlestorage.jar" />
25-
<Convert Include="$(TargetBuildDir)ch.cyberduck.hubic.jar" />
26-
<Convert Include="$(TargetBuildDir)ch.cyberduck.irods.jar" />
27-
<Convert Include="$(TargetBuildDir)ch.cyberduck.jersey.jar" />
28-
<Convert Include="$(TargetBuildDir)ch.cyberduck.manta.jar" />
29-
<Convert Include="$(TargetBuildDir)ch.cyberduck.nextcloud.jar" />
30-
<Convert Include="$(TargetBuildDir)ch.cyberduck.nio.jar" />
31-
<Convert Include="$(TargetBuildDir)ch.cyberduck.oauth.jar" />
32-
<Convert Include="$(TargetBuildDir)ch.cyberduck.onedrive.jar" />
33-
<Convert Include="$(TargetBuildDir)ch.cyberduck.openstack.jar" />
34-
<Convert Include="$(TargetBuildDir)ch.cyberduck.owncloud.jar" />
35-
<Convert Include="$(TargetBuildDir)ch.cyberduck.s3.jar" />
36-
<Convert Include="$(TargetBuildDir)ch.cyberduck.smb.jar" />
37-
<Convert Include="$(TargetBuildDir)ch.cyberduck.spectra.jar" />
38-
<Convert Include="$(TargetBuildDir)ch.cyberduck.ssh.jar" />
39-
<Convert Include="$(TargetBuildDir)ch.cyberduck.storegate.jar" />
40-
<Convert Include="$(TargetBuildDir)ch.cyberduck.tus.jar" />
41-
<Convert Include="$(TargetBuildDir)ch.cyberduck.webdav.jar" />
42-
<Convert Include="$(TargetBuildDir)ch.iterate.backblaze.b2.jar" />
43-
<Convert Include="$(TargetBuildDir)ch.iterate.jargon.jargon-core.jar" />
44-
<Convert Include="$(TargetBuildDir)ch.iterate.onedrive.onedrive-java-client.jar" />
45-
<Convert Include="$(TargetBuildDir)ch.iterate.openstack.swift.jar" />
46-
<Convert Include="$(TargetBuildDir)ch.iterate.spectralogic.ds3-interfaces.jar" />
47-
<Convert Include="$(TargetBuildDir)ch.iterate.spectralogic.ds3-sdk.jar" />
48-
<Convert Include="$(TargetBuildDir)ch.iterate.spectralogic.ds3-utils.jar" />
49-
<Convert Include="$(TargetBuildDir)ch.iterate.ssh.jsch.agentproxy.core.jar" />
50-
<Convert Include="$(TargetBuildDir)ch.iterate.ssh.jsch.agentproxy.pageant.jar" />
51-
<Convert Include="$(TargetBuildDir)ch.iterate.ssh.jsch.agentproxy.sshagent.jar" />
52-
<Convert Include="$(TargetBuildDir)ch.iterate.ssh.jsch.agentproxy.sshj.jar" />
53-
<Convert Include="$(TargetBuildDir)ch.iterate.ssh.jsch.agentproxy.usocket-jna.jar" />
54-
<Convert Include="$(TargetBuildDir)ch.iterate.ssh.sshj.jar" />
55-
<Convert Include="$(TargetBuildDir)ch.iterate.webdav.sardine.jar" />
56-
<Convert Include="$(TargetBuildDir)com.amazonaws.aws-java-sdk-cloudfront.jar" />
57-
<Convert Include="$(TargetBuildDir)com.amazonaws.aws-java-sdk-core.jar" />
58-
<Convert Include="$(TargetBuildDir)com.amazonaws.aws-java-sdk-iam.jar" />
59-
<Convert Include="$(TargetBuildDir)com.amazonaws.aws-java-sdk-kms.jar" />
60-
<Convert Include="$(TargetBuildDir)com.amazonaws.aws-java-sdk-s3.jar" />
61-
<Convert Include="$(TargetBuildDir)com.amazonaws.aws-java-sdk-sts.jar" />
62-
<Convert Include="$(TargetBuildDir)com.amazonaws.jmespath-java.jar" />
63-
<Convert Include="$(TargetBuildDir)com.dracoon.dracoon-crypto-sdk.jar" />
64-
<Convert Include="$(TargetBuildDir)com.dropbox.core.dropbox-core-sdk.jar" />
65-
<Convert Include="$(TargetBuildDir)com.eclipsesource.minimal-json.minimal-json.jar" />
66-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.dataformat.jackson-dataformat-cbor.jar" />
67-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.dataformat.jackson-dataformat-xml.jar" />
68-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.datatype.jackson-datatype-joda.jar" />
69-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.datatype.jackson-datatype-jsr310.jar" />
70-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.jar" />
71-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.jar" />
72-
<Convert Include="$(TargetBuildDir)com.fasterxml.jackson.module.jackson-module-jaxb-annotations.jar" />
73-
<Convert Include="$(TargetBuildDir)com.fasterxml.uuid.java-uuid-generator.jar" />
74-
<Convert Include="$(TargetBuildDir)com.fasterxml.woodstox.woodstox-core.jar" />
75-
<Convert Include="$(TargetBuildDir)com.google.api-client.google-api-client.jar" />
76-
<Convert Include="$(TargetBuildDir)com.google.apis.google-api-services-drive.jar" />
77-
<Convert Include="$(TargetBuildDir)com.google.apis.google-api-services-storage.jar" />
78-
<Convert Include="$(TargetBuildDir)com.google.auth.google-auth-library-credentials.jar" />
79-
<Convert Include="$(TargetBuildDir)com.google.auth.google-auth-library-oauth2-http.jar" />
80-
<Convert Include="$(TargetBuildDir)com.google.auto.value.auto-value-annotations.jar" />
81-
<Convert Include="$(TargetBuildDir)com.google.code.findbugs.annotations.jar" />
82-
<Convert Include="$(TargetBuildDir)com.google.http-client.google-http-client-apache-v2.jar" />
83-
<Convert Include="$(TargetBuildDir)com.google.http-client.google-http-client-gson.jar" />
84-
<Convert Include="$(TargetBuildDir)com.google.http-client.google-http-client.jar" />
85-
<Convert Include="$(TargetBuildDir)com.google.oauth-client.google-oauth-client.jar" />
86-
<Convert Include="$(TargetBuildDir)com.hierynomus.asn-one.jar" />
87-
<Convert Include="$(TargetBuildDir)com.hierynomus.smbj.jar" />
88-
<Convert Include="$(TargetBuildDir)com.jcraft.jzlib.jar" />
89-
<Convert Include="$(TargetBuildDir)com.joyent.http-signature.apache-http-client-signature.jar" />
90-
<Convert Include="$(TargetBuildDir)com.joyent.http-signature.http-signature-common.jar" />
91-
<Convert Include="$(TargetBuildDir)com.joyent.manta.java-manta-client-unshaded.jar" />
92-
<Convert Include="$(TargetBuildDir)com.microsoft.azure.azure-keyvault-core.jar" />
93-
<Convert Include="$(TargetBuildDir)com.microsoft.azure.azure-storage.jar" />
94-
<Convert Include="$(TargetBuildDir)com.rapid7.client.dcerpc.jar" />
95-
<Convert Include="$(TargetBuildDir)com.sun.activation.jakarta.activation.jar" />
96-
<Convert Include="$(TargetBuildDir)com.sun.istack.istack-commons-runtime.jar" />
97-
<Convert Include="$(TargetBuildDir)commons-lang.commons-lang.jar" />
98-
<Convert Include="$(TargetBuildDir)io.dropwizard.metrics.metrics-core.jar" />
99-
<Convert Include="$(TargetBuildDir)io.dropwizard.metrics.metrics-jmx.jar" />
100-
<Convert Include="$(TargetBuildDir)io.grpc.grpc-api.jar" />
101-
<Convert Include="$(TargetBuildDir)io.grpc.grpc-context.jar" />
102-
<Convert Include="$(TargetBuildDir)io.mikael.urlbuilder.jar" />
103-
<Convert Include="$(TargetBuildDir)io.opencensus.opencensus-api.jar" />
104-
<Convert Include="$(TargetBuildDir)io.opencensus.opencensus-contrib-http-util.jar" />
105-
<Convert Include="$(TargetBuildDir)io.swagger.core.v3.swagger-annotations.jar" />
106-
<Convert Include="$(TargetBuildDir)io.swagger.swagger-annotations.jar" />
107-
<Convert Include="$(TargetBuildDir)jakarta.activation.jakarta.activation-api.jar" />
108-
<Convert Include="$(TargetBuildDir)jakarta.annotation.jakarta.annotation-api.jar" />
109-
<Convert Include="$(TargetBuildDir)jakarta.ws.rs.jakarta.ws.rs-api.jar" />
110-
<Convert Include="$(TargetBuildDir)jakarta.xml.bind.jakarta.xml.bind-api.jar" />
111-
<Convert Include="$(TargetBuildDir)joda-time.joda-time.jar" />
112-
<Convert Include="$(TargetBuildDir)net.engio.mbassador.jar" />
113-
<Convert Include="$(TargetBuildDir)net.i2p.crypto.eddsa.jar" />
114-
<Convert Include="$(TargetBuildDir)org.apiguardian.apiguardian-api.jar" />
115-
<Convert Include="$(TargetBuildDir)org.codehaus.woodstox.stax2-api.jar" />
116-
<Convert Include="$(TargetBuildDir)org.glassfish.hk2.external.aopalliance-repackaged.jar" />
117-
<Convert Include="$(TargetBuildDir)org.glassfish.hk2.external.jakarta.inject.jar" />
118-
<Convert Include="$(TargetBuildDir)org.glassfish.hk2.hk2-api.jar" />
119-
<Convert Include="$(TargetBuildDir)org.glassfish.hk2.hk2-locator.jar" />
120-
<Convert Include="$(TargetBuildDir)org.glassfish.hk2.hk2-utils.jar" />
121-
<Convert Include="$(TargetBuildDir)org.glassfish.hk2.osgi-resource-locator.jar" />
122-
<Convert Include="$(TargetBuildDir)org.glassfish.jaxb.jaxb-runtime.jar" />
123-
<Convert Include="$(TargetBuildDir)org.glassfish.jaxb.txw2.jar" />
124-
<Convert Include="$(TargetBuildDir)org.glassfish.jersey.connectors.jersey-apache-connector.jar" />
125-
<Convert Include="$(TargetBuildDir)org.glassfish.jersey.core.jersey-client.jar" />
126-
<Convert Include="$(TargetBuildDir)org.glassfish.jersey.core.jersey-common.jar" />
127-
<Convert Include="$(TargetBuildDir)org.glassfish.jersey.ext.jersey-entity-filtering.jar" />
128-
<Convert Include="$(TargetBuildDir)org.glassfish.jersey.inject.jersey-hk2.jar" />
129-
<Convert Include="$(TargetBuildDir)org.glassfish.jersey.media.jersey-media-json-jackson.jar" />
130-
<Convert Include="$(TargetBuildDir)org.glassfish.jersey.media.jersey-media-multipart.jar" />
131-
<Convert Include="$(TargetBuildDir)org.javassist.javassist.jar" />
132-
<Convert Include="$(TargetBuildDir)org.jetbrains.annotations.jar" />
133-
<Convert Include="$(TargetBuildDir)org.jetbrains.kotlin.kotlin-stdlib.jar" />
134-
<Convert Include="$(TargetBuildDir)org.json.json.jar" />
135-
<Convert Include="$(TargetBuildDir)org.jvnet.mimepull.mimepull.jar" />
136-
<Convert Include="$(TargetBuildDir)org.objenesis.objenesis.jar" />
137-
<Convert Include="$(TargetBuildDir)org.slf4j.jcl-over-slf4j.jar" />
138-
<Convert Include="$(TargetBuildDir)software.amazon.ion.ion-java.jar" />
139-
<Convert Include="$(TargetBuildDir)uk.com.robust-it.cloning.jar" />
13+
<Convert Include="$(TargetBuildDir)*.jar" />
14014
</ItemGroup>
14115

14216
</Project>

0 commit comments

Comments
 (0)