Merge pull request #74 from Stravaig-Projects/#72-fix-errors-and-warn…

…ings-issued-by-rid #72 Fix errors and warnings issued by Rider
Stravaig-Projects · Jan 9, 2021 · ca8e0fb · ca8e0fb
2 parents 859275c + f1dfdf4
commit ca8e0fb
Show file tree

Hide file tree

Showing 77 changed files with 583 additions and 722 deletions.
diff --git a/release-notes/wip-release-notes.md b/release-notes/wip-release-notes.md
@@ -10,4 +10,5 @@ Date: ???
 
 ### Miscellaneous
 
-* #60: Make build and release process consistent with other Stravaig Projects.
+* #60: Make build and release process consistent with other Stravaig Projects.
+* #72: Fix errors and warnings issued by Rider.
diff --git a/src/.idea/.idea.Gedcom/.idea/contentModel.xml b/src/.idea/.idea.Gedcom/.idea/contentModel.xml
diff --git a/src/.idea/.idea.Gedcom/.idea/riderModule.iml b/src/.idea/.idea.Gedcom/.idea/riderModule.iml
diff --git a/src/Gedcom.sln b/src/Gedcom.sln
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stravaig.FamilyTreeGenerato
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stravaig.FamilyTree.Common", "Stravaig.FamilyTree.Common\Stravaig.FamilyTree.Common.csproj", "{80CCDAB9-284D-44F9-8A9F-69F916C34E58}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stravaig.FamilyTree.Blazor", "Stravaig.FamilyTree.Blazor\Stravaig.FamilyTree.Blazor.csproj", "{91F859EF-8954-4602-8FBB-D8DAB7A22AA2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stravaig.FamilyTree.Standardiser", "Stravaig.FamilyTree.Standardiser\Stravaig.FamilyTree.Standardiser.csproj", "{DB98E280-0598-41B5-B864-72385BD08519}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stravaig.FamilyTree.Standardiser.UnitTests", "Stravaig.FamilyTree.Standardiser.UnitTests\Stravaig.FamilyTree.Standardiser.UnitTests.csproj", "{376ADE5A-8203-4B50-A15E-9F33E703B36D}"
@@ -23,6 +21,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CB5236BE
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stravaig.Gedcom.PowerShell", "Stravaig.Gedcom.PowerShell\Stravaig.Gedcom.PowerShell.csproj", "{EB81C74C-8593-4760-9080-D34A562041EC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__Build_and_Deploy", "__Build_and_Deploy", "{51FEE412-DC7C-4B18-9357-D9CB4BA80449}"
+ProjectSection(SolutionItems) = preProject
+	..\.github\workflows\build-gedcom-package.yml = ..\.github\workflows\build-gedcom-package.yml
+EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__Documentation", "__Documentation", "{FE3C1BE4-99FF-4487-B6CF-71E5F30E936B}"
+ProjectSection(SolutionItems) = preProject
+	..\release-notes\full-release-notes.md = ..\release-notes\full-release-notes.md
+	..\release-notes\wip-release-notes.md = ..\release-notes\wip-release-notes.md
+EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -49,10 +58,6 @@ Global
 		{80CCDAB9-284D-44F9-8A9F-69F916C34E58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80CCDAB9-284D-44F9-8A9F-69F916C34E58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80CCDAB9-284D-44F9-8A9F-69F916C34E58}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91F859EF-8954-4602-8FBB-D8DAB7A22AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91F859EF-8954-4602-8FBB-D8DAB7A22AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91F859EF-8954-4602-8FBB-D8DAB7A22AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91F859EF-8954-4602-8FBB-D8DAB7A22AA2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DB98E280-0598-41B5-B864-72385BD08519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB98E280-0598-41B5-B864-72385BD08519}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DB98E280-0598-41B5-B864-72385BD08519}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/src/Gedcom.sln.DotSettings b/src/Gedcom.sln.DotSettings
@@ -6,5 +6,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Namer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Naturalisation/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Organiser/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Paramore/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Serialiser/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Standardiser/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stravaig/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/Stravaig.FamilyTree.Blazor/Program.cs b/src/Stravaig.FamilyTree.Blazor/Program.cs
@@ -1,14 +1,10 @@
 using System;
 using System.Net.Http;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Text;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Stravaig.FamilyTree.Blazor.Services;
