From b45015541b8aa36c8848af13fed5cc06fc786a9a Mon Sep 17 00:00:00 2001
From: "Frank A. Krueger" <fak@praeclarum.org>
Date: Tue, 13 Mar 2018 15:58:18 -0700
Subject: [PATCH] Fix build dist paths

---
 Ooui.Wasm.Build.Tasks/BuildDistTask.cs  |  5 +++--
 Ooui.Wasm.Build.Tasks/Ooui.Wasm.targets | 22 ----------------------
 Ooui.Wasm/Ooui.Wasm.targets             |  3 ++-
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 Ooui.Wasm.Build.Tasks/Ooui.Wasm.targets

diff --git a/Ooui.Wasm.Build.Tasks/BuildDistTask.cs b/Ooui.Wasm.Build.Tasks/BuildDistTask.cs
index fc79a5a..2ab95d0 100644
--- a/Ooui.Wasm.Build.Tasks/BuildDistTask.cs
+++ b/Ooui.Wasm.Build.Tasks/BuildDistTask.cs
@@ -20,6 +20,8 @@ namespace Ooui.Wasm.Build.Tasks
 
         [Required]
         public string Assembly { get; set; }
+        [Required]
+        public string OutputPath { get; set; }
         public string ReferencePath { get; set; }
 
         public override bool Execute ()
@@ -78,8 +80,7 @@ namespace Ooui.Wasm.Build.Tasks
 
         void CreateDist ()
         {
-            var fullAsmPath = Path.GetFullPath (Assembly);
-            var outputPath = Path.GetDirectoryName (fullAsmPath);
+            var outputPath = Path.GetFullPath (OutputPath);
             distPath = Path.Combine (outputPath, "dist");
             managedPath = Path.Combine (distPath, "managed");
             Directory.CreateDirectory (managedPath);
diff --git a/Ooui.Wasm.Build.Tasks/Ooui.Wasm.targets b/Ooui.Wasm.Build.Tasks/Ooui.Wasm.targets
deleted file mode 100644
index f9cde31..0000000
--- a/Ooui.Wasm.Build.Tasks/Ooui.Wasm.targets
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<UsingTask TaskName="Ooui.Wasm.Build.Tasks.BuildDistTask" AssemblyFile="$(MSBuildThisFileDirectory)Ooui.Wasm.Build.Tasks.dll" />
-
-	<!-- BuildDist -->
-	<PropertyGroup>
-		<CompileDependsOn>
-			$(CompileDependsOn);
-			BuildDist;
-		</CompileDependsOn>
-	</PropertyGroup>
-
-	<Target Name="BuildDist" AfterTargets="AfterCompile" Condition="'$(_BuildDistAlreadyExecuted)'!='true'">
-		<PropertyGroup>
-			<_BuildDistAlreadyExecuted>true</_BuildDistAlreadyExecuted>
-		</PropertyGroup>
-		<BuildDistTask
-			Assembly = "$(OutputPath)$(TargetFileName)"
-			ReferencePath = "@(ReferencePath)" />
-	</Target>
-
-</Project>
diff --git a/Ooui.Wasm/Ooui.Wasm.targets b/Ooui.Wasm/Ooui.Wasm.targets
index ebeee45..ed1ac2c 100644
--- a/Ooui.Wasm/Ooui.Wasm.targets
+++ b/Ooui.Wasm/Ooui.Wasm.targets
@@ -15,7 +15,8 @@
 			<_BuildDistAlreadyExecuted>true</_BuildDistAlreadyExecuted>
 		</PropertyGroup>
 		<BuildDistTask
-			Assembly = "$(OutputPath)$(TargetFileName)"
+			Assembly = "$(IntermediateOutputPath)$(TargetFileName)"
+			OutputPath = "$(OutputPath)"
 			ReferencePath = "@(ReferencePath)" />
 	</Target>