From 34eff4b08612f687c32faf8ec1b3363ba9fe0aa0 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 28 Jul 2017 11:21:38 -0400
Subject: fix duplicate manifest/i18n files added to release zip if they're
 also copied to build output

---
 build/smapi.targets | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'build/smapi.targets')

diff --git a/build/smapi.targets b/build/smapi.targets
index ea0cfffb..58737fba 100644
--- a/build/smapi.targets
+++ b/build/smapi.targets
@@ -190,9 +190,13 @@
       <DeployModZipTo Condition="'$(OS)' != 'Windows_NT'"><!--disable on Linux/Mac where CodeTaskFactory doesn't seem to be available--></DeployModZipTo>
     </PropertyGroup>
     <ItemGroup>
-      <BuildFiles Include="$(TargetDir)\**\*.*" />
-      <BuildFiles Include="$(ProjectDir)\manifest.json" Condition="'@(BuildFiles)' != '' AND EXISTS('$(ProjectDir)\manifest.json')" />
-      <I18nFiles Include="$(ProjectDir)\i18n\*.json" Condition="'@(BuildFiles)' != '' AND EXISTS('$(ProjectDir)\i18n')" />
+      <BuildFiles Include="$(TargetDir)\**\*.*" Exclude="$(TargetDir)\manifest.json;$(TargetDir)\i18n\**\*.*" />
+
+      <BuildFiles Include="$(ProjectDir)\manifest.json" Condition="'@(BuildFiles)' != ''" />
+      <BuildFiles Include="$(TargetDir)\manifest.json" Condition="'@(BuildFiles)' != '' AND !EXISTS('$(ProjectDir)\manifest.json')" />
+
+      <I18nFiles Include="$(ProjectDir)\i18n\*.json" Condition="'@(BuildFiles)' != ''" />
+      <I18nFiles Include="$(TargetDir)\i18n\*.json" Condition="'@(BuildFiles)' != '' AND !EXISTS('$(ProjectDir)\i18n')" />
     </ItemGroup>
 
     <!--validate paths-->
-- 
cgit