Merge pull request #10 from pdwetz/dev

Framework and nuget updates
pdwetz · Oct 31, 2022 · f13c856 · f13c856
2 parents 59899ed + 30625a4
commit f13c856
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 41 deletions.
diff --git a/KindleBookHelper.Core/BookProcessor.cs b/KindleBookHelper.Core/BookProcessor.cs
@@ -47,13 +47,13 @@ public Book Process()
         {
             Log.Information("Processing book file {jsonFilePath}", _jsonFilePath);
             var book = JsonConvert.DeserializeObject<Book>(File.ReadAllText(_jsonFilePath));
-            if (book.Id == Guid.Empty)
+            if (book.Id.IsEmpty())
             {
                 book.Id = Guid.NewGuid();
                 Log.Information("Saving new unique Id");
                 File.WriteAllText(_jsonFilePath, JsonConvert.SerializeObject(book, Formatting.Indented));
             }
-            if (string.IsNullOrWhiteSpace(book.RawFilePath))
+            if (book.RawFilePath.IsEmpty())
             {
                 Log.Error("RawFilePath is required");
                 return null;

diff --git a/KindleBookHelper.Core/KindleBookHelper.Core.csproj b/KindleBookHelper.Core/KindleBookHelper.Core.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>KindleBookHelper.Core</RootNamespace>
     <AssemblyName>KindleBookHelper.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -38,7 +38,7 @@
       <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.10.0\lib\net46\Serilog.dll</HintPath>
+      <HintPath>..\packages\Serilog.2.12.0\lib\net47\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.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WetzUtilities.1.3.0\lib\netstandard2.0\WetzUtilities.dll</HintPath>
+    <Reference Include="WetzUtilities, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WetzUtilities.1.4.0\lib\netstandard2.0\WetzUtilities.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/KindleBookHelper.Core/Properties/AssemblyInfo.cs b/KindleBookHelper.Core/Properties/AssemblyInfo.cs
@@ -6,12 +6,12 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("KindleBookHelper")]
-[assembly: AssemblyCopyright("Copyright ©  2020 Peter Wetzel")]
+[assembly: AssemblyCopyright("Copyright ©  2022 Peter Wetzel")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 [assembly: Guid("3b63a76a-c55e-4cae-84c4-d07a2cbc1afe")]
 
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
diff --git a/KindleBookHelper.Core/packages.config b/KindleBookHelper.Core/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="Nustache" version="1.16.0.10" targetFramework="net48" />
-  <package id="Serilog" version="2.10.0" targetFramework="net48" />
-  <package id="WetzUtilities" version="1.3.0" targetFramework="net48" />
+  <package id="Serilog" version="2.12.0" targetFramework="net481" />
+  <package id="WetzUtilities" version="1.4.0" targetFramework="net481" />
 </packages>
diff --git a/KindleBookHelper.Test/KindleBookHelper.Test.csproj b/KindleBookHelper.Test/KindleBookHelper.Test.csproj
@@ -1,7 +1,7 @@
 <?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.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="..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>KindleBookHelper.Test</RootNamespace>
     <AssemblyName>KindleBookHelper.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -38,8 +38,8 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <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>
+    <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -48,8 +48,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <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 Include="WetzUtilities, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WetzUtilities.1.4.0\lib\netstandard2.0\WetzUtilities.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -73,8 +73,8 @@
     <PropertyGroup>
       <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.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.3\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.3.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 ©  2020 Peter Wetzel")]
+[assembly: AssemblyCopyright("Copyright ©  2022 Peter Wetzel")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 [assembly: Guid("7ae3e0e5-19b9-4927-bfd6-d2c88f536805")]
 
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.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="13.0.1" targetFramework="net48" />
-  <package id="NUnit" version="3.12.0" targetFramework="net48" />
-  <package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net48" />
-  <package id="WetzUtilities" version="1.3.0" targetFramework="net48" />
+  <package id="NUnit" version="3.13.3" targetFramework="net481" />
+  <package id="NUnit3TestAdapter" version="4.3.0" targetFramework="net481" />
+  <package id="WetzUtilities" version="1.4.0" targetFramework="net481" />
 </packages>
diff --git a/KindleBookHelper.sln b/KindleBookHelper.sln
@@ -27,6 +27,7 @@ Global
 		{FCF8686E-4625-4FD5-B519-0596204955B5}.Release|Mixed Platforms.Build.0 = Release|x86
 		{FCF8686E-4625-4FD5-B519-0596204955B5}.Release|x86.ActiveCfg = Release|x86
 		{FCF8686E-4625-4FD5-B519-0596204955B5}.Release|x86.Build.0 = Release|x86
+		{FCF8686E-4625-4FD5-B519-0596204955B5}.Debug|Any CPU.Build.0 = Debug|x86
 		{59FCEFAE-57F6-4F19-B028-D7D63E56B57C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{59FCEFAE-57F6-4F19-B028-D7D63E56B57C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{59FCEFAE-57F6-4F19-B028-D7D63E56B57C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

diff --git a/KindleBookHelper/KindleBookHelper.csproj b/KindleBookHelper/KindleBookHelper.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>KindleBookHelper</RootNamespace>
     <AssemblyName>KindleBookHelper</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -37,17 +37,17 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <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 Include="CommandLine, Version=2.9.1.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.2.9.1\lib\net461\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.2.10.0\lib\net46\Serilog.dll</HintPath>
+      <HintPath>..\packages\Serilog.2.12.0\lib\net47\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>
+    <Reference Include="Serilog.Sinks.Console, Version=4.1.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Console.4.1.0\lib\net45\Serilog.Sinks.Console.dll</HintPath>
     </Reference>
-    <Reference Include="Serilog.Sinks.Debug, Version=1.0.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.Debug.1.0.1\lib\net46\Serilog.Sinks.Debug.dll</HintPath>
+    <Reference Include="Serilog.Sinks.Debug, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Debug.2.0.0\lib\net46\Serilog.Sinks.Debug.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

diff --git a/KindleBookHelper/Properties/AssemblyInfo.cs b/KindleBookHelper/Properties/AssemblyInfo.cs
@@ -6,12 +6,12 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("KindleBookHelper")]
-[assembly: AssemblyCopyright("Copyright ©  2020 Peter Wetzel")]
+[assembly: AssemblyCopyright("Copyright ©  2022 Peter Wetzel")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 [assembly: Guid("dc2d43bd-99a4-4644-bb22-b7288ac659c2")]
 
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
diff --git a/KindleBookHelper/packages.config b/KindleBookHelper/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <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="CommandLineParser" version="2.9.1" targetFramework="net481" />
+  <package id="Serilog" version="2.12.0" targetFramework="net481" />
+  <package id="Serilog.Sinks.Console" version="4.1.0" targetFramework="net481" />
+  <package id="Serilog.Sinks.Debug" version="2.0.0" targetFramework="net481" />
   <package id="System.Collections" version="4.3.0" targetFramework="net472" />
   <package id="System.Console" version="4.3.1" targetFramework="net472" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />