diff --git a/.gitignore b/.gitignore index 1a5de6dc..85a34026 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ /SabreTools.IO/obj/ /SabreTools.Logging/bin/ /SabreTools.Logging/obj/ +/SabreTools.Reports/bin/ +/SabreTools.Reports/obj/ /SabreTools.Skippers/bin/ /SabreTools.Skippers/obj/ /SabreTools.userprefs diff --git a/SabreTools.DatTools/SabreTools.DatTools.csproj b/SabreTools.DatTools/SabreTools.DatTools.csproj index 0d84581b..8d445f1f 100644 --- a/SabreTools.DatTools/SabreTools.DatTools.csproj +++ b/SabreTools.DatTools/SabreTools.DatTools.csproj @@ -19,6 +19,7 @@ + diff --git a/SabreTools.DatTools/Statistics.cs b/SabreTools.DatTools/Statistics.cs index 997ef62b..cd559ddf 100644 --- a/SabreTools.DatTools/Statistics.cs +++ b/SabreTools.DatTools/Statistics.cs @@ -6,9 +6,9 @@ using System.Net; using SabreTools.Core; using SabreTools.DatFiles; -using SabreTools.DatFiles.Reports; using SabreTools.IO; using SabreTools.Logging; +using SabreTools.Reports; namespace SabreTools.DatTools { diff --git a/SabreTools.DatTools/Writer.cs b/SabreTools.DatTools/Writer.cs index b44943fb..51bf2e24 100644 --- a/SabreTools.DatTools/Writer.cs +++ b/SabreTools.DatTools/Writer.cs @@ -5,9 +5,9 @@ using System.Threading.Tasks; using SabreTools.Core; using SabreTools.DatFiles; -using SabreTools.DatFiles.Reports; using SabreTools.IO; using SabreTools.Logging; +using SabreTools.Reports; // This file represents all methods related to writing to a file namespace SabreTools.DatTools diff --git a/SabreTools.DatFiles/Reports/BaseReport.cs b/SabreTools.Reports/BaseReport.cs similarity index 98% rename from SabreTools.DatFiles/Reports/BaseReport.cs rename to SabreTools.Reports/BaseReport.cs index a1b32883..1e8f885b 100644 --- a/SabreTools.DatFiles/Reports/BaseReport.cs +++ b/SabreTools.Reports/BaseReport.cs @@ -2,9 +2,10 @@ using System.IO; using SabreTools.Core; +using SabreTools.DatFiles; +using SabreTools.Reports.Formats; -// TODO: Reports namespace no longer is circular with DatFiles -namespace SabreTools.DatFiles.Reports +namespace SabreTools.Reports { /// /// Base class for a report output format diff --git a/SabreTools.DatFiles/Reports/Html.cs b/SabreTools.Reports/Formats/Html.cs similarity index 99% rename from SabreTools.DatFiles/Reports/Html.cs rename to SabreTools.Reports/Formats/Html.cs index 7a5dc2ef..b5500d4b 100644 --- a/SabreTools.DatFiles/Reports/Html.cs +++ b/SabreTools.Reports/Formats/Html.cs @@ -2,7 +2,7 @@ using System.IO; using System.Net; -namespace SabreTools.DatFiles.Reports +namespace SabreTools.Reports.Formats { /// /// HTML report format diff --git a/SabreTools.DatFiles/Reports/SeparatedValue.cs b/SabreTools.Reports/Formats/SeparatedValue.cs similarity index 99% rename from SabreTools.DatFiles/Reports/SeparatedValue.cs rename to SabreTools.Reports/Formats/SeparatedValue.cs index de703995..f0c160c9 100644 --- a/SabreTools.DatFiles/Reports/SeparatedValue.cs +++ b/SabreTools.Reports/Formats/SeparatedValue.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.DatFiles.Reports +namespace SabreTools.Reports.Formats { /// /// Separated-Value report format diff --git a/SabreTools.DatFiles/Reports/Textfile.cs b/SabreTools.Reports/Formats/Textfile.cs similarity index 98% rename from SabreTools.DatFiles/Reports/Textfile.cs rename to SabreTools.Reports/Formats/Textfile.cs index e04a699e..002026a0 100644 --- a/SabreTools.DatFiles/Reports/Textfile.cs +++ b/SabreTools.Reports/Formats/Textfile.cs @@ -1,6 +1,6 @@ using System.IO; -namespace SabreTools.DatFiles.Reports +namespace SabreTools.Reports.Formats { /// /// Textfile report format diff --git a/SabreTools.Reports/SabreTools.Reports.csproj b/SabreTools.Reports/SabreTools.Reports.csproj new file mode 100644 index 00000000..1fb9e8ad --- /dev/null +++ b/SabreTools.Reports/SabreTools.Reports.csproj @@ -0,0 +1,19 @@ + + + + net48;netcoreapp3.1;net5.0 + win10-x64;win7-x86 + Debug;Release + AnyCPU;x64 + + + + NET_FRAMEWORK + + + + + + + + diff --git a/SabreTools.sln b/SabreTools.sln index cabc4a6c..3da3c7c6 100644 --- a/SabreTools.sln +++ b/SabreTools.sln @@ -34,6 +34,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.DatItems", "Sabr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.DatTools", "SabreTools.DatTools\SabreTools.DatTools.csproj", "{E0D12252-BBF3-4E3C-B2E2-79FA49EE31E5}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Reports", "SabreTools.Reports\SabreTools.Reports.csproj", "{8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -138,6 +140,14 @@ Global {E0D12252-BBF3-4E3C-B2E2-79FA49EE31E5}.Release|Any CPU.Build.0 = Release|Any CPU {E0D12252-BBF3-4E3C-B2E2-79FA49EE31E5}.Release|x64.ActiveCfg = Release|Any CPU {E0D12252-BBF3-4E3C-B2E2-79FA49EE31E5}.Release|x64.Build.0 = Release|Any CPU + {8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Debug|x64.ActiveCfg = Debug|Any CPU + {8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Debug|x64.Build.0 = Debug|Any CPU + {8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Release|Any CPU.Build.0 = Release|Any CPU + {8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Release|x64.ActiveCfg = Release|Any CPU + {8B3F0606-0C2F-4004-9CB6-4F1F2497DCE4}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE