From 0c6617edf8ef38ecaba8e1f84c390560d7b1ca3b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 27 May 2017 15:17:20 +0100 Subject: [PATCH] Refactor: Move ImageFormat to Core. --- DiscImageChef.Core/ChangeLog | 6 ++++++ DiscImageChef.Core/DiscImageChef.Core.csproj | 5 +++++ .../ImageFormat.cs | 3 ++- DiscImageChef/ChangeLog | 11 +++++++++++ DiscImageChef/Commands/Checksum.cs | 1 + DiscImageChef/Commands/Compare.cs | 1 + DiscImageChef/Commands/Decode.cs | 1 + DiscImageChef/Commands/Entropy.cs | 1 + DiscImageChef/Commands/PrintHex.cs | 1 + DiscImageChef/Commands/Verify.cs | 1 + DiscImageChef/DiscImageChef.csproj | 1 - 11 files changed, 30 insertions(+), 2 deletions(-) rename DiscImageChef/DetectImageFormat.cs => DiscImageChef.Core/ImageFormat.cs (98%) diff --git a/DiscImageChef.Core/ChangeLog b/DiscImageChef.Core/ChangeLog index 32ccd08ca..488d6b6df 100644 --- a/DiscImageChef.Core/ChangeLog +++ b/DiscImageChef.Core/ChangeLog @@ -1,3 +1,9 @@ +2017-05-27 Natalia Portillo + + * ImageFormat.cs: + * DiscImageChef.Core.csproj: Refactor: Move ImageFormat to + Core. + 2017-05-27 Natalia Portillo * PluginBase.cs: diff --git a/DiscImageChef.Core/DiscImageChef.Core.csproj b/DiscImageChef.Core/DiscImageChef.Core.csproj index 3d8d9d76c..f220a5ebb 100644 --- a/DiscImageChef.Core/DiscImageChef.Core.csproj +++ b/DiscImageChef.Core/DiscImageChef.Core.csproj @@ -35,6 +35,7 @@ + @@ -53,6 +54,10 @@ {74032CBC-339B-42F3-AF6F-E96C261F3E6A} DiscImageChef.DiscImages + + {D571B8EF-903D-4353-BDD5-B834F9F029EF} + DiscImageChef.Filters + \ No newline at end of file diff --git a/DiscImageChef/DetectImageFormat.cs b/DiscImageChef.Core/ImageFormat.cs similarity index 98% rename from DiscImageChef/DetectImageFormat.cs rename to DiscImageChef.Core/ImageFormat.cs index d2d99a11b..c161074bc 100644 --- a/DiscImageChef/DetectImageFormat.cs +++ b/DiscImageChef.Core/ImageFormat.cs @@ -34,8 +34,9 @@ using System; using DiscImageChef.Filters; using DiscImageChef.Console; using DiscImageChef.Core; +using DiscImageChef.ImagePlugins; -namespace DiscImageChef.ImagePlugins +namespace DiscImageChef.Core { public static class ImageFormat { diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 007f977c7..586ec21ab 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,14 @@ +2017-05-27 Natalia Portillo + + * Commands/Decode.cs: + * Commands/Verify.cs: + * Commands/Compare.cs: + * Commands/Entropy.cs: + * Commands/Checksum.cs: + * Commands/PrintHex.cs: + * DiscImageChef.csproj: + Refactor: Move ImageFormat to Core. + 2017-05-27 Natalia Portillo * Commands/Ls.cs: diff --git a/DiscImageChef/Commands/Checksum.cs b/DiscImageChef/Commands/Checksum.cs index aa5b8bc42..30c3508de 100644 --- a/DiscImageChef/Commands/Checksum.cs +++ b/DiscImageChef/Commands/Checksum.cs @@ -37,6 +37,7 @@ using System.Collections.Generic; using DiscImageChef.Console; using System.Threading; using DiscImageChef.Filters; +using DiscImageChef.Core; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/Commands/Compare.cs b/DiscImageChef/Commands/Compare.cs index 23b872729..5627586f7 100644 --- a/DiscImageChef/Commands/Compare.cs +++ b/DiscImageChef/Commands/Compare.cs @@ -36,6 +36,7 @@ using System.Text; using System.Collections.Generic; using DiscImageChef.Console; using DiscImageChef.Filters; +using DiscImageChef.Core; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/Commands/Decode.cs b/DiscImageChef/Commands/Decode.cs index 446f24b4a..7dbf11c02 100644 --- a/DiscImageChef/Commands/Decode.cs +++ b/DiscImageChef/Commands/Decode.cs @@ -33,6 +33,7 @@ using DiscImageChef.ImagePlugins; using DiscImageChef.Console; using DiscImageChef.Filters; +using DiscImageChef.Core; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/Commands/Entropy.cs b/DiscImageChef/Commands/Entropy.cs index 605863955..e07512a25 100644 --- a/DiscImageChef/Commands/Entropy.cs +++ b/DiscImageChef/Commands/Entropy.cs @@ -36,6 +36,7 @@ using DiscImageChef.Checksums; using System.Collections.Generic; using DiscImageChef.Console; using DiscImageChef.Filters; +using DiscImageChef.Core; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/Commands/PrintHex.cs b/DiscImageChef/Commands/PrintHex.cs index 376daf8fa..ad3c22396 100644 --- a/DiscImageChef/Commands/PrintHex.cs +++ b/DiscImageChef/Commands/PrintHex.cs @@ -33,6 +33,7 @@ using DiscImageChef.ImagePlugins; using DiscImageChef.Console; using DiscImageChef.Filters; +using DiscImageChef.Core; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/Commands/Verify.cs b/DiscImageChef/Commands/Verify.cs index d0eba3983..1df2fb141 100644 --- a/DiscImageChef/Commands/Verify.cs +++ b/DiscImageChef/Commands/Verify.cs @@ -35,6 +35,7 @@ using DiscImageChef.ImagePlugins; using System.Collections.Generic; using DiscImageChef.Console; using DiscImageChef.Filters; +using DiscImageChef.Core; namespace DiscImageChef.Commands { diff --git a/DiscImageChef/DiscImageChef.csproj b/DiscImageChef/DiscImageChef.csproj index dd6f15827..61c68e162 100644 --- a/DiscImageChef/DiscImageChef.csproj +++ b/DiscImageChef/DiscImageChef.csproj @@ -54,7 +54,6 @@ -