From 9ede7a3d25d77b2f47ec170d85db925aa9916539 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 26 May 2018 20:32:18 -0500
Subject: [PATCH 1/3] Include pdbs in packages.

---
 packages.cake | 56 ++++++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 34 deletions(-)

diff --git a/packages.cake b/packages.cake
index 17411aef4c..e996544b68 100644
--- a/packages.cake
+++ b/packages.cake
@@ -155,38 +155,28 @@ public class Packages
 
         var coreLibraries = new string[][]
         {
-            new [] { "./src/", "Avalonia.Animation", ".dll" },
-            new [] { "./src/", "Avalonia.Animation", ".xml" },
-            new [] { "./src/", "Avalonia.Base", ".dll" },
-            new [] { "./src/", "Avalonia.Base", ".xml" },
-            new [] { "./src/", "Avalonia.Controls", ".dll" },
-            new [] { "./src/", "Avalonia.Controls", ".xml" },
-            new [] { "./src/", "Avalonia.DesignerSupport", ".dll" },
-            new [] { "./src/", "Avalonia.DesignerSupport", ".xml" },
-            new [] { "./src/", "Avalonia.Diagnostics", ".dll" },
-            new [] { "./src/", "Avalonia.Diagnostics", ".xml" },
-            new [] { "./src/", "Avalonia.Input", ".dll" },
-            new [] { "./src/", "Avalonia.Input", ".xml" },
-            new [] { "./src/", "Avalonia.Interactivity", ".dll" },
-            new [] { "./src/", "Avalonia.Interactivity", ".xml" },
-            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" }
+            new [] { "./src/", "Avalonia.Animation"},
+            new [] { "./src/", "Avalonia.Base"},
+            new [] { "./src/", "Avalonia.Controls"},
+            new [] { "./src/", "Avalonia.DesignerSupport"},
+            new [] { "./src/", "Avalonia.Diagnostics"},
+            new [] { "./src/", "Avalonia.Input"},
+            new [] { "./src/", "Avalonia.Interactivity"},
+            new [] { "./src/", "Avalonia.Layout"},
+            new [] { "./src/", "Avalonia.Logging.Serilog"},
+            new [] { "./src/", "Avalonia.Visuals"},
+            new [] { "./src/", "Avalonia.Styling"},
+            new [] { "./src/", "Avalonia.Themes.Default"},
+            new [] { "./src/Markup/", "Avalonia.Markup"},
+            new [] { "./src/Markup/", "Avalonia.Markup.Xaml"},
         };
 
-        var coreLibrariesFiles = coreLibraries.Select((lib) => {
-            return (FilePath)context.File(lib[0] + lib[1] + "/bin/" + parameters.DirSuffix + "/netstandard2.0/" + lib[1] + lib[2]);
+        var extensionsToPack = new [] {".dll", ".xml", ".pdb"};
+
+        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 = net45RuntimePlatformExtensions.Select(libSuffix => {
+        var net45RuntimePlatform = extensionsToPack.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 = netCoreRuntimePlatformExtensions.Select(libSuffix => {
+        var netCoreRuntimePlatform = extensionsToPack.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" 

From a5a582bf2261b0cf227b650b536fdb2b54cb5f4a Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 26 May 2018 20:33:02 -0500
Subject: [PATCH 2/3] Add SourceLink package to enable SourceLink debugging.

---
 src/Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 7325bab2a3..9b3e4d3c0f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,3 +1,6 @@
 <Project>
   <Import Project="..\build\SharedVersion.props" />
+  <ItemGroup>
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

From dd6bfb77b24c272608fb11f1665bd36bd52d2619 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 26 May 2018 21:24:02 -0500
Subject: [PATCH 3/3] Disable SourceLink on iOS projects.

---
 build/SourceLink.props                                       | 5 +++++
 src/Directory.Build.props                                    | 4 +---
 src/iOS/Avalonia.iOS/Avalonia.iOS.csproj                     | 3 +++
 .../Avalonia.iOSTestApplication.csproj                       | 3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 build/SourceLink.props

diff --git a/build/SourceLink.props b/build/SourceLink.props
new file mode 100644
index 0000000000..0c9b6a34f8
--- /dev/null
+++ b/build/SourceLink.props
@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 9b3e4d3c0f..d18a0e72ba 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,4 @@
 <Project>
   <Import Project="..\build\SharedVersion.props" />
-  <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
-  </ItemGroup>
+  <Import Project="..\build\SourceLink.props" Condition="'$(DisableSourceLink)' == ''" />
 </Project>
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index 6bc7004694..966634a293 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -35,6 +35,9 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup>
+    <DisableSourceLink>true</DisableSourceLink>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="AppBuilder.cs" />
     <Compile Include="AvaloniaRootViewController.cs" />
diff --git a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
index cdca29a0fa..768eb8c516 100644
--- a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
+++ b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
@@ -94,6 +94,9 @@
     <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
+  <PropertyGroup>
+    <DisableSourceLink>true</DisableSourceLink>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />