From f8df516fc79fb78f8f051bff37e4fc7165abbca7 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 16 Aug 2018 22:33:21 -0500
Subject: [PATCH] Fix package paths for Android/iOS.

---
 packages.cake   | 4 ++--
 parameters.cake | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages.cake b/packages.cake
index 311504fb2c..3480002f80 100644
--- a/packages.cake
+++ b/packages.cake
@@ -303,7 +303,7 @@ public class Packages
                 {
                     new NuSpecContent { Source = "Avalonia.Android.dll", Target = "lib/MonoAndroid10" }
                 },
-                BasePath = context.Directory("./src/Android/Avalonia.Android/bin/" + parameters.DirSuffix),
+                BasePath = context.Directory("./src/Android/Avalonia.Android/bin/" + parameters.DirSuffix + "/monoandroid44/MonoAndroid44"),
                 OutputDirectory = parameters.NugetRoot
             },
             ///////////////////////////////////////////////////////////////////////////////
@@ -321,7 +321,7 @@ public class Packages
                 {
                     new NuSpecContent { Source = "Avalonia.iOS.dll", Target = "lib/Xamarin.iOS10" }
                 },
-                BasePath = context.Directory("./src/iOS/Avalonia.iOS/bin/" + parameters.DirSuffixIOS),
+                BasePath = context.Directory("./src/iOS/Avalonia.iOS/bin/" + parameters.DirSuffix + "/xamarin.ios10/"),
                 OutputDirectory = parameters.NugetRoot
             }
         };
diff --git a/parameters.cake b/parameters.cake
index 2639dd24c9..814c96da45 100644
--- a/parameters.cake
+++ b/parameters.cake
@@ -27,7 +27,6 @@ public class Parameters
     public DirectoryPath ZipRoot { get; private set; }
     public DirectoryPath BinRoot { get; private set; }
     public string DirSuffix { get; private set; }
-    public string DirSuffixIOS { get; private set; }
     public DirectoryPathCollection BuildDirs { get; private set; }
     public string FileZipSuffix { get; private set; }
     public FilePath ZipCoreArtifacts { get; private set; }
@@ -94,7 +93,6 @@ public class Parameters
         BinRoot = ArtifactsDir.Combine("bin");
         BuildDirs = context.GetDirectories("**/bin") + context.GetDirectories("**/obj");
         DirSuffix = Configuration;
-        DirSuffixIOS = "iPhone" + "/" + Configuration;
         FileZipSuffix = Version + ".zip";
         ZipCoreArtifacts = ZipRoot.CombineWithFilePath("Avalonia-" + FileZipSuffix);
         ZipNuGetArtifacts = ZipRoot.CombineWithFilePath("Avalonia-NuGet-" + FileZipSuffix);