From 970a44be151c30bbfb1100c356b5458b96210dd6 Mon Sep 17 00:00:00 2001
From: Zacchary Dempsey-Plante <zacc@ztdp.ca>
Date: Wed, 28 Oct 2020 09:57:20 -0400
Subject: [PATCH] Fixed the NuGet packing so the necessary map files are packed
 into the package as well.

---
 .travis.yml                                   |  2 +-
 Romanization/Romanization.csproj              | 30 +++++++------------
 Romanization/Utilities.cs                     |  2 +-
 .../LanguageCharacterMaps/HanjaHangeul.csv    |  0
 .../LanguageCharacterMaps/HanziHanyuPinlu.csv |  0
 .../HanziHanyuPinyin.csv                      |  0
 .../any}/LanguageCharacterMaps/HanziXHC.csv   |  0
 .../any}/LanguageCharacterMaps/KanjiKun.csv   |  0
 .../any}/LanguageCharacterMaps/KanjiOn.csv    |  0
 .../any/any}/LanguageCharacterMaps/README.md  |  0
 10 files changed, 12 insertions(+), 22 deletions(-)
 rename Romanization/{ => contentFiles/any/any}/LanguageCharacterMaps/HanjaHangeul.csv (100%)
 rename Romanization/{ => contentFiles/any/any}/LanguageCharacterMaps/HanziHanyuPinlu.csv (100%)
 rename Romanization/{ => contentFiles/any/any}/LanguageCharacterMaps/HanziHanyuPinyin.csv (100%)
 rename Romanization/{ => contentFiles/any/any}/LanguageCharacterMaps/HanziXHC.csv (100%)
 rename Romanization/{ => contentFiles/any/any}/LanguageCharacterMaps/KanjiKun.csv (100%)
 rename Romanization/{ => contentFiles/any/any}/LanguageCharacterMaps/KanjiOn.csv (100%)
 rename Romanization/{ => contentFiles/any/any}/LanguageCharacterMaps/README.md (100%)

diff --git a/.travis.yml b/.travis.yml
index b3c4abb..705ddca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_install: sudo apt-get -y install tree
 
 install:
 - dotnet restore
-- tree -a -C .
+- tree -a .
 
 script:
 - dotnet build RomanizationNet.sln --configuration Release --no-restore
diff --git a/Romanization/Romanization.csproj b/Romanization/Romanization.csproj
index d2ec0e8..fa0785e 100644
--- a/Romanization/Romanization.csproj
+++ b/Romanization/Romanization.csproj
@@ -10,8 +10,8 @@
     <RepositoryUrl>https://github.com/zedseven/Romanization.NET.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <NeutralLanguage>en-CA</NeutralLanguage>
-    <Version>0.9.2</Version>
-    <AssemblyVersion>0.9.2.0</AssemblyVersion>
+    <Version>0.9.3</Version>
+    <AssemblyVersion>0.9.3.0</AssemblyVersion>
     <AssemblyName>Romanization.NET</AssemblyName>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>Romanization Chinese Japanese Korean</PackageTags>
@@ -23,24 +23,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="LanguageCharacterMaps\HanjaHangeul.csv">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="LanguageCharacterMaps\HanziHanyuPinlu.csv">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="LanguageCharacterMaps\HanziHanyuPinyin.csv">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="LanguageCharacterMaps\HanziXHC.csv">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="LanguageCharacterMaps\KanjiKun.csv">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="LanguageCharacterMaps\KanjiOn.csv">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+		<Content Include="contentFiles/**/*.csv" copyToOutput="true">
+			<IncludeInPackage>true</IncludeInPackage>
+			<CopyToOutput>true</CopyToOutput>
+			<BuildAction>Content</BuildAction>
+			<copyToOutput>true</copyToOutput>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+			<PackageCopyToOutput>true</PackageCopyToOutput>
+		</Content>
   </ItemGroup>
 
 </Project>
diff --git a/Romanization/Utilities.cs b/Romanization/Utilities.cs
index 31da9fb..6d7882b 100644
--- a/Romanization/Utilities.cs
+++ b/Romanization/Utilities.cs
@@ -9,7 +9,7 @@ internal static class Utilities
 	{
 		// Constants
 		public static readonly string AssemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-		public static readonly string LanguageCharacterMapsPath = Path.Combine(AssemblyPath, "LanguageCharacterMaps");
+		public static readonly string LanguageCharacterMapsPath = Path.Combine(AssemblyPath, "contentFiles", "any", "any", "LanguageCharacterMaps");
 
 		// Exceptions
 		/// <summary>
diff --git a/Romanization/LanguageCharacterMaps/HanjaHangeul.csv b/Romanization/contentFiles/any/any/LanguageCharacterMaps/HanjaHangeul.csv
similarity index 100%
rename from Romanization/LanguageCharacterMaps/HanjaHangeul.csv
rename to Romanization/contentFiles/any/any/LanguageCharacterMaps/HanjaHangeul.csv
diff --git a/Romanization/LanguageCharacterMaps/HanziHanyuPinlu.csv b/Romanization/contentFiles/any/any/LanguageCharacterMaps/HanziHanyuPinlu.csv
similarity index 100%
rename from Romanization/LanguageCharacterMaps/HanziHanyuPinlu.csv
rename to Romanization/contentFiles/any/any/LanguageCharacterMaps/HanziHanyuPinlu.csv
diff --git a/Romanization/LanguageCharacterMaps/HanziHanyuPinyin.csv b/Romanization/contentFiles/any/any/LanguageCharacterMaps/HanziHanyuPinyin.csv
similarity index 100%
rename from Romanization/LanguageCharacterMaps/HanziHanyuPinyin.csv
rename to Romanization/contentFiles/any/any/LanguageCharacterMaps/HanziHanyuPinyin.csv
diff --git a/Romanization/LanguageCharacterMaps/HanziXHC.csv b/Romanization/contentFiles/any/any/LanguageCharacterMaps/HanziXHC.csv
similarity index 100%
rename from Romanization/LanguageCharacterMaps/HanziXHC.csv
rename to Romanization/contentFiles/any/any/LanguageCharacterMaps/HanziXHC.csv
diff --git a/Romanization/LanguageCharacterMaps/KanjiKun.csv b/Romanization/contentFiles/any/any/LanguageCharacterMaps/KanjiKun.csv
similarity index 100%
rename from Romanization/LanguageCharacterMaps/KanjiKun.csv
rename to Romanization/contentFiles/any/any/LanguageCharacterMaps/KanjiKun.csv
diff --git a/Romanization/LanguageCharacterMaps/KanjiOn.csv b/Romanization/contentFiles/any/any/LanguageCharacterMaps/KanjiOn.csv
similarity index 100%
rename from Romanization/LanguageCharacterMaps/KanjiOn.csv
rename to Romanization/contentFiles/any/any/LanguageCharacterMaps/KanjiOn.csv
diff --git a/Romanization/LanguageCharacterMaps/README.md b/Romanization/contentFiles/any/any/LanguageCharacterMaps/README.md
similarity index 100%
rename from Romanization/LanguageCharacterMaps/README.md
rename to Romanization/contentFiles/any/any/LanguageCharacterMaps/README.md