-using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services;
+using Stravaig.FamilyTree.Common.Humaniser;
 
 namespace Stravaig.FamilyTree.Blazor
 {

diff --git a/src/Stravaig.FamilyTree.Blazor/Shared/Relationship.razor b/src/Stravaig.FamilyTree.Blazor/Shared/Relationship.razor
@@ -1,4 +1,4 @@
-@using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services
+@using Stravaig.FamilyTree.Common.Humaniser
 @RelationshipName
 @code {
   [Parameter]

diff --git a/src/Stravaig.FamilyTree.Blazor/Shared/VirtualPages/PersonPage.razor b/src/Stravaig.FamilyTree.Blazor/Shared/VirtualPages/PersonPage.razor
@@ -3,7 +3,6 @@
 @using Stravaig.FamilyTree.Blazor.Shared.Date
 @using Stravaig.FamilyTree.Blazor.Shared.Timeline
 @using Stravaig.FamilyTree.Common.Footnotes
-@using Stravaig.FamilyTreeGenerator.Requests.Handlers.Services
 @using Stravaig.FamilyTree.Blazor.Services
 
 <h1>@Subject.NameWithoutMarker</h1>

diff --git a/src/Stravaig.FamilyTree.Common/Extensions/IEnumerableGedcomIndividualRecordExtensions.cs b/src/Stravaig.FamilyTree.Common/Extensions/IEnumerableGedcomIndividualRecordExtensions.cs
@@ -4,6 +4,8 @@
 
 namespace Stravaig.FamilyTree.Common.Extensions
 {
+    // ReSharper disable once InconsistentNaming
+    // It is named after the interface it is extending.
     public static class IEnumerableGedcomIndividualRecordExtensions
     {
         public static IEnumerable<GedcomIndividualRecord> OrderByStandardSort(

diff --git a/src/Stravaig.FamilyTree.Common/Humaniser/EnglishLanguageRelationshipRenderer.cs b/src/Stravaig.FamilyTree.Common/Humaniser/EnglishLanguageRelationshipRenderer.cs
@@ -1,6 +1,6 @@
 using Stravaig.Gedcom.Model;
 
-namespace Stravaig.FamilyTreeGenerator.Requests.Handlers.Services
+namespace Stravaig.FamilyTree.Common.Humaniser
 {
     public class EnglishLanguageRelationshipRenderer : IRelationshipRenderer
     {

diff --git a/src/Stravaig.FamilyTree.Common/Humaniser/IRelationshipRenderer.cs b/src/Stravaig.FamilyTree.Common/Humaniser/IRelationshipRenderer.cs
@@ -1,6 +1,6 @@
 using Stravaig.Gedcom.Model;
 
-namespace Stravaig.FamilyTreeGenerator.Requests.Handlers.Services
+namespace Stravaig.FamilyTree.Common.Humaniser
 {
     public interface IRelationshipRenderer
     {

diff --git a/src/Stravaig.FamilyTree.Standardiser.UnitTests/FileNamerTests.cs b/src/Stravaig.FamilyTree.Standardiser.UnitTests/FileNamerTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.IO;
 using NUnit.Framework;
 using Shouldly;
 

diff --git a/src/Stravaig.FamilyTree.Standardiser/Application.cs b/src/Stravaig.FamilyTree.Standardiser/Application.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
 using Stravaig.FamilyTree.Standardiser.Extensions;
 using Stravaig.Gedcom;

diff --git a/src/Stravaig.FamilyTree.Standardiser/CommandLineOptions.cs b/src/Stravaig.FamilyTree.Standardiser/CommandLineOptions.cs
@@ -31,7 +31,7 @@ public string DestinationFile
             set
             {
                 var absolutePath = Path.GetFullPath(value);
-                _destinationFile = value;
+                _destinationFile = absolutePath;
             }
         }
     }

diff --git a/src/Stravaig.FamilyTree.Standardiser/FileNamer.cs b/src/Stravaig.FamilyTree.Standardiser/FileNamer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Xml;
 
 namespace Stravaig.FamilyTree.Standardiser
 {

diff --git a/src/Stravaig.FamilyTree.Standardiser/Program.cs b/src/Stravaig.FamilyTree.Standardiser/Program.cs
@@ -45,8 +45,8 @@ private static ServiceProvider BuildServiceProvider(CommandLineOptions options)
 
         private static void AddApplicationServices(ServiceCollection services, CommandLineOptions options)
         {
-            services.AddSingleton<CommandLineOptions>(options);
-            services.AddSingleton<GedcomDatabase>(p=>
+            services.AddSingleton(options);
+            services.AddSingleton(p=>
             {
                 CommandLineOptions opts = p.GetRequiredService<CommandLineOptions>();
                 return GetDatabase(opts.SourceFile);

diff --git a/src/Stravaig.FamilyTreeGenerator/Extensions/GedcomDateRecordFileNameExtensions.cs b/src/Stravaig.FamilyTreeGenerator/Extensions/GedcomDateRecordFileNameExtensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.Text;
 using Stravaig.Gedcom.Model;

diff --git a/src/Stravaig.FamilyTreeGenerator/Extensions/StringExtensions.cs b/src/Stravaig.FamilyTreeGenerator/Extensions/StringExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using Stravaig.Gedcom.Extensions;
@@ -11,7 +10,7 @@ namespace Stravaig.FamilyTreeGenerator.Extensions
 {
     public static class StringExtensions
     {
-        private const char ellipsis = (char) 0x2026; // …
+        private const char Ellipsis = (char) 0x2026; // …
         public static string MakeFileNameSafe(this string target)
         {
             if (target == null)
@@ -36,7 +35,7 @@ public static string MakeFileNameSafe(this string target)
                 result = result.Replace("--", "-");
             } while (result.Length < len);
             if (len > 100)
-                result = result.Substring(0, 99) + ellipsis;
+                result = result.Substring(0, 99) + Ellipsis;
             return result;
         }
 

diff --git a/src/Stravaig.FamilyTreeGenerator/Extensions/TextWriterExtensions.cs b/src/Stravaig.FamilyTreeGenerator/Extensions/TextWriterExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.IO.Compression;
 using Stravaig.Gedcom.Extensions;
 
 namespace Stravaig.FamilyTreeGenerator.Extensions