From cef9cad359b58611f35202605ebeb40677c95d94 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Fri, 14 Jan 2022 16:46:29 +0900 Subject: [PATCH 01/14] Update to match current project names --- SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml b/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml index c33a382..41ee6bc 100644 --- a/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml +++ b/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml @@ -48,7 +48,7 @@ From 62316c6090fc1ba26349a89a4df76d2165bf6853 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Fri, 14 Jan 2022 19:50:18 +0900 Subject: [PATCH 02/14] Remove platform configurations, back to default --- SourceCode/MusicManager.sln | 54 +++++++------------ SourceCode/MusicManager/MusicManager.csproj | 1 - SourceCode/MusicUtility/MusicUtility.csproj | 1 - .../MusicUtilitiesTests.csproj | 1 - .../TestConsoleApp/TestConsoleApp.csproj | 1 - 5 files changed, 18 insertions(+), 40 deletions(-) diff --git a/SourceCode/MusicManager.sln b/SourceCode/MusicManager.sln index f3b0a41..9d51c7d 100644 --- a/SourceCode/MusicManager.sln +++ b/SourceCode/MusicManager.sln @@ -18,44 +18,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestConsoleApp", "TestConso EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Debug|x64.ActiveCfg = Debug|x64 - {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Debug|x64.Build.0 = Debug|x64 - {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Debug|x86.ActiveCfg = Debug|x86 - {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Debug|x86.Build.0 = Debug|x86 - {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Release|x64.ActiveCfg = Release|x64 - {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Release|x64.Build.0 = Release|x64 - {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Release|x86.ActiveCfg = Release|x86 - {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Release|x86.Build.0 = Release|x86 - {A056FC65-FA91-4581-8852-126B70FBC564}.Debug|x64.ActiveCfg = Debug|x64 - {A056FC65-FA91-4581-8852-126B70FBC564}.Debug|x64.Build.0 = Debug|x64 - {A056FC65-FA91-4581-8852-126B70FBC564}.Debug|x86.ActiveCfg = Debug|x86 - {A056FC65-FA91-4581-8852-126B70FBC564}.Debug|x86.Build.0 = Debug|x86 - {A056FC65-FA91-4581-8852-126B70FBC564}.Release|x64.ActiveCfg = Release|x64 - {A056FC65-FA91-4581-8852-126B70FBC564}.Release|x64.Build.0 = Release|x64 - {A056FC65-FA91-4581-8852-126B70FBC564}.Release|x86.ActiveCfg = Release|x86 - {A056FC65-FA91-4581-8852-126B70FBC564}.Release|x86.Build.0 = Release|x86 - {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Debug|x64.ActiveCfg = Debug|x64 - {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Debug|x64.Build.0 = Debug|x64 - {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Debug|x86.ActiveCfg = Debug|x86 - {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Debug|x86.Build.0 = Debug|x86 - {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Release|x64.ActiveCfg = Release|x64 - {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Release|x64.Build.0 = Release|x64 - {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Release|x86.ActiveCfg = Release|x86 - {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Release|x86.Build.0 = Release|x86 - {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Debug|x64.ActiveCfg = Debug|x64 - {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Debug|x64.Build.0 = Debug|x64 - {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Debug|x86.ActiveCfg = Debug|x86 - {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Debug|x86.Build.0 = Debug|x86 - {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Release|x64.ActiveCfg = Release|x64 - {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Release|x64.Build.0 = Release|x64 - {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Release|x86.ActiveCfg = Release|x86 - {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Release|x86.Build.0 = Release|x86 + {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {575A6EE0-BB5C-48A2-897A-E132EDE0A97C}.Release|Any CPU.Build.0 = Release|Any CPU + {A056FC65-FA91-4581-8852-126B70FBC564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A056FC65-FA91-4581-8852-126B70FBC564}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A056FC65-FA91-4581-8852-126B70FBC564}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A056FC65-FA91-4581-8852-126B70FBC564}.Release|Any CPU.Build.0 = Release|Any CPU + {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DCEE9BF-890E-4191-A627-A68C711C30CE}.Release|Any CPU.Build.0 = Release|Any CPU + {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37A2F35A-A33F-4AED-8E02-951157D9EF01}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SourceCode/MusicManager/MusicManager.csproj b/SourceCode/MusicManager/MusicManager.csproj index 8670c13..8728829 100644 --- a/SourceCode/MusicManager/MusicManager.csproj +++ b/SourceCode/MusicManager/MusicManager.csproj @@ -15,7 +15,6 @@ en $(SolutionDir)\Bin\$(Configuration)\$(Platform) Exe - x86;x64 net6.0-windows 0.1.0.176 diff --git a/SourceCode/MusicUtility/MusicUtility.csproj b/SourceCode/MusicUtility/MusicUtility.csproj index 638ff3f..133b517 100644 --- a/SourceCode/MusicUtility/MusicUtility.csproj +++ b/SourceCode/MusicUtility/MusicUtility.csproj @@ -15,7 +15,6 @@ en NU1701 $(SolutionDir)\Bin\$(Configuration)\$(Platform) - x86;x64 net6.0-windows 0.1.0.176 diff --git a/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj b/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj index aae72d3..a54ec6e 100644 --- a/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj +++ b/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj @@ -12,7 +12,6 @@ true $(SolutionDir)\Bin\$(Configuration)\$(Platform) Library - x86;x64 net6.0-windows 0.1.0.176 diff --git a/SourceCode/TestConsoleApp/TestConsoleApp.csproj b/SourceCode/TestConsoleApp/TestConsoleApp.csproj index 0cf6c2b..cfe788a 100644 --- a/SourceCode/TestConsoleApp/TestConsoleApp.csproj +++ b/SourceCode/TestConsoleApp/TestConsoleApp.csproj @@ -18,7 +18,6 @@ $(SolutionDir)\Bin\$(Configuration)\$(Platform) Exe net6.0-windows - x64;x86 0.1.0.176 From b88aaa80b6505d011fc3888b2e6f4bea2ecf26fc Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Fri, 4 Feb 2022 23:49:01 +0900 Subject: [PATCH 03/14] Clean up notes --- Documentation/MusicLibrary.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/MusicLibrary.txt b/Documentation/MusicLibrary.txt index 387b231..825d037 100644 --- 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 From 24627d88c63dbbe6de6afbfb7921a29c1d8b5be8 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 18:14:56 +0900 Subject: [PATCH 04/14] Update packages --- .../MusicUtilityTests/MusicUtilitiesTests.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj b/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj index a54ec6e..7becebd 100644 --- a/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj +++ b/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj @@ -24,12 +24,12 @@ - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 3cd83961ca7af69c866fafb10aa30c0a6534f292 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 18:15:51 +0900 Subject: [PATCH 05/14] Fix to match current assembly name --- SourceCode/MusicUtility/MusicUtilityTests/UnitTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SourceCode/MusicUtility/MusicUtilityTests/UnitTests.cs b/SourceCode/MusicUtility/MusicUtilityTests/UnitTests.cs index 6251a89..0369fed 100644 --- a/SourceCode/MusicUtility/MusicUtilityTests/UnitTests.cs +++ b/SourceCode/MusicUtility/MusicUtilityTests/UnitTests.cs @@ -175,7 +175,7 @@ public void ArtistNameGetFromPath() [Test] public void GetDefaultRules() { - string resourceName = "DigitalZenWorks.MusicUtility.DefaultRules.json"; + string resourceName = "MusicUtility.DefaultRules.json"; Assembly assembly = typeof(MusicManager).Assembly; using Stream templateObjectStream = From deb6f34cfbb0f87c70657e0e9c0c20c64a409aff Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 18:31:08 +0900 Subject: [PATCH 06/14] Prefix assembly with DigitalZenWorks. --- .../{MusicUtility => DigitalZenWorks.MusicUtility}/Chain.cs | 0 .../Condition.cs | 0 .../ConditionalType.cs | 0 .../DefaultRules.json | 0 .../DigitalZenWorks.MusicUtility.csproj} | 2 +- .../ITunesXmlFile.cs | 0 .../MediaFileTags.cs | 0 .../MusicManager.cs | 0 .../MusicUtilityTests/MusicUtilitiesTests.csproj | 2 +- .../MusicUtilityTests/UnitTests.cs | 2 +- .../MusicUtilityTests/stylecop.json | 0 .../Operation.cs | 0 .../OrderedContractResolver.cs | 0 .../{MusicUtility => DigitalZenWorks.MusicUtility}/Paths.cs | 0 .../Resources.Designer.cs | 0 .../Resources.resx | 0 .../{MusicUtility => DigitalZenWorks.MusicUtility}/Rule.cs | 0 .../{MusicUtility => DigitalZenWorks.MusicUtility}/Rules.cs | 0 .../{MusicUtility => DigitalZenWorks.MusicUtility}/TagSet.cs | 0 .../stylecop.json | 0 SourceCode/MusicManager.sln | 4 ++-- SourceCode/MusicManager/MusicManager.csproj | 2 +- 22 files changed, 6 insertions(+), 6 deletions(-) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/Chain.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/Condition.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/ConditionalType.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/DefaultRules.json (100%) rename SourceCode/{MusicUtility/MusicUtility.csproj => DigitalZenWorks.MusicUtility/DigitalZenWorks.MusicUtility.csproj} (95%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/ITunesXmlFile.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/MediaFileTags.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/MusicManager.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/MusicUtilityTests/MusicUtilitiesTests.csproj (96%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/MusicUtilityTests/UnitTests.cs (99%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/MusicUtilityTests/stylecop.json (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/Operation.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/OrderedContractResolver.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/Paths.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/Resources.Designer.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/Resources.resx (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/Rule.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/Rules.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/TagSet.cs (100%) rename SourceCode/{MusicUtility => DigitalZenWorks.MusicUtility}/stylecop.json (100%) diff --git a/SourceCode/MusicUtility/Chain.cs b/SourceCode/DigitalZenWorks.MusicUtility/Chain.cs similarity index 100% rename from SourceCode/MusicUtility/Chain.cs rename to SourceCode/DigitalZenWorks.MusicUtility/Chain.cs diff --git a/SourceCode/MusicUtility/Condition.cs b/SourceCode/DigitalZenWorks.MusicUtility/Condition.cs similarity index 100% rename from SourceCode/MusicUtility/Condition.cs rename to SourceCode/DigitalZenWorks.MusicUtility/Condition.cs diff --git a/SourceCode/MusicUtility/ConditionalType.cs b/SourceCode/DigitalZenWorks.MusicUtility/ConditionalType.cs similarity index 100% rename from SourceCode/MusicUtility/ConditionalType.cs rename to SourceCode/DigitalZenWorks.MusicUtility/ConditionalType.cs diff --git a/SourceCode/MusicUtility/DefaultRules.json b/SourceCode/DigitalZenWorks.MusicUtility/DefaultRules.json similarity index 100% rename from SourceCode/MusicUtility/DefaultRules.json rename to SourceCode/DigitalZenWorks.MusicUtility/DefaultRules.json diff --git a/SourceCode/MusicUtility/MusicUtility.csproj b/SourceCode/DigitalZenWorks.MusicUtility/DigitalZenWorks.MusicUtility.csproj similarity index 95% rename from SourceCode/MusicUtility/MusicUtility.csproj rename to SourceCode/DigitalZenWorks.MusicUtility/DigitalZenWorks.MusicUtility.csproj index 133b517..ee056b2 100644 --- a/SourceCode/MusicUtility/MusicUtility.csproj +++ b/SourceCode/DigitalZenWorks.MusicUtility/DigitalZenWorks.MusicUtility.csproj @@ -2,7 +2,7 @@ AllEnabledByDefault false - MusicUtility + DigitalZenWorks.MusicUtility 0.1.0.176 James John McGuire ..\CodeAnalysis.ruleset diff --git a/SourceCode/MusicUtility/ITunesXmlFile.cs b/SourceCode/DigitalZenWorks.MusicUtility/ITunesXmlFile.cs similarity index 100% rename from SourceCode/MusicUtility/ITunesXmlFile.cs rename to SourceCode/DigitalZenWorks.MusicUtility/ITunesXmlFile.cs diff --git a/SourceCode/MusicUtility/MediaFileTags.cs b/SourceCode/DigitalZenWorks.MusicUtility/MediaFileTags.cs similarity index 100% rename from SourceCode/MusicUtility/MediaFileTags.cs rename to SourceCode/DigitalZenWorks.MusicUtility/MediaFileTags.cs diff --git a/SourceCode/MusicUtility/MusicManager.cs b/SourceCode/DigitalZenWorks.MusicUtility/MusicManager.cs similarity index 100% rename from SourceCode/MusicUtility/MusicManager.cs rename to SourceCode/DigitalZenWorks.MusicUtility/MusicManager.cs diff --git a/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj b/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj similarity index 96% rename from SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj rename to SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj index 7becebd..94a5e9c 100644 --- a/SourceCode/MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj +++ b/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj @@ -17,7 +17,7 @@ - + diff --git a/SourceCode/MusicUtility/MusicUtilityTests/UnitTests.cs b/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs similarity index 99% rename from SourceCode/MusicUtility/MusicUtilityTests/UnitTests.cs rename to SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs index 0369fed..6251a89 100644 --- a/SourceCode/MusicUtility/MusicUtilityTests/UnitTests.cs +++ b/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs @@ -175,7 +175,7 @@ public void ArtistNameGetFromPath() [Test] public void GetDefaultRules() { - string resourceName = "MusicUtility.DefaultRules.json"; + string resourceName = "DigitalZenWorks.MusicUtility.DefaultRules.json"; Assembly assembly = typeof(MusicManager).Assembly; using Stream templateObjectStream = diff --git a/SourceCode/MusicUtility/MusicUtilityTests/stylecop.json b/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/stylecop.json similarity index 100% rename from SourceCode/MusicUtility/MusicUtilityTests/stylecop.json rename to SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/stylecop.json diff --git a/SourceCode/MusicUtility/Operation.cs b/SourceCode/DigitalZenWorks.MusicUtility/Operation.cs similarity index 100% rename from SourceCode/MusicUtility/Operation.cs rename to SourceCode/DigitalZenWorks.MusicUtility/Operation.cs diff --git a/SourceCode/MusicUtility/OrderedContractResolver.cs b/SourceCode/DigitalZenWorks.MusicUtility/OrderedContractResolver.cs similarity index 100% rename from SourceCode/MusicUtility/OrderedContractResolver.cs rename to SourceCode/DigitalZenWorks.MusicUtility/OrderedContractResolver.cs diff --git a/SourceCode/MusicUtility/Paths.cs b/SourceCode/DigitalZenWorks.MusicUtility/Paths.cs similarity index 100% rename from SourceCode/MusicUtility/Paths.cs rename to SourceCode/DigitalZenWorks.MusicUtility/Paths.cs diff --git a/SourceCode/MusicUtility/Resources.Designer.cs b/SourceCode/DigitalZenWorks.MusicUtility/Resources.Designer.cs similarity index 100% rename from SourceCode/MusicUtility/Resources.Designer.cs rename to SourceCode/DigitalZenWorks.MusicUtility/Resources.Designer.cs diff --git a/SourceCode/MusicUtility/Resources.resx b/SourceCode/DigitalZenWorks.MusicUtility/Resources.resx similarity index 100% rename from SourceCode/MusicUtility/Resources.resx rename to SourceCode/DigitalZenWorks.MusicUtility/Resources.resx diff --git a/SourceCode/MusicUtility/Rule.cs b/SourceCode/DigitalZenWorks.MusicUtility/Rule.cs similarity index 100% rename from SourceCode/MusicUtility/Rule.cs rename to SourceCode/DigitalZenWorks.MusicUtility/Rule.cs diff --git a/SourceCode/MusicUtility/Rules.cs b/SourceCode/DigitalZenWorks.MusicUtility/Rules.cs similarity index 100% rename from SourceCode/MusicUtility/Rules.cs rename to SourceCode/DigitalZenWorks.MusicUtility/Rules.cs diff --git a/SourceCode/MusicUtility/TagSet.cs b/SourceCode/DigitalZenWorks.MusicUtility/TagSet.cs similarity index 100% rename from SourceCode/MusicUtility/TagSet.cs rename to SourceCode/DigitalZenWorks.MusicUtility/TagSet.cs diff --git a/SourceCode/MusicUtility/stylecop.json b/SourceCode/DigitalZenWorks.MusicUtility/stylecop.json similarity index 100% rename from SourceCode/MusicUtility/stylecop.json rename to SourceCode/DigitalZenWorks.MusicUtility/stylecop.json diff --git a/SourceCode/MusicManager.sln b/SourceCode/MusicManager.sln index 9d51c7d..cfd2544 100644 --- a/SourceCode/MusicManager.sln +++ b/SourceCode/MusicManager.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicManager", "MusicManager\MusicManager.csproj", "{575A6EE0-BB5C-48A2-897A-E132EDE0A97C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicUtility", "MusicUtility\MusicUtility.csproj", "{A056FC65-FA91-4581-8852-126B70FBC564}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalZenWorks.MusicUtility", "DigitalZenWorks.MusicUtility\DigitalZenWorks.MusicUtility.csproj", "{A056FC65-FA91-4581-8852-126B70FBC564}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicUtilitiesTests", "MusicUtility\MusicUtilityTests\MusicUtilitiesTests.csproj", "{0DCEE9BF-890E-4191-A627-A68C711C30CE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicUtilitiesTests", "DigitalZenWorks.MusicUtility\MusicUtilityTests\MusicUtilitiesTests.csproj", "{0DCEE9BF-890E-4191-A627-A68C711C30CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5D7E22C6-786C-4E14-A23D-A538207DBC49}" ProjectSection(SolutionItems) = preProject diff --git a/SourceCode/MusicManager/MusicManager.csproj b/SourceCode/MusicManager/MusicManager.csproj index 8728829..8750571 100644 --- a/SourceCode/MusicManager/MusicManager.csproj +++ b/SourceCode/MusicManager/MusicManager.csproj @@ -38,7 +38,7 @@ - + From 636ecd8a1e41ed1809b098524c3a97fc51417457 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 19:03:34 +0900 Subject: [PATCH 07/14] Clean up using statements --- SourceCode/MusicManager/Program.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/SourceCode/MusicManager/Program.cs b/SourceCode/MusicManager/Program.cs index 8ad4e05..66ab2aa 100644 --- a/SourceCode/MusicManager/Program.cs +++ b/SourceCode/MusicManager/Program.cs @@ -11,8 +11,6 @@ using Serilog.Events; using System; using System.IO; -using System.Reflection; -using System.Runtime.Versioning; [assembly: CLSCompliant(true)] From 761746b189e268500cddbe49cc01701736d82dd0 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 19:04:45 +0900 Subject: [PATCH 08/14] Store iTunes library XML path --- .../DigitalZenWorks.MusicUtility/ITunesXmlFile.cs | 9 +++++++++ .../DigitalZenWorks.MusicUtility/MusicManager.cs | 13 ++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/SourceCode/DigitalZenWorks.MusicUtility/ITunesXmlFile.cs b/SourceCode/DigitalZenWorks.MusicUtility/ITunesXmlFile.cs index 8965ad9..d6c27d9 100644 --- a/SourceCode/DigitalZenWorks.MusicUtility/ITunesXmlFile.cs +++ b/SourceCode/DigitalZenWorks.MusicUtility/ITunesXmlFile.cs @@ -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; /// @@ -48,6 +49,8 @@ public class ITunesXmlFile /// The path to iTunes xml file. 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 } } + /// + /// Gets the library XML path. + /// + /// The library XML path. + public string LibraryXMLPath { get { return libraryXMLPath; } } + /// /// Load iTunes xml file. /// diff --git a/SourceCode/DigitalZenWorks.MusicUtility/MusicManager.cs b/SourceCode/DigitalZenWorks.MusicUtility/MusicManager.cs index 677da0e..2621b0b 100644 --- a/SourceCode/DigitalZenWorks.MusicUtility/MusicManager.cs +++ b/SourceCode/DigitalZenWorks.MusicUtility/MusicManager.cs @@ -34,6 +34,7 @@ public class MusicManager : IDisposable private readonly IITLibraryPlaylist playList; private readonly string iTunesDirectoryLocation; + private readonly string iTunesLibraryXMLPath; private readonly string librarySkeletonDirectoryLocation; private iTunesApp iTunes; @@ -48,8 +49,9 @@ public MusicManager() // Create a reference to iTunes iTunes = new iTunesLib.iTunesApp(); playList = iTunes.LibraryPlaylist; + iTunesLibraryXMLPath = iTunes.LibraryXMLPath; - ITunesXmlFile iTunesXmlFile = new (iTunes.LibraryXMLPath); + ITunesXmlFile iTunesXmlFile = new (iTunesLibraryXMLPath); iTunesDirectoryLocation = iTunesXmlFile.ITunesFolderLocation; string temp = iTunesDirectoryLocation.Trim('\\'); @@ -84,6 +86,15 @@ public string ITunesLibraryLocation } } + /// + /// Gets the iTunes library XML path. + /// + /// The iTunes library XML path. + public string ITunesLibraryXMLPath + { + get { return iTunesLibraryXMLPath; } + } + /// /// Gets the rules. /// From c4e4b176d66af4ce34db2a65429d5691b8fea417 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 19:05:15 +0900 Subject: [PATCH 09/14] Fix LoadiTunesXmlFile test --- .../MusicUtilityTests/UnitTests.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs b/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs index 6251a89..7df3289 100644 --- a/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs +++ b/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs @@ -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 result = ITunesXmlFile.LoadItunesXmlFile(xmlFilePath); - Log.Info("ITunesPathLocation: " + location); - Assert.IsNotEmpty(location); + Assert.NotNull(result); int count = result.Count; Assert.GreaterOrEqual(count, 1); From ee8be3e1d9d3c931dfa9d4133a9458fcf59fb3c4 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 19:39:15 +0900 Subject: [PATCH 10/14] Rename assembly to DigitalZenWorks.MusicToolKit --- .../Chain.cs | 0 .../Condition.cs | 0 .../ConditionalType.cs | 0 .../DefaultRules.json | 0 .../DigitalZenWorks.MusicToolKit.Tests.csproj} | 8 ++++---- .../DigitalZenWorks.MusicToolKit.Tests}/UnitTests.cs | 0 .../DigitalZenWorks.MusicToolKit.Tests}/stylecop.json | 0 .../DigitalZenWorks.MusicToolKit.csproj} | 8 ++++---- .../ITunesXmlFile.cs | 0 .../MediaFileTags.cs | 0 .../MusicManager.cs | 0 .../Operation.cs | 0 .../OrderedContractResolver.cs | 0 .../Paths.cs | 0 .../Resources.Designer.cs | 0 .../Resources.resx | 0 .../Rule.cs | 0 .../Rules.cs | 0 .../TagSet.cs | 0 .../stylecop.json | 0 SourceCode/MusicManager.sln | 4 ++-- SourceCode/MusicManager/MusicManager.csproj | 2 +- SourceCode/TestConsoleApp/TestConsoleApp.csproj | 2 +- 23 files changed, 12 insertions(+), 12 deletions(-) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/Chain.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/Condition.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/ConditionalType.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/DefaultRules.json (100%) rename SourceCode/{DigitalZenWorks.MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj => DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj} (97%) rename SourceCode/{DigitalZenWorks.MusicUtility/MusicUtilityTests => DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests}/UnitTests.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility/MusicUtilityTests => DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests}/stylecop.json (100%) rename SourceCode/{DigitalZenWorks.MusicUtility/DigitalZenWorks.MusicUtility.csproj => DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.csproj} (88%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/ITunesXmlFile.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/MediaFileTags.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/MusicManager.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/Operation.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/OrderedContractResolver.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/Paths.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/Resources.Designer.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/Resources.resx (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/Rule.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/Rules.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/TagSet.cs (100%) rename SourceCode/{DigitalZenWorks.MusicUtility => DigitalZenWorks.MusicToolKit}/stylecop.json (100%) diff --git a/SourceCode/DigitalZenWorks.MusicUtility/Chain.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Chain.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/Chain.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/Chain.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/Condition.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Condition.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/Condition.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/Condition.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/ConditionalType.cs b/SourceCode/DigitalZenWorks.MusicToolKit/ConditionalType.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/ConditionalType.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/ConditionalType.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/DefaultRules.json b/SourceCode/DigitalZenWorks.MusicToolKit/DefaultRules.json similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/DefaultRules.json rename to SourceCode/DigitalZenWorks.MusicToolKit/DefaultRules.json diff --git a/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj similarity index 97% rename from SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj rename to SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj index 94a5e9c..e2c7ae7 100644 --- a/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/MusicUtilitiesTests.csproj +++ b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj @@ -16,10 +16,6 @@ 0.1.0.176 - - - - @@ -43,6 +39,10 @@ + + + + diff --git a/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/UnitTests.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/UnitTests.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/UnitTests.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/stylecop.json b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/stylecop.json similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/MusicUtilityTests/stylecop.json rename to SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/stylecop.json diff --git a/SourceCode/DigitalZenWorks.MusicUtility/DigitalZenWorks.MusicUtility.csproj b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.csproj similarity index 88% rename from SourceCode/DigitalZenWorks.MusicUtility/DigitalZenWorks.MusicUtility.csproj rename to SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.csproj index ee056b2..86fc01c 100644 --- a/SourceCode/DigitalZenWorks.MusicUtility/DigitalZenWorks.MusicUtility.csproj +++ b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.csproj @@ -2,7 +2,7 @@ AllEnabledByDefault false - DigitalZenWorks.MusicUtility + DigitalZenWorks.MusicToolKit 0.1.0.176 James John McGuire ..\CodeAnalysis.ruleset @@ -48,9 +48,9 @@ - - - + + + diff --git a/SourceCode/DigitalZenWorks.MusicUtility/ITunesXmlFile.cs b/SourceCode/DigitalZenWorks.MusicToolKit/ITunesXmlFile.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/ITunesXmlFile.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/ITunesXmlFile.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/MediaFileTags.cs b/SourceCode/DigitalZenWorks.MusicToolKit/MediaFileTags.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/MediaFileTags.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/MediaFileTags.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/MusicManager.cs b/SourceCode/DigitalZenWorks.MusicToolKit/MusicManager.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/MusicManager.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/MusicManager.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/Operation.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Operation.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/Operation.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/Operation.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/OrderedContractResolver.cs b/SourceCode/DigitalZenWorks.MusicToolKit/OrderedContractResolver.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/OrderedContractResolver.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/OrderedContractResolver.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/Paths.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Paths.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/Paths.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/Paths.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/Resources.Designer.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Resources.Designer.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/Resources.Designer.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/Resources.Designer.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/Resources.resx b/SourceCode/DigitalZenWorks.MusicToolKit/Resources.resx similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/Resources.resx rename to SourceCode/DigitalZenWorks.MusicToolKit/Resources.resx diff --git a/SourceCode/DigitalZenWorks.MusicUtility/Rule.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Rule.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/Rule.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/Rule.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/Rules.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Rules.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/Rules.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/Rules.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/TagSet.cs b/SourceCode/DigitalZenWorks.MusicToolKit/TagSet.cs similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/TagSet.cs rename to SourceCode/DigitalZenWorks.MusicToolKit/TagSet.cs diff --git a/SourceCode/DigitalZenWorks.MusicUtility/stylecop.json b/SourceCode/DigitalZenWorks.MusicToolKit/stylecop.json similarity index 100% rename from SourceCode/DigitalZenWorks.MusicUtility/stylecop.json rename to SourceCode/DigitalZenWorks.MusicToolKit/stylecop.json diff --git a/SourceCode/MusicManager.sln b/SourceCode/MusicManager.sln index cfd2544..7b58567 100644 --- a/SourceCode/MusicManager.sln +++ b/SourceCode/MusicManager.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicManager", "MusicManager\MusicManager.csproj", "{575A6EE0-BB5C-48A2-897A-E132EDE0A97C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalZenWorks.MusicUtility", "DigitalZenWorks.MusicUtility\DigitalZenWorks.MusicUtility.csproj", "{A056FC65-FA91-4581-8852-126B70FBC564}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalZenWorks.MusicToolKit", "DigitalZenWorks.MusicToolKit\DigitalZenWorks.MusicToolKit.csproj", "{A056FC65-FA91-4581-8852-126B70FBC564}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicUtilitiesTests", "DigitalZenWorks.MusicUtility\MusicUtilityTests\MusicUtilitiesTests.csproj", "{0DCEE9BF-890E-4191-A627-A68C711C30CE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalZenWorks.MusicToolKit.Tests", "DigitalZenWorks.MusicToolKit\DigitalZenWorks.MusicToolKit.Tests\DigitalZenWorks.MusicToolKit.Tests.csproj", "{0DCEE9BF-890E-4191-A627-A68C711C30CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5D7E22C6-786C-4E14-A23D-A538207DBC49}" ProjectSection(SolutionItems) = preProject diff --git a/SourceCode/MusicManager/MusicManager.csproj b/SourceCode/MusicManager/MusicManager.csproj index 8750571..0255844 100644 --- a/SourceCode/MusicManager/MusicManager.csproj +++ b/SourceCode/MusicManager/MusicManager.csproj @@ -38,7 +38,7 @@ - + diff --git a/SourceCode/TestConsoleApp/TestConsoleApp.csproj b/SourceCode/TestConsoleApp/TestConsoleApp.csproj index cfe788a..d31fbc5 100644 --- a/SourceCode/TestConsoleApp/TestConsoleApp.csproj +++ b/SourceCode/TestConsoleApp/TestConsoleApp.csproj @@ -40,7 +40,7 @@ - + From 35f41de0158b2656c3160834fccff789771cfc5e Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 19:45:40 +0900 Subject: [PATCH 11/14] Change default namespace to match assembly --- SourceCode/DigitalZenWorks.MusicToolKit/Chain.cs | 2 +- SourceCode/DigitalZenWorks.MusicToolKit/Condition.cs | 2 +- .../DigitalZenWorks.MusicToolKit/ConditionalType.cs | 2 +- .../DigitalZenWorks.MusicToolKit.Tests/UnitTests.cs | 8 ++++---- SourceCode/DigitalZenWorks.MusicToolKit/ITunesXmlFile.cs | 2 +- SourceCode/DigitalZenWorks.MusicToolKit/MediaFileTags.cs | 4 ++-- SourceCode/DigitalZenWorks.MusicToolKit/MusicManager.cs | 6 +++--- SourceCode/DigitalZenWorks.MusicToolKit/Operation.cs | 2 +- .../OrderedContractResolver.cs | 2 +- SourceCode/DigitalZenWorks.MusicToolKit/Paths.cs | 2 +- .../DigitalZenWorks.MusicToolKit/Resources.Designer.cs | 4 ++-- SourceCode/DigitalZenWorks.MusicToolKit/Rule.cs | 2 +- SourceCode/DigitalZenWorks.MusicToolKit/Rules.cs | 2 +- SourceCode/DigitalZenWorks.MusicToolKit/TagSet.cs | 2 +- SourceCode/MusicManager/Program.cs | 4 ++-- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/Chain.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Chain.cs index a64c971..3ccedb3 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/Chain.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/Chain.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Chain types enum. diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/Condition.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Condition.cs index e96a219..7cebf1f 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/Condition.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/Condition.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Condition types enum. diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/ConditionalType.cs b/SourceCode/DigitalZenWorks.MusicToolKit/ConditionalType.cs index faec3c2..ef586f0 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/ConditionalType.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/ConditionalType.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Conditional types enum. diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/UnitTests.cs b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/UnitTests.cs index 7df3289..3df2ef5 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/UnitTests.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/UnitTests.cs @@ -17,7 +17,7 @@ [assembly: CLSCompliant(true)] -namespace DigitalZenWorks.MusicUtility.Tests +namespace DigitalZenWorks.MusicToolKit.Tests { /// /// 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 = @@ -278,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, @@ -340,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/SourceCode/DigitalZenWorks.MusicToolKit/ITunesXmlFile.cs b/SourceCode/DigitalZenWorks.MusicToolKit/ITunesXmlFile.cs index d6c27d9..969185e 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/ITunesXmlFile.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/ITunesXmlFile.cs @@ -16,7 +16,7 @@ using System.Text; using System.Xml; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// iTunes xml file class. diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/MediaFileTags.cs b/SourceCode/DigitalZenWorks.MusicToolKit/MediaFileTags.cs index a7330c7..4821e85 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/MediaFileTags.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/MediaFileTags.cs @@ -15,7 +15,7 @@ using System.Text.RegularExpressions; using TagLib; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Media file tags class. @@ -23,7 +23,7 @@ namespace DigitalZenWorks.MusicUtility 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; diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/MusicManager.cs b/SourceCode/DigitalZenWorks.MusicToolKit/MusicManager.cs index 2621b0b..7c640b9 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/MusicManager.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/MusicManager.cs @@ -19,7 +19,7 @@ [assembly: CLSCompliant(false)] -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Music manager class. @@ -30,7 +30,7 @@ public class MusicManager : IDisposable MethodBase.GetCurrentMethod().DeclaringType); private static readonly ResourceManager StringTable = - new ("DigitalZenWorks.MusicUtility.Resources", Assembly.GetExecutingAssembly()); + new ("DigitalZenWorks.MusicToolKit.Resources", Assembly.GetExecutingAssembly()); private readonly IITLibraryPlaylist playList; private readonly string iTunesDirectoryLocation; @@ -297,7 +297,7 @@ private Rules GetDefaultRules() { string contents = null; - string resourceName = "DigitalZenWorks.MusicUtility.DefaultRules.json"; + string resourceName = "DigitalZenWorks.MusicToolKit.DefaultRules.json"; Assembly thisAssembly = Assembly.GetCallingAssembly(); using (Stream templateObjectStream = diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/Operation.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Operation.cs index e1e6500..4e3c447 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/Operation.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/Operation.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Operation types enum. diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/OrderedContractResolver.cs b/SourceCode/DigitalZenWorks.MusicToolKit/OrderedContractResolver.cs index f44992b..8e4f82a 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/OrderedContractResolver.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/OrderedContractResolver.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Ordered contract resolver class. diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/Paths.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Paths.cs index f84d1c5..4e8fd1e 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/Paths.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/Paths.cs @@ -12,7 +12,7 @@ using System.Text; using System.Threading.Tasks; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Paths class. diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/Resources.Designer.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Resources.Designer.cs index 556d5ed..9d25d8c 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/Resources.Designer.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace DigitalZenWorks.MusicUtility { +namespace DigitalZenWorks.MusicToolKit { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DigitalZenWorks.MusicUtility.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DigitalZenWorks.MusicToolKit.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/Rule.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Rule.cs index e112316..ef2af4d 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/Rule.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/Rule.cs @@ -12,7 +12,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { ///////////////////////////////////////////////////////////////////////// /// diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/Rules.cs b/SourceCode/DigitalZenWorks.MusicToolKit/Rules.cs index 95670ea..b4e30f7 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/Rules.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/Rules.cs @@ -10,7 +10,7 @@ using System.Globalization; using System.Reflection; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Rules class. diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/TagSet.cs b/SourceCode/DigitalZenWorks.MusicToolKit/TagSet.cs index 62308ff..6d03455 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/TagSet.cs +++ b/SourceCode/DigitalZenWorks.MusicToolKit/TagSet.cs @@ -6,7 +6,7 @@ using TagLib; -namespace DigitalZenWorks.MusicUtility +namespace DigitalZenWorks.MusicToolKit { /// /// Tag set class. diff --git a/SourceCode/MusicManager/Program.cs b/SourceCode/MusicManager/Program.cs index 66ab2aa..99eee3f 100644 --- a/SourceCode/MusicManager/Program.cs +++ b/SourceCode/MusicManager/Program.cs @@ -5,7 +5,7 @@ ///////////////////////////////////////////////////////////////////////////// using Common.Logging; -using DigitalZenWorks.MusicUtility; +using DigitalZenWorks.MusicToolKit; using Serilog; using Serilog.Configuration; using Serilog.Events; @@ -50,7 +50,7 @@ public static void Main(string[] args) rules = new (rulesData); } - using DigitalZenWorks.MusicUtility.MusicManager musicUtility = new (rules); + using DigitalZenWorks.MusicToolKit.MusicManager musicUtility = new (rules); musicUtility.UpdateLibrarySkeleton(); musicUtility.CleanMusicLibrary(); From a9922a51bb697319e66437432c4654e0c7ac6101 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 20:13:31 +0900 Subject: [PATCH 12/14] Bump version build numbers --- .../DigitalZenWorks.MusicToolKit.Tests.csproj | 6 +++--- .../DigitalZenWorks.MusicToolKit.csproj | 6 +++--- SourceCode/MusicManager/MusicManager.csproj | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj index e2c7ae7..0df3a04 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj +++ b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj @@ -4,16 +4,16 @@ AllEnabledByDefault false MusicUtility.Tests - 0.1.0.176 + 0.2.0.177 ..\..\CodeAnalysis.ruleset true - 0.1.0.176 + 0.2.0.177 true true $(SolutionDir)\Bin\$(Configuration)\$(Platform) Library net6.0-windows - 0.1.0.176 + 0.2.0.177 diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.csproj b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.csproj index 86fc01c..dfcc9f7 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.csproj +++ b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.csproj @@ -3,20 +3,20 @@ AllEnabledByDefault false DigitalZenWorks.MusicToolKit - 0.1.0.176 + 0.2.0.177 James John McGuire ..\CodeAnalysis.ruleset Digital Zen Works Copyright © 2019 - 2022 true - 0.1.0.176 + 0.2.0.177 false true en NU1701 $(SolutionDir)\Bin\$(Configuration)\$(Platform) net6.0-windows - 0.1.0.176 + 0.2.0.177 diff --git a/SourceCode/MusicManager/MusicManager.csproj b/SourceCode/MusicManager/MusicManager.csproj index 0255844..ec4ccd7 100644 --- a/SourceCode/MusicManager/MusicManager.csproj +++ b/SourceCode/MusicManager/MusicManager.csproj @@ -4,19 +4,19 @@ AllEnabledByDefault false MusicClean - 0.1.0.176 + 0.2.0.177 James John McGuire ..\CodeAnalysis.ruleset Digital Zen Works Copyright © 2019 - 2022 true - 0.1.0.176 + 0.2.0.177 true en $(SolutionDir)\Bin\$(Configuration)\$(Platform) Exe net6.0-windows - 0.1.0.176 + 0.2.0.177 From 791e378269d21b785170d78f748b161dbb58ffc2 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 22:14:41 +0900 Subject: [PATCH 13/14] Update paths to match current structure --- .../Commands/MusicLibrary.msbuild.xml | 99 ++++--------------- 1 file changed, 17 insertions(+), 82 deletions(-) diff --git a/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml b/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml index 41ee6bc..1ce2fcc 100644 --- a/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml +++ b/SourceCode/DevelopmentTools/Commands/MusicLibrary.msbuild.xml @@ -36,91 +36,42 @@ - - - - - - - - - - - + - - + + - - - - - - + - - + + - netcoreapp2.2 - $(OutDir)\nunit-result.x86.xml + NET5.0 + $(OutDir)\nunit-result.xml - - - - - - - - - - - - - netcoreapp2.2 - $(OutDir)\nunit-result.x64.xml - - - - + @@ -132,28 +83,12 @@ /> - - - - - - - - - - - - - - - - + + + DependsOnTargets="Publish"> From 2269cbd2aa69fa0e701903c22826fd06b1e0e9a8 Mon Sep 17 00:00:00 2001 From: James John McGuire Date: Sat, 19 Feb 2022 22:15:27 +0900 Subject: [PATCH 14/14] Update assembly title's --- .../DigitalZenWorks.MusicToolKit.Tests.csproj | 2 +- SourceCode/MusicManager/MusicManager.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj index 0df3a04..ef4782d 100644 --- a/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj +++ b/SourceCode/DigitalZenWorks.MusicToolKit/DigitalZenWorks.MusicToolKit.Tests/DigitalZenWorks.MusicToolKit.Tests.csproj @@ -3,7 +3,7 @@ AllEnabledByDefault false - MusicUtility.Tests + DigitalZenWorks.MusicToolKit.Tests 0.2.0.177 ..\..\CodeAnalysis.ruleset true diff --git a/SourceCode/MusicManager/MusicManager.csproj b/SourceCode/MusicManager/MusicManager.csproj index ec4ccd7..f83dc0b 100644 --- a/SourceCode/MusicManager/MusicManager.csproj +++ b/SourceCode/MusicManager/MusicManager.csproj @@ -3,7 +3,7 @@ AllEnabledByDefault false - MusicClean + MusicManager 0.2.0.177 James John McGuire ..\CodeAnalysis.ruleset