From a10e555095a4f7f0a6858149b3ffd6595fbd24e6 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 28 Jul 2017 11:10:06 -0400
Subject: fix i18n folder being flattened

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

diff --git a/build/smapi.targets b/build/smapi.targets
index b9f7e98e..ea0cfffb 100644
--- a/build/smapi.targets
+++ b/build/smapi.targets
@@ -34,9 +34,13 @@
            {
               foreach (ITaskItem file in Files)
               {
+                 // get file info
                  string filePath = file.ItemSpec;
                  string entryName = file.GetMetadata("RecursiveDir") + file.GetMetadata("Filename") + file.GetMetadata("Extension");
-                 
+                 if (new FileInfo(filePath).Directory.Name.Equals("i18n", StringComparison.InvariantCultureIgnoreCase))
+                    entryName = Path.Combine("i18n", entryName);
+
+                 // add to zip
                  using (Stream fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read))
                  using (Stream fileStreamInZip = archive.CreateEntry(entryName).Open())
                  {
@@ -187,8 +191,8 @@
     </PropertyGroup>
     <ItemGroup>
       <BuildFiles Include="$(TargetDir)\**\*.*" />
-      <BuildFiles Include="$(ProjectDir)\i18n\*.json" Condition="'@(BuildFiles)' != '' AND EXISTS('$(ProjectDir)\i18n')" />
       <BuildFiles Include="$(ProjectDir)\manifest.json" Condition="'@(BuildFiles)' != '' AND EXISTS('$(ProjectDir)\manifest.json')" />
+      <I18nFiles Include="$(ProjectDir)\i18n\*.json" Condition="'@(BuildFiles)' != '' AND EXISTS('$(ProjectDir)\i18n')" />
     </ItemGroup>
 
     <!--validate paths-->
@@ -198,9 +202,10 @@
     <!-- copy mod files into mod folder if <DeployModFolderName> property is set -->
     <Message Text="Deploying mod to $(ModDeployPath)..." Importance="high" Condition="'$(DeployModFolderName)' != ''" />
     <Copy SourceFiles="@(BuildFiles)" DestinationFolder="$(ModDeployPath)\%(RecursiveDir)" SkipUnchangedFiles="true" Condition="'$(DeployModFolderName)' != ''" />
+    <Copy SourceFiles="@(I18nFiles)" DestinationFolder="$(ModDeployPath)\i18n" SkipUnchangedFiles="true" Condition="'$(DeployModFolderName)' != ''" />
 
     <!-- create release zip if <DeployModZipTo> property is set -->
     <Message Text="Generating mod release at $(DeployModZipTo)\$(MSBuildProjectName).zip..." Importance="high" Condition="'$(DeployModZipTo)' != ''" />
-    <CreateModReleaseZip ModName="$(MSBuildProjectName)" Files="@(BuildFiles)" OutputFolderPath="$(DeployModZipTo)" Condition="'$(DeployModZipTo)' != ''" />
+    <CreateModReleaseZip ModName="$(MSBuildProjectName)" Files="@(BuildFiles);@(I18nFiles)" OutputFolderPath="$(DeployModZipTo)" Condition="'$(DeployModZipTo)' != ''" />
   </Target>
 </Project>
-- 
cgit 


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(-)

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 


From 048888e09347b38d19bbac5d1c123ec83acfb367 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Fri, 28 Jul 2017 11:26:08 -0400
Subject: update nuspec

---
 package.nuspec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package.nuspec b/package.nuspec
index 9abc7251..b8e96481 100644
--- a/package.nuspec
+++ b/package.nuspec
@@ -2,16 +2,18 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Pathoschild.Stardew.ModBuildConfig</id>
-    <version>1.7</version>
+    <version>1.7.1</version>
     <title>MSBuild config for Stardew Valley mods</title>
     <authors>Pathoschild</authors>
     <owners>Pathoschild</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <licenseUrl>https://github.com/Pathoschild/Stardew.ModBuildConfig/blob/1.7/LICENSE.txt</licenseUrl>
+    <licenseUrl>https://github.com/Pathoschild/Stardew.ModBuildConfig/blob/1.7.1/LICENSE.txt</licenseUrl>
     <projectUrl>https://github.com/Pathoschild/Stardew.ModBuildConfig#readme</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/Pathoschild/Stardew.ModBuildConfig/1.7/assets/nuget-icon.png</iconUrl>
+    <iconUrl>https://raw.githubusercontent.com/Pathoschild/Stardew.ModBuildConfig/1.7.1/assets/nuget-icon.png</iconUrl>
     <description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods.</description>
-    <releaseNotes>Added option to create release zips on build; added reference to XNA's XACT library for audio-related mods.</releaseNotes>
+    <releaseNotes>
+      1.7 added an option to create release zips on build and added a reference to XNA's XACT library for audio-related mods.
+      1.7.1 fixed an issue where i18n folders were flattened, and ensures that the manifest/i18n files in the project take precedence over those in the build output if both are present.</releaseNotes>
   </metadata>
   <files>
     <file src="build/smapi.targets" target="build/Pathoschild.Stardew.ModBuildConfig.targets" />
-- 
cgit