Merge branch 'development'

jamesjohnmcguire · Feb 19, 2022 · e6bc679 · e6bc679
2 parents b82d829 + 2269cbd
commit e6bc679
Show file tree

Hide file tree

Showing 26 changed files with 110 additions and 179 deletions.
diff --git a/Documentation/MusicLibrary.txt b/Documentation/MusicLibrary.txt
@@ -472,3 +472,5 @@ iTunes
 	C:\Users\JamesMc\AppData\Local\Apple Computer\iTunes
 	C:\Users\JamesMc\AppData\Roaming\Apple Computer\Preferences\com.apple.iTunes.plist
 	C:\Users\JamesMc\AppData\Roaming\Apple Computer\iTunes
+Music Manager
+	Program has more than one entry point defined. Compile with /main to specify the type that contains the entry point.	MusicClean
diff --git a/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml b/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml
@@ -36,91 +36,42 @@
 		<Exec Command="NuGet.exe restore $(SolutionDir)\$(ProjectName).sln" />
 	</Target>
 
-	<Target Name="Buildx86Dependencies" DependsOnTargets="RestorePackages">
-		<Message Text="Building Buildx86Dependencies"/>
-		<MSBuild
-			Projects="$(SolutionDir)\MusicUtility\MusicUtility.csproj"
-			Targets="$(BuildType)"
-			Properties="Configuration=$(Configuration);SolutionDir=$(SolutionDir);Platform=x86"
-		/>
-	</Target>
-
-	<Target Name="Buildx86" DependsOnTargets="Buildx86Dependencies">
-		<Message Text="Building Buildx86"/>
-		<MSBuild
-			Projects="$(SolutionDir)\MusicClean\MusicClean.csproj"
-			Targets="$(BuildType)"
-			Properties="Configuration=$(Configuration);SolutionDir=$(SolutionDir);Platform=x86"
-		/>
-	</Target>
-
-	<Target Name="Buildx64Dependencies" DependsOnTargets="RestorePackages">
+	<Target Name="BuildDependencies" DependsOnTargets="RestorePackages">
 		<Message Text="Building Buildx64Dependencies"/>
 		<MSBuild
-			Projects="$(SolutionDir)\MusicUtility\MusicUtility.csproj"
+			Projects="$(SolutionDir)\DigitalZenWorks.MusicToolKit\DigitalZenWorks.MusicToolKit.csproj"
 			Targets="$(BuildType)"
-			Properties="Configuration=$(Configuration);SolutionDir=$(SolutionDir);Platform=x64"
+			Properties="Configuration=$(Configuration);SolutionDir=$(SolutionDir);Platform=Any CPU"
 		/>
 	</Target>
 
-	<Target Name="Buildx64" DependsOnTargets="Buildx64Dependencies">
-		<Message Text="Building Buildx64"/>
+	<Target Name="Build" DependsOnTargets="BuildDependencies">
+		<Message Text="Building Build"/>
 		<MSBuild
-			Projects="$(SolutionDir)\MusicClean\MusicClean.csproj"
+			Projects="$(SolutionDir)\MusicManager\MusicManager.csproj"
 			Targets="$(BuildType)"
-			Properties="Configuration=$(Configuration);SolutionDir=$(SolutionDir);Platform=x64"
+			Properties="Configuration=$(Configuration);SolutionDir=$(SolutionDir);Platform=Any CPU"
 		/>
 	</Target>
 
-	<Target Name="BuildTestx86" DependsOnTargets="Buildx86">
-		<Message Text="Building BuildTestx86"/>
+	<Target Name="BuildTest" DependsOnTargets="Build">
 		<MSBuild
