diff options
author | Jason Malinowski <jason.malinowski@microsoft.com> | 2015-12-17 02:42:11 +0300 |
---|---|---|
committer | Jason Malinowski <jason.malinowski@microsoft.com> | 2016-02-08 22:20:51 +0300 |
commit | 195a2c1174e351321b765fd135ccc653f7e6562f (patch) | |
tree | 20a55e24157113178029354847cfce19ac7423e1 | |
parent | 082835fc981f1b4ec5cf9e4c661e70228342674f (diff) |
Gracefully deal with a library in the project.lock.json not having files
-rw-r--r-- | src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs b/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs index 02934de..d0d1eb9 100644 --- a/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs +++ b/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs @@ -343,21 +343,26 @@ namespace Microsoft.NuGet.Build.Tasks foreach (var package in GetPackagesFromTarget(lockFile, target)) { - foreach (var file in package.LibraryObject["files"].Children() - .Select(x => x.ToString()) - .Where(x => x.StartsWith("analyzers"))) + var files = package.LibraryObject["files"]; + + if (files != null) { - if (Path.GetExtension(file).Equals(".dll", StringComparison.OrdinalIgnoreCase)) + foreach (var file in files.Children() + .Select(x => x.ToString()) + .Where(x => x.StartsWith("analyzers"))) { - string path; - if (TryGetFile(package.Id, package.Version, file, out path)) + if (Path.GetExtension(file).Equals(".dll", StringComparison.OrdinalIgnoreCase)) { - var analyzer = new TaskItem(path); + string path; + if (TryGetFile(package.Id, package.Version, file, out path)) + { + var analyzer = new TaskItem(path); - analyzer.SetMetadata(NuGetPackageIdMetadata, package.Id); - analyzer.SetMetadata(NuGetPackageVersionMetadata, package.Version); + analyzer.SetMetadata(NuGetPackageIdMetadata, package.Id); + analyzer.SetMetadata(NuGetPackageVersionMetadata, package.Version); - _analyzers.Add(analyzer); + _analyzers.Add(analyzer); + } } } } |