From 9cbff9b95ee5492450661fc420b0772d9f1f4c7d Mon Sep 17 00:00:00 2001 From: Mariusz Date: Mon, 15 Aug 2016 20:23:37 +0000 Subject: [PATCH] Remove unnecessary dependences. - Refactoring: - added nuspec to MAML.HelpTopics.Content - changed namespace for MAML.HelpTopics.Content - fixed warning Issue #: 4857 --- MAML/CAS.MAML.sln => CAS.MAML.sln | 33 +++++++---- CAS.MAML.sln.GhostDoc.user.dic | 1 + .../Properties/AssemblyInfo.cs | 2 +- .../WindowHelpAssistantGui.xaml.cs | 8 +-- MAML/MAML.HelpAssistant/HelpContentCreator.cs | 3 + MAML/MAML.HelpAssistant/HelpEntity.cs | 21 +++++++ MAML/MAML.HelpAssistant/IOHelpers.cs | 3 + .../Properties/AssemblyInfo.cs | 2 +- .../Types/HelpElementTypes/CodeEntity.cs | 4 ++ .../Types/HelpElementTypes/ExternalLink.cs | 4 ++ .../Types/HelpElementTypes/Image.cs | 4 ++ .../Types/HelpElementTypes/Token.cs | 4 ++ .../Types/HelpElementTypes/Topic.cs | 4 ++ .../HelpProjectFilesTypes/SHFBProject.cs | 6 +- .../HelpTopicsCommand.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- MAML/MAML.HelpTopics.Content/HelpContent.cs | 2 +- .../MAML.HelpTopics.Content.csproj | 36 ++++++++++-- .../MAML.HelpTopics.Content.nuspec | 30 ++++++++++ .../MAML.HelpTopics.Content.tt | 36 ++++++++++++ .../Properties/AssemblyInfo.cs | 58 +++++++++---------- .../Properties/AssemblyInfo.tt | 36 ++++++++++++ MAML/MAML.HelpTopics.Content/Topics.helper.cs | 10 ++-- .../HelpTopicsPlugin.cs | 6 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- 26 files changed, 252 insertions(+), 69 deletions(-) rename MAML/CAS.MAML.sln => CAS.MAML.sln (67%) create mode 100644 CAS.MAML.sln.GhostDoc.user.dic create mode 100644 MAML/MAML.HelpTopics.Content/MAML.HelpTopics.Content.nuspec create mode 100644 MAML/MAML.HelpTopics.Content/MAML.HelpTopics.Content.tt create mode 100644 MAML/MAML.HelpTopics.Content/Properties/AssemblyInfo.tt diff --git a/MAML/CAS.MAML.sln b/CAS.MAML.sln similarity index 67% rename from MAML/CAS.MAML.sln rename to CAS.MAML.sln index e5a4720..ca5f0c5 100644 --- a/MAML/CAS.MAML.sln +++ b/CAS.MAML.sln @@ -1,25 +1,31 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.Scripts", "..\Scripts\MAML.Scripts.csproj", "{E1FC0810-38EB-4EFF-A015-BEAF031DD987}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.Scripts", "Scripts\MAML.Scripts.csproj", "{E1FC0810-38EB-4EFF-A015-BEAF031DD987}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpTopics.Content", "MAML.HelpTopics.Content\MAML.HelpTopics.Content.csproj", "{8D532F2D-3F40-462A-917F-F7BFEC8B0ED0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpTopics.Content", "MAML\MAML.HelpTopics.Content\MAML.HelpTopics.Content.csproj", "{8D532F2D-3F40-462A-917F-F7BFEC8B0ED0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.SiteMap.Content", "MAML.SiteMap.Content\MAML.SiteMap.Content.csproj", "{57DA813F-65E2-4BD8-9603-AC30C1F24671}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.SiteMap.Content", "MAML\MAML.SiteMap.Content\MAML.SiteMap.Content.csproj", "{57DA813F-65E2-4BD8-9603-AC30C1F24671}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpTopics.Plugin", "MAML.HelpTopics.Plugin\MAML.HelpTopics.Plugin.csproj", "{8028D656-0229-46A7-9EDA-C10CDEBDE7D8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpTopics.Plugin", "MAML\MAML.HelpTopics.Plugin\MAML.HelpTopics.Plugin.csproj", "{8028D656-0229-46A7-9EDA-C10CDEBDE7D8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpAssistant", "MAML.HelpAssistant\MAML.HelpAssistant.csproj", "{F1314E3F-65F6-4024-A31F-ACD8CA75550E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpAssistant", "MAML\MAML.HelpAssistant\MAML.HelpAssistant.csproj", "{F1314E3F-65F6-4024-A31F-ACD8CA75550E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpTopics.Command", "MAML.HelpTopics.Command\MAML.HelpTopics.Command.csproj", "{7E80AF18-FC7C-4067-AD9C-3034914B2CC5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpTopics.Command", "MAML\MAML.HelpTopics.Command\MAML.HelpTopics.Command.csproj", "{7E80AF18-FC7C-4067-AD9C-3034914B2CC5}" EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HelpAssistantSetup", "MAML.HelpAssistant.Setup\MAML.HelpAssistant.Setup.vdproj", "{87636843-DF0B-4C41-97B6-DE90EA706AAA}" +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "HelpAssistantSetup", "MAML\MAML.HelpAssistant.Setup\MAML.HelpAssistant.Setup.vdproj", "{87636843-DF0B-4C41-97B6-DE90EA706AAA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpAssistant.Guii", "MAML.HelpAssistant.Gui\MAML.HelpAssistant.Guii.csproj", "{2B5C241D-FFAE-4204-BBAC-2C92C6430675}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpAssistant.Guii", "MAML\MAML.HelpAssistant.Gui\MAML.HelpAssistant.Guii.csproj", "{2B5C241D-FFAE-4204-BBAC-2C92C6430675}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpAssistant.Documentation", "MAML.HelpAssistant.Documentation\MAML.HelpAssistant.Documentation.csproj", "{E7B51B22-2E47-4574-9EEE-CC3F1BE4567D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MAML.HelpAssistant.Documentation", "MAML\MAML.HelpAssistant.Documentation\MAML.HelpAssistant.Documentation.csproj", "{E7B51B22-2E47-4574-9EEE-CC3F1BE4567D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{27A2E45D-F914-4F03-A148-9773045D9727}" + ProjectSection(SolutionItems) = preProject + ReadMeFirst.txt = ReadMeFirst.txt + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Definitions", "PR39-CommonResources\T4Definitions\T4Definitions.csproj", "{D506423B-BA21-49E6-8C3B-88A771CA444E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -63,8 +69,15 @@ Global {E7B51B22-2E47-4574-9EEE-CC3F1BE4567D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7B51B22-2E47-4574-9EEE-CC3F1BE4567D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7B51B22-2E47-4574-9EEE-CC3F1BE4567D}.Release|Any CPU.Build.0 = Release|Any CPU + {D506423B-BA21-49E6-8C3B-88A771CA444E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D506423B-BA21-49E6-8C3B-88A771CA444E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D506423B-BA21-49E6-8C3B-88A771CA444E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D506423B-BA21-49E6-8C3B-88A771CA444E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {D506423B-BA21-49E6-8C3B-88A771CA444E} = {27A2E45D-F914-4F03-A148-9773045D9727} + EndGlobalSection EndGlobal diff --git a/CAS.MAML.sln.GhostDoc.user.dic b/CAS.MAML.sln.GhostDoc.user.dic new file mode 100644 index 0000000..13b9a40 --- /dev/null +++ b/CAS.MAML.sln.GhostDoc.user.dic @@ -0,0 +1 @@ +Deserializes diff --git a/MAML/MAML.HelpAssistant.Gui/Properties/AssemblyInfo.cs b/MAML/MAML.HelpAssistant.Gui/Properties/AssemblyInfo.cs index cda76de..0764992 100644 --- a/MAML/MAML.HelpAssistant.Gui/Properties/AssemblyInfo.cs +++ b/MAML/MAML.HelpAssistant.Gui/Properties/AssemblyInfo.cs @@ -52,5 +52,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion( "1.0.0.*" )] -[assembly: AssemblyFileVersion( "1.0.0.*" )] +[assembly: AssemblyFileVersion( "1.0.0" )] [assembly: GuidAttribute( "3733714A-4D67-4192-8CD3-D710D33C63FD" )] diff --git a/MAML/MAML.HelpAssistant.Gui/WindowHelpAssistantGui.xaml.cs b/MAML/MAML.HelpAssistant.Gui/WindowHelpAssistantGui.xaml.cs index d517ac9..253a888 100644 --- a/MAML/MAML.HelpAssistant.Gui/WindowHelpAssistantGui.xaml.cs +++ b/MAML/MAML.HelpAssistant.Gui/WindowHelpAssistantGui.xaml.cs @@ -16,14 +16,14 @@ //============================================================================= +using HelpAssistant; +using HelpAssistant.HelpElementTypes; using System; using System.Collections.Generic; using System.IO; using System.Windows; using System.Windows.Controls; using System.Windows.Media.Imaging; -using HelpAssistant; -using HelpAssistant.HelpElementTypes; namespace HelpAssistantGui { @@ -40,7 +40,7 @@ public partial class HelpAssistantWindow: Window #region Constructors /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// public HelpAssistantWindow() { @@ -441,7 +441,7 @@ private void Refresh_Click( object sender, RoutedEventArgs e ) /// Handles the SelectedItemChanged event of the treeViewTree control. /// /// The source of the event. - /// The instance containing the event data. + /// The instance containing the event data. private void treeViewTree_SelectedItemChanged( object sender, RoutedPropertyChangedEventArgs e ) { if ( treeViewTree.SelectedItem == null ) diff --git a/MAML/MAML.HelpAssistant/HelpContentCreator.cs b/MAML/MAML.HelpAssistant/HelpContentCreator.cs index ffc6548..57d0fe4 100644 --- a/MAML/MAML.HelpAssistant/HelpContentCreator.cs +++ b/MAML/MAML.HelpAssistant/HelpContentCreator.cs @@ -23,6 +23,9 @@ namespace HelpAssistant { + /// + /// Class HelpContentCreator. + /// public class HelpContentCreator { #region constructors diff --git a/MAML/MAML.HelpAssistant/HelpEntity.cs b/MAML/MAML.HelpAssistant/HelpEntity.cs index 58a1a8c..f1d954c 100644 --- a/MAML/MAML.HelpAssistant/HelpEntity.cs +++ b/MAML/MAML.HelpAssistant/HelpEntity.cs @@ -16,14 +16,35 @@ //============================================================================= namespace HelpAssistant { + /// + /// Class HelpEntity. + /// public abstract class HelpEntity { + /// + /// Enum elementType + /// public enum elementType { + /// + /// The image + /// Image, + /// + /// The token + /// Token, + /// + /// The topic + /// Topic, + /// + /// The code entity + /// CodeEntity, + /// + /// The external link + /// ExternalLink, } /// diff --git a/MAML/MAML.HelpAssistant/IOHelpers.cs b/MAML/MAML.HelpAssistant/IOHelpers.cs index c4157dc..131203e 100644 --- a/MAML/MAML.HelpAssistant/IOHelpers.cs +++ b/MAML/MAML.HelpAssistant/IOHelpers.cs @@ -19,6 +19,9 @@ namespace HelpAssistant { + /// + /// Class IOHelpers. + /// public class IOHelpers { private static Regex isGuid = new Regex( @"^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$", RegexOptions.Compiled ); diff --git a/MAML/MAML.HelpAssistant/Properties/AssemblyInfo.cs b/MAML/MAML.HelpAssistant/Properties/AssemblyInfo.cs index a7efb04..66b3889 100644 --- a/MAML/MAML.HelpAssistant/Properties/AssemblyInfo.cs +++ b/MAML/MAML.HelpAssistant/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion( "1.0.0.*" )] -[assembly: AssemblyFileVersion( "1.0.0.*" )] +[assembly: AssemblyFileVersion( "1.0.0" )] diff --git a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/CodeEntity.cs b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/CodeEntity.cs index 4e78f51..67ee708 100644 --- a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/CodeEntity.cs +++ b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/CodeEntity.cs @@ -16,6 +16,10 @@ namespace HelpAssistant.HelpElementTypes { + /// + /// Class CodeEntity. + /// + /// public class CodeEntity: HelpEntity { private string codeEntityName; diff --git a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/ExternalLink.cs b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/ExternalLink.cs index ddd0099..a120f2d 100644 --- a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/ExternalLink.cs +++ b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/ExternalLink.cs @@ -18,6 +18,10 @@ namespace HelpAssistant.HelpElementTypes { + /// + /// Class ExternalLink. + /// + /// public class ExternalLink: HelpEntity { private string linkText; diff --git a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Image.cs b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Image.cs index 792d298..dfd27ae 100644 --- a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Image.cs +++ b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Image.cs @@ -18,6 +18,10 @@ namespace HelpAssistant.HelpElementTypes { + /// + /// Class Image. + /// + /// public class Image: HelpEntity { private string imageName; diff --git a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Token.cs b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Token.cs index 96d4c0d..5491a1c 100644 --- a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Token.cs +++ b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Token.cs @@ -16,6 +16,10 @@ namespace HelpAssistant.HelpElementTypes { + /// + /// Class Token. + /// + /// public class Token: HelpEntity { private string tokenId; diff --git a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Topic.cs b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Topic.cs index a3df14e..10ede84 100644 --- a/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Topic.cs +++ b/MAML/MAML.HelpAssistant/Types/HelpElementTypes/Topic.cs @@ -19,6 +19,10 @@ namespace HelpAssistant.HelpElementTypes { + /// + /// Class Topic. + /// + /// public class Topic: HelpEntity { private Guid topicsGuid; diff --git a/MAML/MAML.HelpAssistant/Types/HelpProjectFilesTypes/SHFBProject.cs b/MAML/MAML.HelpAssistant/Types/HelpProjectFilesTypes/SHFBProject.cs index 1df5110..5ef4c1a 100644 --- a/MAML/MAML.HelpAssistant/Types/HelpProjectFilesTypes/SHFBProject.cs +++ b/MAML/MAML.HelpAssistant/Types/HelpProjectFilesTypes/SHFBProject.cs @@ -2300,7 +2300,7 @@ public string Value } } - /// + // /// //[System.CodeDom.Compiler.GeneratedCodeAttribute( "xsd", "2.0.50727.3038" )] //[System.SerializableAttribute()] //[System.Diagnostics.DebuggerStepThroughAttribute()] @@ -2327,7 +2327,7 @@ public string Value // } //} - /// + // /// //[System.CodeDom.Compiler.GeneratedCodeAttribute( "xsd", "2.0.50727.3038" )] //[System.SerializableAttribute()] //[System.Diagnostics.DebuggerStepThroughAttribute()] @@ -2454,7 +2454,7 @@ public enum ItemsChoiceType /// NamingMethod, - /// + // /// // PlugInConfigurations, /// diff --git a/MAML/MAML.HelpTopics.Command/HelpTopicsCommand.cs b/MAML/MAML.HelpTopics.Command/HelpTopicsCommand.cs index 913e30b..701d248 100644 --- a/MAML/MAML.HelpTopics.Command/HelpTopicsCommand.cs +++ b/MAML/MAML.HelpTopics.Command/HelpTopicsCommand.cs @@ -17,8 +17,8 @@ using System.IO; using HelpAssistant; using HelpAssistant.HelpElementTypes; -using TopicsLibrary; using SiteMapLibrary; +using CAS.MAML.HelpTopics.Content; namespace HelpTopicsCommand { diff --git a/MAML/MAML.HelpTopics.Command/Properties/AssemblyInfo.cs b/MAML/MAML.HelpTopics.Command/Properties/AssemblyInfo.cs index bad9d3a..60cfe9d 100644 --- a/MAML/MAML.HelpTopics.Command/Properties/AssemblyInfo.cs +++ b/MAML/MAML.HelpTopics.Command/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion( "1.0.0.*" )] -[assembly: AssemblyFileVersion( "1.0.0.*" )] +[assembly: AssemblyFileVersion( "1.0.0" )] diff --git a/MAML/MAML.HelpTopics.Content/HelpContent.cs b/MAML/MAML.HelpTopics.Content/HelpContent.cs index 7f929e7..379cdf6 100644 --- a/MAML/MAML.HelpTopics.Content/HelpContent.cs +++ b/MAML/MAML.HelpTopics.Content/HelpContent.cs @@ -14,7 +14,7 @@ // This source code was auto-generated by xsd, Version=2.0.50727.42. // -namespace TopicsLibrary +namespace CAS.MAML.HelpTopics.Content { /// [System.CodeDom.Compiler.GeneratedCodeAttribute( "xsd", "2.0.50727.42" )] diff --git a/MAML/MAML.HelpTopics.Content/MAML.HelpTopics.Content.csproj b/MAML/MAML.HelpTopics.Content/MAML.HelpTopics.Content.csproj index 39d43b3..2964b5e 100644 --- a/MAML/MAML.HelpTopics.Content/MAML.HelpTopics.Content.csproj +++ b/MAML/MAML.HelpTopics.Content/MAML.HelpTopics.Content.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -8,7 +8,7 @@ {8D532F2D-3F40-462A-917F-F7BFEC8B0ED0} Library Properties - CAS.HelpTopicsLibrary + CAS.MAML.HelpTopics.Content CAS.MAML.HelpTopics.Content v3.5 512 @@ -19,6 +19,7 @@ 3.5 + true @@ -28,14 +29,18 @@ DEBUG;TRACE prompt 4 + false + bin\Debug\CAS.MAML.HelpTopics.Content.XML - pdbonly + none true bin\Release\ TRACE prompt 4 + false + bin\Release\CAS.MAML.HelpTopics.Content.XML @@ -55,13 +60,36 @@ HelpContent.xsd - + + True + True + AssemblyInfo.tt + + + True + True + MAML.HelpTopics.Content.tt + + + + + TextTemplatingFileGenerator + MAML.HelpTopics.Content.nuspec + + + TextTemplatingFileGenerator + AssemblyInfo.cs + + + + +