Include pdbs in packages.

packages.cake

@@ -155,38 +155,28 @@ public class Packages
 
         var coreLibraries = new string[][]
         {
-            new [] { "./src/", "Avalonia.Animation", ".dll" },
+            new [] { "./src/", "Avalonia.Animation"},
-            new [] { "./src/", "Avalonia.Animation", ".xml" },
+            new [] { "./src/", "Avalonia.Base"},
-            new [] { "./src/", "Avalonia.Base", ".dll" },
+            new [] { "./src/", "Avalonia.Controls"},
-            new [] { "./src/", "Avalonia.Base", ".xml" },
+            new [] { "./src/", "Avalonia.DesignerSupport"},
-            new [] { "./src/", "Avalonia.Controls", ".dll" },
+            new [] { "./src/", "Avalonia.Diagnostics"},
-            new [] { "./src/", "Avalonia.Controls", ".xml" },
+            new [] { "./src/", "Avalonia.Input"},
-            new [] { "./src/", "Avalonia.DesignerSupport", ".dll" },
+            new [] { "./src/", "Avalonia.Interactivity"},
-            new [] { "./src/", "Avalonia.DesignerSupport", ".xml" },
+            new [] { "./src/", "Avalonia.Layout"},
-            new [] { "./src/", "Avalonia.Diagnostics", ".dll" },
+            new [] { "./src/", "Avalonia.Logging.Serilog"},
-            new [] { "./src/", "Avalonia.Diagnostics", ".xml" },
+            new [] { "./src/", "Avalonia.Visuals"},
-            new [] { "./src/", "Avalonia.Input", ".dll" },
+            new [] { "./src/", "Avalonia.Styling"},
-            new [] { "./src/", "Avalonia.Input", ".xml" },
+            new [] { "./src/", "Avalonia.Themes.Default"},
-            new [] { "./src/", "Avalonia.Interactivity", ".dll" },
+            new [] { "./src/Markup/", "Avalonia.Markup"},
-            new [] { "./src/", "Avalonia.Interactivity", ".xml" },
+            new [] { "./src/Markup/", "Avalonia.Markup.Xaml"},
-            new [] { "./src/", "Avalonia.Layout", ".dll" },
-            new [] { "./src/", "Avalonia.Layout", ".xml" },
-            new [] { "./src/", "Avalonia.Logging.Serilog", ".dll" },
-            new [] { "./src/", "Avalonia.Logging.Serilog", ".xml" },
-            new [] { "./src/", "Avalonia.Visuals", ".dll" },
-            new [] { "./src/", "Avalonia.Visuals", ".xml" },
-            new [] { "./src/", "Avalonia.Styling", ".dll" },
-            new [] { "./src/", "Avalonia.Styling", ".xml" },
-            new [] { "./src/", "Avalonia.Themes.Default", ".dll" },
-            new [] { "./src/", "Avalonia.Themes.Default", ".xml" },
-            new [] { "./src/Markup/", "Avalonia.Markup", ".dll" },
-            new [] { "./src/Markup/", "Avalonia.Markup", ".xml" },
-            new [] { "./src/Markup/", "Avalonia.Markup.Xaml", ".dll" },
-            new [] { "./src/Markup/", "Avalonia.Markup.Xaml", ".xml" }
         };
 
-        var coreLibrariesFiles = coreLibraries.Select((lib) => {
+        var extensionsToPack = new [] {".dll", ".xml", ".pdb"};
-            return (FilePath)context.File(lib[0] + lib[1] + "/bin/" + parameters.DirSuffix + "/netstandard2.0/" + lib[1] + lib[2]);
+
+        var coreLibrariesFiles = coreLibraries
+            .Zip(extensionsToPack, (lib, ext) => new { lib, ext})
+            .Select((lib) => {
+                return (FilePath)context.File(lib.lib[0] + lib.lib[1] + "/bin/" + parameters.DirSuffix + "/netstandard2.0/" + lib.lib[1] + lib.ext);
         }).ToList();
 
         var coreLibrariesNuSpecContent = coreLibrariesFiles.Select((file) => {
@@ -207,16 +197,14 @@ public class Packages
             };
         });
 
-        var net45RuntimePlatformExtensions = new [] {".xml", ".dll"};
+        var net45RuntimePlatform = extensionsToPack.Select(libSuffix => {
-        var net45RuntimePlatform = net45RuntimePlatformExtensions.Select(libSuffix => {
             return new NuSpecContent {
                 Source = ((FilePath)context.File("./src/Avalonia.DotNetFrameworkRuntime/bin/" + parameters.DirSuffix + "/net461/Avalonia.DotNetFrameworkRuntime" + libSuffix)).FullPath, 
                 Target = "lib/net45" 
             };
         });
 
-        var netCoreRuntimePlatformExtensions = new [] {".xml", ".dll"};
+        var netCoreRuntimePlatform = extensionsToPack.Select(libSuffix => {
-        var netCoreRuntimePlatform = netCoreRuntimePlatformExtensions.Select(libSuffix => {
             return new NuSpecContent {
                 Source = ((FilePath)context.File("./src/Avalonia.DotNetCoreRuntime/bin/" + parameters.DirSuffix + "/netcoreapp2.0/Avalonia.DotNetCoreRuntime" + libSuffix)).FullPath, 
                 Target = "lib/netcoreapp2.0"