Skip to content

Commit 09b8ace

Browse files
mungojamhvanbakel
authored andcommitted
Nuspec in top directory only (hvanbakel#125)
* Fix nuspec reader to not pick up from obj folder * Don't lose memory of nuspec file location during transform * Only look in top directory for nuspec file * Revert redundant check for obj folder in nuspec reader We only look in top project directory now, so there is no chance of obj coming into play
1 parent 47aec12 commit 09b8ace

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Project2015To2017/Reading/NuSpecReader.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class NuSpecReader
1212
public PackageConfiguration Read(FileInfo projectFile, IProgress<string> progress)
1313
{
1414
var nuspecFiles = projectFile.Directory
15-
.EnumerateFiles("*.nuspec", SearchOption.AllDirectories)
15+
.EnumerateFiles("*.nuspec", SearchOption.TopDirectoryOnly)
1616
.ToArray();
1717

1818
if (nuspecFiles.Length == 0)
@@ -105,4 +105,4 @@ private static string GetElement(XElement metadata, XName elementName)
105105
return value;
106106
}
107107
}
108-
}
108+
}

Project2015To2017/Transforms/NugetPackageTransformation.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ private PackageConfiguration PopulatePlaceHolders(PackageConfiguration rawPackag
6767
Tags = rawPackageConfig.Tags,
6868
ReleaseNotes = rawPackageConfig.ReleaseNotes,
6969
RequiresLicenseAcceptance = rawPackageConfig.RequiresLicenseAcceptance,
70-
Dependencies = rawPackageConfig.Dependencies
70+
Dependencies = rawPackageConfig.Dependencies,
71+
NuspecFile = rawPackageConfig.NuspecFile
7172
};
7273
}
7374

0 commit comments

Comments
 (0)