Remove unnecessary dependences. - Refactoring:

- added nuspec to MAML.HelpTopics.Content - changed namespace for MAML.HelpTopics.Content - fixed warning Issue #: 4857
commsvr-com · Aug 15, 2016 · 9cbff9b · 9cbff9b
1 parent 20c4c53
commit 9cbff9b
Show file tree

Hide file tree

Showing 26 changed files with 252 additions and 69 deletions.
diff --git a/MAML/CAS.MAML.sln → CAS.MAML.sln b/MAML/CAS.MAML.sln → 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
@@ -0,0 +1 @@
+Deserializes
diff --git 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
@@ -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
     /// <summary>
-    /// Initializes a new instance of the <see cref="Window1"/> class.
+    /// Initializes a new instance of the <see cref="HelpAssistantWindow"/> class.
     /// </summary>
     public HelpAssistantWindow()
     {
@@ -441,7 +441,7 @@ private void Refresh_Click( object sender, RoutedEventArgs e )
     /// Handles the SelectedItemChanged event of the treeViewTree control.
     /// </summary>
     /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The <see cref="System.Windows.RoutedPropertyChangedEventArgs&lt;System.Object&gt;"/> instance containing the event data.</param>
+    /// <param name="e">The <see cref="RoutedPropertyChangedEventArgs{Object}"/> instance containing the event data.</param>
     private void treeViewTree_SelectedItemChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
     {
       if ( treeViewTree.SelectedItem == null )

diff --git a/MAML/MAML.HelpAssistant/HelpContentCreator.cs b/MAML/MAML.HelpAssistant/HelpContentCreator.cs
@@ -23,6 +23,9 @@
 
 namespace HelpAssistant
 {
+  /// <summary>
+  /// Class HelpContentCreator.
+  /// </summary>
   public class HelpContentCreator 
   {
     #region constructors

diff --git a/MAML/MAML.HelpAssistant/HelpEntity.cs b/MAML/MAML.HelpAssistant/HelpEntity.cs
@@ -16,14 +16,35 @@
 //=============================================================================
 namespace HelpAssistant
 {
+  /// <summary>
+  /// Class HelpEntity.
+  /// </summary>
   public abstract class HelpEntity
   {
+    /// <summary>
+    /// Enum elementType
+    /// </summary>
     public enum elementType
     {
+      /// <summary>
+      /// The image
+      /// </summary>
       Image,
+      /// <summary>
+      /// The token
+      /// </summary>
       Token,
+      /// <summary>
+      /// The topic
+      /// </summary>
       Topic,
+      /// <summary>
+      /// The code entity
+      /// </summary>
       CodeEntity,
+      /// <summary>
+      /// The external link
+      /// </summary>
       ExternalLink,
     }
     /// <summary>

diff --git a/MAML/MAML.HelpAssistant/IOHelpers.cs b/MAML/MAML.HelpAssistant/IOHelpers.cs
@@ -19,6 +19,9 @@
 
 namespace HelpAssistant
 {
+  /// <summary>
+  /// Class IOHelpers.
+  /// </summary>
   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
@@ -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
@@ -16,6 +16,10 @@
 
 namespace HelpAssistant.HelpElementTypes
 {
+  /// <summary>
+  /// Class CodeEntity.
+  /// </summary>
+  /// <seealso cref="HelpAssistant.HelpEntity" />
   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
@@ -18,6 +18,10 @@
 
 namespace HelpAssistant.HelpElementTypes
 {
+  /// <summary>
+  /// Class ExternalLink.
+  /// </summary>
+  /// <seealso cref="HelpAssistant.HelpEntity" />
   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
@@ -18,6 +18,10 @@
 
 namespace HelpAssistant.HelpElementTypes
 {
+  /// <summary>
+  /// Class Image.
+  /// </summary>
+  /// <seealso cref="HelpAssistant.HelpEntity" />
   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
@@ -16,6 +16,10 @@
 
 namespace HelpAssistant.HelpElementTypes
 {
+  /// <summary>
+  /// Class Token.
+  /// </summary>
+  /// <seealso cref="HelpAssistant.HelpEntity" />
   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
@@ -19,6 +19,10 @@
 
 namespace HelpAssistant.HelpElementTypes
 {
+  /// <summary>
+  /// Class Topic.
+  /// </summary>
+  /// <seealso cref="HelpAssistant.HelpEntity" />
   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
@@ -2300,7 +2300,7 @@ public string Value
     }
   }
 
-  /// <remarks/>
+  // /// <remarks/>
   //[System.CodeDom.Compiler.GeneratedCodeAttribute( "xsd", "2.0.50727.3038" )]
   //[System.SerializableAttribute()]
   //[System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2327,7 +2327,7 @@ public string Value
   //  }
   //}
 
-  /// <remarks/>
+  // /// <remarks/>
   //[System.CodeDom.Compiler.GeneratedCodeAttribute( "xsd", "2.0.50727.3038" )]
   //[System.SerializableAttribute()]
   //[System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2454,7 +2454,7 @@ public enum ItemsChoiceType
     /// <remarks/>
     NamingMethod,
 
-    /// <remarks/>
+    // /// <remarks/>
  //   PlugInConfigurations,
 
     /// <remarks/>

diff --git 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
@@ -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
@@ -14,7 +14,7 @@
 // This source code was auto-generated by xsd, Version=2.0.50727.42.
 // 
 
-namespace TopicsLibrary
+namespace CAS.MAML.HelpTopics.Content
 {
   /// <uwagi/>
   [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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,7 @@
     <ProjectGuid>{8D532F2D-3F40-462A-917F-F7BFEC8B0ED0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CAS.HelpTopicsLibrary</RootNamespace>
+    <RootNamespace>CAS.MAML.HelpTopics.Content</RootNamespace>
     <AssemblyName>CAS.MAML.HelpTopics.Content</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -19,6 +19,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -28,14 +29,18 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\Debug\CAS.MAML.HelpTopics.Content.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\Release\CAS.MAML.HelpTopics.Content.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -55,13 +60,36 @@
     <Compile Include="HelpContent.cs">
       <DependentUpon>HelpContent.xsd</DependentUpon>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>AssemblyInfo.tt</DependentUpon>
+    </Compile>
     <Compile Include="Topics.helper.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="MAML.HelpTopics.Content.nuspec">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>MAML.HelpTopics.Content.tt</DependentUpon>
+    </None>
     <None Include="cas.snk" />
     <None Include="HelpContent.xsd" />
   </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Content Include="MAML.HelpTopics.Content.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>MAML.HelpTopics.Content.nuspec</LastGenOutput>
+    </Content>
+    <Content Include="Properties\AssemblyInfo.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>AssemblyInfo.cs</LastGenOutput>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/MAML/MAML.HelpTopics.Content/MAML.HelpTopics.Content.nuspec b/MAML/MAML.HelpTopics.Content/MAML.HelpTopics.Content.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>CAS.MAML.HelpTopics.Content</id>
+    <version>1.0.3</version>
+    <title>Library containing schema definition of the all topics xml file.</title>
+    <authors>CAS</authors>
+    <owners>commsvr.com</owners>
+    <projectUrl>svn://svnserver.hq.cas.com.pl/VS/trunk/CAS.MAML/MAML/MAML.HelpTopics.Content</projectUrl>
+    <licenseUrl>http://www.commsvr.com/DownloadCenter/ProductSoftware/LicenseAgreement.aspx</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <developmentDependency>false</developmentDependency>
+    <description>
+      Library containing schema definition of the all topics xml file.
+    </description>
+    <summary>
+      Library containing schema definition of the all topics xml file.
+    </summary>
+    <releaseNotes>
+      Released for ASMD 
+    </releaseNotes>
+    <copyright>Copyright (c) 2000-2016 CAS LODZ POLAND</copyright>
+    <tags>OPCUA, CommServer, ASMD, Address Space Model Designer.</tags>
+  </metadata>
+  <files>
+    <file src="bin\Release\CAS.MAML.HelpTopics.Content.dll" target="lib\net35\CAS.MAML.HelpTopics.Content.dll" />
+    <file src="bin\Release\CAS.MAML.HelpTopics.Content.XML" target="lib\net35\CAS.MAML.HelpTopics.Content.XML" />
+  </files>
+</package>
+