-			Projects="$(SolutionDir)\MusicUtility\MusicUtilityTests\MusicUtilitiesTests.csproj"
-			Targets="$(BuildType)"
-			Properties="Configuration=$(Configuration);SolutionDir=$(SolutionDir);Platform=x86"
-		/>
-	</Target>
-
-	<Target Name="BuildTestx64" DependsOnTargets="Buildx64">
-		<MSBuild
-			Projects="$(SolutionDir)\MusicUtility\MusicUtilityTests\MusicUtilitiesTests.csproj"
+			Projects="$(SolutionDir)\DigitalZenWorks.MusicToolKit\DigitalZenWorks.MusicToolKit.Tests\DigitalZenWorks.MusicToolKit.Tests.csproj"
 			Targets="$(BuildType)"
 			Properties="Configuration=$(Configuration);SolutionDir=$(SolutionDir);Platform=x64"
 		/>
 	</Target>
 
-	<Target Name="Testx86" DependsOnTargets="BuildTestx86" >
-		<Message Text="Testing x86: $(SolutionDir)\Bin\$(Configuration)\x86\MusicUtility.Tests.dll"/>
+	<Target Name="Test" DependsOnTargets="BuildTest">
+		<Message Text="Testing: $(SolutionDir)\Bin\$(Configuration)\Any CPU\DigitalZenWorks.MusicToolKit.Tests.dll"/>
 
 		<PropertyGroup>
-			<TargetFramework Condition=" '$(TargetFramework)' == '' ">netcoreapp2.2</TargetFramework>
-			<NUnitResultsFile>$(OutDir)\nunit-result.x86.xml</NUnitResultsFile>
+			<TargetFramework Condition=" '$(TargetFramework)' == '' ">NET5.0</TargetFramework>
+			<NUnitResultsFile>$(OutDir)\nunit-result.xml</NUnitResultsFile>
 		</PropertyGroup>
 
 		<ItemGroup>
-			<NUnitProject Include = "$(SolutionDir)\Bin\$(Configuration)\x86\MusicUtility.Tests.dll"/>
-		</ItemGroup>
-
-		<Message Text="NUnitProject: @(NUnitProject)"/>
-		<NUnit3 Assemblies="@(NUnitProject)" Force32Bit="true"
-			OutputXmlFile="$(NUnitResultsFile)" Process="Separate"
-			ProjectConfiguration="$(Configuration)" ShowLabels="Before"
-			ToolPath="$(NUnitConsolePath)" />
-			<!-- EnableShadowCopy="true" Framework="v4.0" NoHeader="true"
-				NoColor="true" TestTimeout="2000" WorkingDirectory="./"
-				Workers="10" Verbose="true" -->
-	</Target>
-
-	<Target Name="Testx64" DependsOnTargets="BuildTestx64">
-		<Message Text="Testing x64: $(SolutionDir)\Bin\$(Configuration)\x64\MusicUtility.Tests.dll"/>
-
-		<PropertyGroup>
-			<TargetFramework Condition=" '$(TargetFramework)' == '' ">netcoreapp2.2</TargetFramework>
-			<NUnitResultsFile>$(OutDir)\nunit-result.x64.xml</NUnitResultsFile>
-		</PropertyGroup>
-
-		<ItemGroup>
-			<NUnitProject Include = "$(SolutionDir)\Bin\$(Configuration)\x64\MusicUtility.Tests.dll"/>
+			<NUnitProject Include = "$(SolutionDir)\Bin\$(Configuration)\Any CPU\DigitalZenWorks.MusicToolKit.Tests.dll"/>
 		</ItemGroup>
 
 		<Message Text="NUnitProject: @(NUnitProject)"/>
@@ -132,28 +83,12 @@
 		/>
 	</Target>
 
-	<Target Name="TestAll" DependsOnTargets="Testx86;Testx64" >
-		<Message Text="Testing: $(SolutionDir)\$(ProjectName)"/>
-	</Target>
-
-	<Target Name="Publishx86" DependsOnTargets="Testx86">
-		<Message Text="Publishing x86 Installer"/>
-	</Target>
-
-	<Target Name="Publishx64" DependsOnTargets="Testx64">
-		<Message Text="Publishing x64 Installer"/>
-	</Target>
-
-	<Target Name="BuildAllx86"
-		DependsOnTargets="Publishx86">
-	</Target>
-
-	<Target Name="BuildAllx64"
-		DependsOnTargets="Publishx64">
+	<Target Name="Publish" DependsOnTargets="Test">
+		<Message Text="Publishing"/>
 	</Target>
 
 	<Target Name="BuildAll"
