From c9b01b590ddbffd885cce0b218fad1f8aa79b30d Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sun, 4 Mar 2018 22:47:09 +0200
Subject: [PATCH] Fixed the _MergeFiles task

---
 .../samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs      | 2 +-
 SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs
index 0d9ec0e0..d599b79e 100644
--- a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs
+++ b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs
@@ -27,7 +27,7 @@ private void OnPainting(object sender, SKPaintSurfaceEventArgs e)
 			var meteocons = "We love the {{mc-sun color=f9d71c}} and some {{mc-cloud-double-o}} s.";
 			var simple = "We all {{icon-heart color=ff0000}} a {{icon-present}}!";
 			var typicons = "SkiaSharp runs on {{typcn-device-desktop}}, {{typcn-device-laptop}}, {{typcn-device-phone}} and {{typcn-device-tablet}} devices!";
-			var weather = "An {{wi-solar-eclipse}} is when the {{wi-day-sunny color=f9d71c}} is hidden.";
+			var weather = "An {{wi-solar-eclipse}} is when the {{wi-day-sunny color=f9d71c}} is hidden (there might be {{wi-wind}}).";
 
 			using (var textPaint = new SKPaint())
 			{
diff --git a/SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets b/SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets
index db146e11..87c4b2ae 100644
--- a/SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets
+++ b/SkiaSharp.Extended.Iconify/source/IconifyDownloader.targets
@@ -102,7 +102,7 @@
                Condition=" '@(_RemoteFontFile)' != '' and !Exists('%(_RemoteFontFile.TargetPath)') " />
 
     <!-- combine all stylesheets into one for the generator -->
-    <_MergeFiles Files="%(_RemoteStyleSheet.TargetPath)"
+    <_MergeFiles Files="@(_RemoteStyleSheet -> '%(TargetPath)')"
                  Destination="$(GeneratedStylesheetPath)"
                  Reset="true"
                  Condition=" '@(_RemoteStyleSheet)' != '' " />
@@ -238,6 +238,7 @@
         else if (Reset)
             File.Delete(Destination);
 
+        Log.LogMessage("Creating file '{0}'...", Destination);
         using (var dest = File.OpenWrite(Destination))
         {
             foreach (var file in Files)
@@ -249,6 +250,7 @@
                 }
             }
         }
+        Log.LogMessage("Merge for '{0}' complete...", Destination);
 
         return true;
       ]]>