Merge pull request #7 from pdwetz/dev2020

v2.1.1 release
pdwetz · Oct 27, 2020 · 7b496d0 · 7b496d0
2 parents df6bd66 + ced6c14
commit 7b496d0
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 42 deletions.
diff --git a/KindleBookHelper.Core/KindleBookHelper.Core.csproj b/KindleBookHelper.Core/KindleBookHelper.Core.csproj
@@ -32,13 +32,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Nustache.Core, Version=1.16.0.10, Culture=neutral, PublicKeyToken=efd6f3d8f76ecd9f, processorArchitecture=MSIL">
       <HintPath>..\packages\Nustache.1.16.0.10\lib\net20\Nustache.Core.dll</HintPath>
     </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.2.9.0\lib\net46\Serilog.dll</HintPath>
+      <HintPath>..\packages\Serilog.2.10.0\lib\net46\Serilog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -47,8 +47,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WetzUtilities, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WetzUtilities.1.2.0\lib\netstandard2.0\WetzUtilities.dll</HintPath>
+    <Reference Include="WetzUtilities, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WetzUtilities.1.3.0\lib\netstandard2.0\WetzUtilities.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/KindleBookHelper.Core/Properties/AssemblyInfo.cs b/KindleBookHelper.Core/Properties/AssemblyInfo.cs
@@ -2,16 +2,16 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("KindleBookHelper.Core")]
-[assembly: AssemblyDescription("Converts raw text file to html format that can be consumed by KindleGen.")]
+[assembly: AssemblyDescription("Converts raw text file to html format that can be consumed by Kindle Previewer")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("KindleBookHelper")]
-[assembly: AssemblyCopyright("Copyright ©  2019 Peter Wetzel")]
+[assembly: AssemblyCopyright("Copyright ©  2020 Peter Wetzel")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 [assembly: Guid("3b63a76a-c55e-4cae-84c4-d07a2cbc1afe")]
 
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/KindleBookHelper.Core/packages.config b/KindleBookHelper.Core/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
   <package id="Nustache" version="1.16.0.10" targetFramework="net48" />
-  <package id="Serilog" version="2.9.0" targetFramework="net48" />
-  <package id="WetzUtilities" version="1.2.0" targetFramework="net48" />
+  <package id="Serilog" version="2.10.0" targetFramework="net48" />
+  <package id="WetzUtilities" version="1.3.0" targetFramework="net48" />
 </packages>
diff --git a/KindleBookHelper.Test/KindleBookHelper.Test.csproj b/KindleBookHelper.Test/KindleBookHelper.Test.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -36,7 +36,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
@@ -48,8 +48,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WetzUtilities, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WetzUtilities.1.2.0\lib\netstandard2.0\WetzUtilities.dll</HintPath>
+    <Reference Include="WetzUtilities, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WetzUtilities.1.3.0\lib\netstandard2.0\WetzUtilities.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -74,7 +74,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/KindleBookHelper.Test/Properties/AssemblyInfo.cs b/KindleBookHelper.Test/Properties/AssemblyInfo.cs
@@ -6,12 +6,12 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("KindleBookHelper")]
-[assembly: AssemblyCopyright("Copyright ©  2019 Peter Wetzel")]
+[assembly: AssemblyCopyright("Copyright ©  2020 Peter Wetzel")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 [assembly: Guid("7ae3e0e5-19b9-4927-bfd6-d2c88f536805")]
 
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/KindleBookHelper.Test/packages.config b/KindleBookHelper.Test/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
   <package id="NUnit" version="3.12.0" targetFramework="net48" />
-  <package id="NUnit3TestAdapter" version="3.15.1" targetFramework="net48" />
-  <package id="WetzUtilities" version="1.2.0" targetFramework="net48" />
+  <package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net48" />
+  <package id="WetzUtilities" version="1.3.0" targetFramework="net48" />
 </packages>
diff --git a/KindleBookHelper/KindleBookHelper.csproj b/KindleBookHelper/KindleBookHelper.csproj
@@ -37,11 +37,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommandLine, Version=2.6.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommandLineParser.2.6.0\lib\net461\CommandLine.dll</HintPath>
+    <Reference Include="CommandLine, Version=2.8.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.2.8.0\lib\net461\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.2.9.0\lib\net46\Serilog.dll</HintPath>
+      <HintPath>..\packages\Serilog.2.10.0\lib\net46\Serilog.dll</HintPath>
     </Reference>
     <Reference Include="Serilog.Sinks.Console, Version=3.1.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Sinks.Console.3.1.1\lib\net45\Serilog.Sinks.Console.dll</HintPath>
@@ -78,8 +78,8 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Reflection.TypeExtensions, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.TypeExtensions.4.6.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
+    <Reference Include="System.Reflection.TypeExtensions, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.TypeExtensions.4.7.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>

diff --git a/KindleBookHelper/Properties/AssemblyInfo.cs b/KindleBookHelper/Properties/AssemblyInfo.cs
@@ -2,16 +2,16 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("KindleBookHelper")]
-[assembly: AssemblyDescription("Converts raw text file to html format that can be consumed by KindleGen or Kindle Previewer.")]
+[assembly: AssemblyDescription("Converts raw text file to html format that can be consumed by Kindle Previewer")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("KindleBookHelper")]
-[assembly: AssemblyCopyright("Copyright ©  2019 Peter Wetzel")]
+[assembly: AssemblyCopyright("Copyright ©  2020 Peter Wetzel")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 [assembly: Guid("dc2d43bd-99a4-4644-bb22-b7288ac659c2")]
 
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/KindleBookHelper/packages.config b/KindleBookHelper/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommandLineParser" version="2.6.0" targetFramework="net48" />
-  <package id="Serilog" version="2.9.0" targetFramework="net48" />
+  <package id="CommandLineParser" version="2.8.0" targetFramework="net48" />
+  <package id="Serilog" version="2.10.0" targetFramework="net48" />
   <package id="Serilog.Sinks.Console" version="3.1.1" targetFramework="net472" />
   <package id="Serilog.Sinks.Debug" version="1.0.1" targetFramework="net472" />
   <package id="System.Collections" version="4.3.0" targetFramework="net472" />
@@ -13,7 +13,7 @@
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
   <package id="System.Reflection" version="4.3.0" targetFramework="net472" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
-  <package id="System.Reflection.TypeExtensions" version="4.6.0" targetFramework="net48" />
+  <package id="System.Reflection.TypeExtensions" version="4.7.0" targetFramework="net48" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
   <package id="System.Runtime" version="4.3.1" targetFramework="net48" />
   <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net48" />

diff --git a/README.md b/README.md
@@ -1,23 +1,23 @@
 # KindleBookHelper
 
 ## Overview
-Converts raw text file to MOBI html format that can be consumed by KindleGen/Previewer.
+Converts raw text file to MOBI html format that can be consumed by [Kindle Previewer](http://www.amazon.com/kindleformat/kindlepreviewer).
 It provides fairly basic formatting/functionality and only includes code for poetry at the moment.
 It will generate navigation, including a linkable table of contents to each poem.
 Some additional text can be included via the book metadata file.
 
-## Output
-All files utilize an "URL-friendly" version of the book title (lowercase with special characters and spaces encoded or removed)
-- book-title.opf. Xml document that serves as the book's manifest. This is the file fed into KindleGen or Previewer.
-- book-title.ncx. Xml document that lays out the book's navigation.
-- book-title.html. Html document that has all content.
-- poetry.css. Stylesheet used by book.
-
 ## Usage
 - -f JSON file with book metadata (required)
 - -e Text marking the end of each poem (optional; defaults to "[END]")
 - -p If provided, pauses the application after running (useful if running within an IDE)
 
+## Output
+All files utilize an url-friendly version of the book title (lowercase with special characters and spaces encoded or removed)
+- **book-title.opf** Xml document that serves as the book's manifest. This is the file fed into Kindle Previewer.
+- **book-title.ncx** Xml document that lays out the book's navigation.
+- **book-title.html** Html document that has all content.
+- **poetry.css** Stylesheet used by book.
+
 ## Notes
 - Program assumes that the first line is the name of the poem and that each stanza is separated by a line break
 - A unique identifier Id field will be generated on first run; be sure to clear it if re-using json for additional books.