-		DependsOnTargets="TestAll">
+		DependsOnTargets="Publish">
 	</Target>
 
 </Project>
diff --git a/SourceCode/MusicUtility/Chain.cs → ...ode/DigitalZenWorks.MusicToolKit/Chain.cs b/SourceCode/MusicUtility/Chain.cs → ...ode/DigitalZenWorks.MusicToolKit/Chain.cs
@@ -10,7 +10,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DigitalZenWorks.MusicUtility
+namespace DigitalZenWorks.MusicToolKit
 {
 	/// <summary>
 	/// Chain types enum.

diff --git a/SourceCode/MusicUtility/Condition.cs → ...DigitalZenWorks.MusicToolKit/Condition.cs b/SourceCode/MusicUtility/Condition.cs → ...DigitalZenWorks.MusicToolKit/Condition.cs
@@ -10,7 +10,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DigitalZenWorks.MusicUtility
+namespace DigitalZenWorks.MusicToolKit
 {
 	/// <summary>
 	/// Condition types enum.

diff --git a/SourceCode/MusicUtility/ConditionalType.cs → ...lZenWorks.MusicToolKit/ConditionalType.cs b/SourceCode/MusicUtility/ConditionalType.cs → ...lZenWorks.MusicToolKit/ConditionalType.cs
@@ -10,7 +10,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DigitalZenWorks.MusicUtility
+namespace DigitalZenWorks.MusicToolKit
 {
 	/// <summary>
 	/// Conditional types enum.

diff --git a/SourceCode/MusicUtility/DefaultRules.json → ...alZenWorks.MusicToolKit/DefaultRules.json b/SourceCode/MusicUtility/DefaultRules.json → ...alZenWorks.MusicToolKit/DefaultRules.json
diff --git a/...icUtilityTests/MusicUtilitiesTests.csproj → ...DigitalZenWorks.MusicToolKit.Tests.csproj b/...icUtilityTests/MusicUtilitiesTests.csproj → ...DigitalZenWorks.MusicToolKit.Tests.csproj
@@ -3,34 +3,29 @@
 	<PropertyGroup>
 		<AnalysisMode>AllEnabledByDefault</AnalysisMode>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<AssemblyName>MusicUtility.Tests</AssemblyName>
-		<AssemblyVersion>0.1.0.176</AssemblyVersion>
+		<AssemblyName>DigitalZenWorks.MusicToolKit.Tests</AssemblyName>
+		<AssemblyVersion>0.2.0.177</AssemblyVersion>
 		<CodeAnalysisRuleSet>..\..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
-		<FileVersion>0.1.0.176</FileVersion>
+		<FileVersion>0.2.0.177</FileVersion>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<IsTestProject>true</IsTestProject>
 		<OutputPath>$(SolutionDir)\Bin\$(Configuration)\$(Platform)</OutputPath>
 		<OutputType>Library</OutputType>
-		<Platforms>x86;x64</Platforms>
 		<TargetFramework>net6.0-windows</TargetFramework>
-		<Version>0.1.0.176</Version>
+		<Version>0.2.0.177</Version>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\MusicUtility.csproj" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Common.Logging" Version="3.4.1" />
 		<PackageReference Include="Common.Logging.Core" Version="3.4.1" />
 		<PackageReference Include="Common.Logging.Serilog" Version="4.4.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 		<PackageReference Include="NUnit" Version="3.13.2" />
-		<PackageReference Include="NUnit.Console" Version="3.12.0" />
-		<PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
+		<PackageReference Include="NUnit.Console" Version="3.15.0" />
+		<PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -44,6 +39,10 @@
 		<PackageReference Include="TagLibSharp" Version="2.2.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<ProjectReference Include="..\DigitalZenWorks.MusicToolKit.csproj" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<AdditionalFiles Include="stylecop.json" />
 	</ItemGroup>

diff --git a/...sicUtility/MusicUtilityTests/UnitTests.cs → ...lZenWorks.MusicToolKit.Tests/UnitTests.cs b/...sicUtility/MusicUtilityTests/UnitTests.cs → ...lZenWorks.MusicToolKit.Tests/UnitTests.cs
@@ -17,7 +17,7 @@
 
 [assembly: CLSCompliant(true)]
 
-namespace DigitalZenWorks.MusicUtility.Tests
+namespace DigitalZenWorks.MusicToolKit.Tests
 {
 	/// <summary>
 	/// Unit tests class.
@@ -175,7 +175,7 @@ public void ArtistNameGetFromPath()
 		[Test]
 		public void GetDefaultRules()
 		{
-			string resourceName = "DigitalZenWorks.MusicUtility.DefaultRules.json";
+			string resourceName = "DigitalZenWorks.MusicToolKit.DefaultRules.json";
 			Assembly assembly = typeof(MusicManager).Assembly;
 
 			using Stream templateObjectStream =
@@ -261,14 +261,12 @@ public void ITunesPathLocation()
 		public void LoadiTunesXmlFile()
 		{
 			using MusicManager musicUtility = new ();
-			string location = musicUtility.ITunesLibraryLocation;
-			string xmlFilePath = location + "iTunes Library.xml";
+			string xmlFilePath = musicUtility.ITunesLibraryXMLPath;
 
 			Dictionary<string, object> result =
 				ITunesXmlFile.LoadItunesXmlFile(xmlFilePath);
 
-			Log.Info("ITunesPathLocation: " + location);
-			Assert.IsNotEmpty(location);
+			Assert.NotNull(result);
 
 			int count = result.Count;
 			Assert.GreaterOrEqual(count, 1);
@@ -280,7 +278,7 @@ public void LoadiTunesXmlFile()
 		[Test]
 		public void RunRuleDiscCheck()
 		{
-			string element = "DigitalZenWorks.MusicUtility.Tags.Album";
+			string element = "DigitalZenWorks.MusicToolKit.Tags.Album";
 
 			Rule rule = new (
 				element,
@@ -342,7 +340,7 @@ public void RunRuleVariousArtistsCheck()
 
 			// Set up additional rule - and if performers tag is not empty,
 			Rule chainRule = new (
-				"DigitalZenWorks.MusicUtility.Tags.TagFile.Tag.Performers",
+				"DigitalZenWorks.MusicToolKit.Tags.TagFile.Tag.Performers",
 				Condition.NotEmpty,
 				original,
 				Operation.None,

diff --git a/...icUtility/MusicUtilityTests/stylecop.json → ...ZenWorks.MusicToolKit.Tests/stylecop.json b/...icUtility/MusicUtilityTests/stylecop.json → ...ZenWorks.MusicToolKit.Tests/stylecop.json
diff --git a/SourceCode/MusicUtility/MusicUtility.csproj → ...olKit/DigitalZenWorks.MusicToolKit.csproj b/SourceCode/MusicUtility/MusicUtility.csproj → ...olKit/DigitalZenWorks.MusicToolKit.csproj
@@ -2,22 +2,21 @@
 	<PropertyGroup>
 		<AnalysisMode>AllEnabledByDefault</AnalysisMode>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<AssemblyTitle>MusicUtility</AssemblyTitle>
-		<AssemblyVersion>0.1.0.176</AssemblyVersion>
+		<AssemblyTitle>DigitalZenWorks.MusicToolKit</AssemblyTitle>
+		<AssemblyVersion>0.2.0.177</AssemblyVersion>
 		<Authors>James John McGuire</Authors>
 		<CodeAnalysisRuleSet>..\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
 		<Company>Digital Zen Works</Company>
 		<Copyright>Copyright © 2019 - 2022</Copyright>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
-		<FileVersion>0.1.0.176</FileVersion>
+		<FileVersion>0.2.0.177</FileVersion>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NeutralLanguage>en</NeutralLanguage>
 		<NoWarn>NU1701</NoWarn>
 		<OutputPath>$(SolutionDir)\Bin\$(Configuration)\$(Platform)</OutputPath>
-		<Platforms>x86;x64</Platforms>
 		<TargetFramework>net6.0-windows</TargetFramework>
-		<Version>0.1.0.176</Version>
+		<Version>0.2.0.177</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -49,9 +48,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Compile Remove="MusicUtilityTests\**" />
-		<EmbeddedResource Remove="MusicUtilityTests\**" />
-		<None Remove="MusicUtilityTests\**" />
+		<Compile Remove="DigitalZenWorks.MusicToolKit.Tests\**" />
+		<EmbeddedResource Remove="DigitalZenWorks.MusicToolKit.Tests\**" />
+		<None Remove="DigitalZenWorks.MusicToolKit.Tests\**" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Resources.Designer.cs">

diff --git a/SourceCode/MusicUtility/ITunesXmlFile.cs → ...talZenWorks.MusicToolKit/ITunesXmlFile.cs b/SourceCode/MusicUtility/ITunesXmlFile.cs → ...talZenWorks.MusicToolKit/ITunesXmlFile.cs
@@ -16,7 +16,7 @@
 using System.Text;
 using System.Xml;
 
-namespace DigitalZenWorks.MusicUtility
+namespace DigitalZenWorks.MusicToolKit
 {
 	/// <summary>
 	/// iTunes xml file class.
@@ -40,6 +40,7 @@ public class ITunesXmlFile
 		private static readonly ILog Log = LogManager.GetLogger(
 			MethodBase.GetCurrentMethod().DeclaringType);
 
+		private readonly string libraryXMLPath;
 		private readonly XmlDocument xmlDocument;
 
 		/// <summary>
@@ -48,6 +49,8 @@ public class ITunesXmlFile
 		/// <param name="filePath">The path to iTunes xml file.</param>
 		public ITunesXmlFile(string filePath)
 		{
+			libraryXMLPath = filePath;
+
 			string fileText = File.ReadAllText(filePath, Encoding.UTF8);
 			xmlDocument = new XmlDocument();
 			xmlDocument.LoadXml(fileText);
@@ -79,6 +82,12 @@ public string ITunesFolderLocation
 			}
 		}
 
+		/// <summary>
+		/// Gets the library XML path.
+		/// </summary>
+		/// <value>The library XML path.</value>
+		public string LibraryXMLPath { get { return libraryXMLPath; } }
+
 		/// <summary>
 		/// Load iTunes xml file.
 		/// </summary>

diff --git a/SourceCode/MusicUtility/MediaFileTags.cs → ...talZenWorks.MusicToolKit/MediaFileTags.cs b/SourceCode/MusicUtility/MediaFileTags.cs → ...talZenWorks.MusicToolKit/MediaFileTags.cs
@@ -15,15 +15,15 @@
 using System.Text.RegularExpressions;
 using TagLib;
 
-namespace DigitalZenWorks.MusicUtility
+namespace DigitalZenWorks.MusicToolKit
 {
 	/// <summary>
 	/// Media file tags class.
 	/// </summary>
 	public class MediaFileTags : IDisposable
 	{
 		private static readonly ResourceManager StringTable =
-			new ("DigitalZenWorks.MusicUtility.Resources", Assembly.GetExecutingAssembly());
+			new ("DigitalZenWorks.MusicToolKit.Resources", Assembly.GetExecutingAssembly());
 
 		private readonly string filePath;
 		private readonly string iTunesLocation;