Merge pull request #2 from mono/dev

Merge branch dev into dev15.1

2 files changed, 16 insertions, 3 deletions

diff --git a/src/Microsoft.NuGet.Build.Tasks/NuGetPackageObject.cs b/src/Microsoft.NuGet.Build.Tasks/NuGetPackageObject.cs
index 696db15..26f04c1 100644
--- a/src/Microsoft.NuGet.Build.Tasks/NuGetPackageObject.cs
+++ b/src/Microsoft.NuGet.Build.Tasks/NuGetPackageObject.cs
@@ -47,7 +47,7 @@ namespace Microsoft.NuGet.Build.Tasks
 
         public string GetFullPathToFile(string relativePath)
         {
-            relativePath = relativePath.Replace('/', '\\');
+            relativePath = relativePath.Replace('/', Path.DirectorySeparatorChar);
             return Path.Combine(_fullPackagePath.Value, relativePath);
         }
     }
diff --git a/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs b/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs
index e02add3..8acffe3 100644
--- a/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs
+++ b/src/Microsoft.NuGet.Build.Tasks/ResolveNuGetPackageAssets.cs
@@ -471,7 +471,7 @@ namespace Microsoft.NuGet.Build.Tasks
 
         private string GetPath(string packageName, string packageVersion, string file)
         {
-            return Path.Combine(GetNuGetPackagePath(packageName, packageVersion), file.Replace('/', '\\'));
+            return Path.Combine(GetNuGetPackagePath(packageName, packageVersion), file.Replace('/', Path.DirectorySeparatorChar));
         }
 
         /// <summary>
@@ -808,6 +808,19 @@ namespace Microsoft.NuGet.Build.Tasks
 
                         items.Add(pdbItem);
                     }
+
+                    // handle Mono mdb debug symbols
+                    var mdbFileName = item.ItemSpec + ".mdb";
+
+                    if (_fileExists(mdbFileName))
+                    {
+                        var mdbItem = new TaskItem(mdbFileName);
+
+                        // CopyMetadataTo also includes an OriginalItemSpec that will point to our original item, as we want
+                        item.CopyMetadataTo(mdbItem);
+
+                        items.Add(mdbItem);
+                    }
                 }
             }
 
@@ -829,7 +842,7 @@ namespace Microsoft.NuGet.Build.Tasks
 
                 if (!string.IsNullOrEmpty(destinationSubDirectory))
                 {
-                    item.SetMetadata("DestinationSubDirectory", destinationSubDirectory + "\\");
+                    item.SetMetadata("DestinationSubDirectory", destinationSubDirectory + Path.DirectorySeparatorChar);
                 }
             }