Skip to content

Commit 5fd4236

Browse files
authored
Fix NuGet bug (#494)
1 parent 319bf9f commit 5fd4236

File tree

1 file changed

+9
-15
lines changed
  • build-info-extractor-nuget/src/main/java/org/jfrog/build/extractor/nuget/extractor

1 file changed

+9
-15
lines changed

Diff for: build-info-extractor-nuget/src/main/java/org/jfrog/build/extractor/nuget/extractor/NugetRun.java

+9-15
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
import org.jfrog.build.extractor.nuget.types.NugetProjectAssets;
2222
import org.jfrog.build.extractor.packageManager.PackageManagerExtractor;
2323

24-
import java.io.BufferedWriter;
25-
import java.io.PrintWriter;
2624
import java.io.File;
27-
import java.io.FileWriter;
2825
import java.io.IOException;
26+
import java.io.PrintWriter;
2927
import java.nio.file.Files;
3028
import java.nio.file.Path;
3129
import java.nio.file.Paths;
@@ -44,11 +42,6 @@ public class NugetRun extends PackageManagerExtractor {
4442
private static final String PACKAGES_CONFIG = "packages.config";
4543
private static final String PROJECT_ASSETS = "project.assets.json";
4644
private static final String PROJECT_ASSETS_DIR = "obj";
47-
private static final String CONFIG_FILE_TEMPLATE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
48-
+ "<configuration>\n"
49-
+ "\t<packageSources>\n\t</packageSources>\n"
50-
+ "\t<packageSourceCredentials>\n\t</packageSourceCredentials>\n"
51-
+ "</configuration>";
5245
private static final String CONFIG_FILE_FORMAT = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
5346
"<configuration>\n" +
5447
"\t<packageSources>\n" +
@@ -90,15 +83,15 @@ public class NugetRun extends PackageManagerExtractor {
9083
*
9184
* @param clientBuilder - Build Info client builder.
9285
* @param resolutionRepo - The repository it'll resolve from.
93-
* @param useDotnetCli -
86+
* @param useDotnetCli - Boolean indicates if .Net cli will be used.
9487
* @param nugetCmdArgs - NuGet exec args.
9588
* @param logger - The logger.
9689
* @param path - Path to the directory containing the .sln file.
9790
* @param env - Environment variables to use during npm execution.
98-
* @param module -
99-
* @param username - JFrog platfrom username.
100-
* @param password - JFrog platfrom password.
101-
* @param apiProtocol - A string indicates which NuGet protocol should be used (V2/V3).
91+
* @param module - NuGet module
92+
* @param username - JFrog platform username.
93+
* @param password - JFrog platform password.
94+
* @param apiProtocol - A string indicates which NuGet protocol should be used (V2/V3).
10295
*/
10396

10497
public NugetRun(ArtifactoryDependenciesClientBuilder clientBuilder, String resolutionRepo, boolean useDotnetCli, String nugetCmdArgs, Log logger, Path path, Map<String, String> env, String module, String username, String password, String apiProtocol) {
@@ -380,11 +373,12 @@ private void singleProjectHandler(String projectName, String csprojPath, String
380373
* Iterate the dependencies sources list and look for the project's source
381374
*/
382375
private String getDependenciesSource(String projectName, String csprojPath) {
383-
String projectRootPath = (new File(csprojPath)).getParent();
376+
Path projectRootPath = Paths.get(csprojPath).getParent().normalize();
384377
String projectNamePattern = File.separator + projectName + File.separator;
385378
String projectPathPattern = projectRootPath + File.separator + PROJECT_ASSETS_DIR + File.separator;
386379
for (String source : dependenciesSources) {
387-
if ( (new File(source)).getParent().equals(projectRootPath) || source.contains(projectNamePattern) || source.contains(projectPathPattern)) {
380+
Path sourceRootPath = Paths.get(source).getParent().normalize();
381+
if (sourceRootPath.equals(projectRootPath) || source.contains(projectNamePattern) || source.contains(projectPathPattern)) {
388382
return source;
389383
}
390384
}

0 commit comments

Comments
 (0)