From f29be90298d4e852d3f08fef1564bc29d35c93ab Mon Sep 17 00:00:00 2001
From: EWSoftware <Eric@EWoodruff.us>
Date: Mon, 1 Mar 2021 13:54:57 -0800
Subject: [PATCH] Bug fix

Changes made:
- Fixed loading of code analysis dictionaries with .NET Core/Standard SDK format project files.  Fixes #228.
- Update HtmlAgilityPack NuGet package and fixed up parser file offsets.
---
 Docs/Content/Installation.aml                 |  3 +
 .../Content/VersionHistory/VersionHistory.aml |  6 ++
 Docs/Content/VersionHistory/v2021.3.1.0.aml   | 29 +++++++
 Docs/ContentLayout.content                    |  9 +-
 Docs/VSSpellCheckerDocs.shfbproj              |  3 +-
 .../ProjectSpellCheck/CodeClassifier.cs       | 43 ++++++++--
 .../ProjectSpellCheck/HtmlClassifier.cs       | 83 +++++++++++++++----
 .../ProjectSpellCheck/SpellCheckFileInfo.cs   | 34 ++++++--
 .../ProjectSpellCheck/XmlClassifier.cs        |  7 +-
 Source/VSSpellChecker/SpellingServiceProxy.cs | 25 ++----
 .../SolutionProjectSpellCheckControl.xaml.cs  | 35 ++++----
 .../VSSpellChecker2017AndLater.csproj         |  4 +-
 Source/VSSpellChecker/packages.config         |  2 +-
 .../source.extension.vsixmanifest             |  2 +-
 .../Properties/AssemblyInfoShared.cs          |  6 +-
 15 files changed, 211 insertions(+), 80 deletions(-)
 create mode 100644 Docs/Content/VersionHistory/v2021.3.1.0.aml

diff --git a/Docs/Content/Installation.aml b/Docs/Content/Installation.aml
index dbb6b84..543c5b0 100644
--- a/Docs/Content/Installation.aml
+++ b/Docs/Content/Installation.aml
@@ -112,6 +112,9 @@ global spell checker settings.</para>
 
 				</list>
 
+				<para>A spell checker toolbar is also available.  Right click anywhere in the Visual Studio toolbar area
+and select the Spell Checker option from the context menu to display it.</para>
+
 			</content>
 		</section>
 
diff --git a/Docs/Content/VersionHistory/VersionHistory.aml b/Docs/Content/VersionHistory/VersionHistory.aml
index 52ddb40..3cef51f 100644
--- a/Docs/Content/VersionHistory/VersionHistory.aml
+++ b/Docs/Content/VersionHistory/VersionHistory.aml
@@ -9,6 +9,12 @@ project.  Select a version below to see a description of its changes.</para>
 		<section>
 			<content>
 				<list class="bullet">
+					<listItem>
+						<para>
+							<link xlink:href="e1588046-393b-4864-a3c1-6771b73bf124" />
+						</para>
+					</listItem>
+
 					<listItem>
 						<para>
 							<link xlink:href="bb88f7d5-2491-457e-9ba3-8d7d0bbc8615" />
diff --git a/Docs/Content/VersionHistory/v2021.3.1.0.aml b/Docs/Content/VersionHistory/v2021.3.1.0.aml
new file mode 100644
index 0000000..00bcfde
--- /dev/null
+++ b/Docs/Content/VersionHistory/v2021.3.1.0.aml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<topic id="e1588046-393b-4864-a3c1-6771b73bf124" revisionNumber="1">
+	<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
+		<introduction>
+			<para>Changes in this release:</para>
+		</introduction>
+
+		<section>
+			<content>
+				<list class="bullet">
+					<listItem>
+						<para>Fixed loading of code analysis dictionaries with .NET Core/Standard SDK format project files.</para>
+					</listItem>
+
+					<listItem>
+						<para>Merged changes from Walter Goodwin to add a spell checker toolbar.</para>
+					</listItem>
+
+				</list>
+
+			</content>
+		</section>
+
+		<relatedTopics>
+			<link xlink:href="548dc6d7-6d08-4006-82b3-d5830be96f04" />
+		</relatedTopics>
+
+	</developerConceptualDocument>
+</topic>
diff --git a/Docs/ContentLayout.content b/Docs/ContentLayout.content
index 252bdd6..2e7063d 100644
--- a/Docs/ContentLayout.content
+++ b/Docs/ContentLayout.content
@@ -149,11 +149,16 @@
       <HelpKeyword index="K" term="submitting changes" />
     </HelpKeywords>
   </Topic>
-  <Topic id="548dc6d7-6d08-4006-82b3-d5830be96f04" visible="True" isSelected="true" title="Version History">
+  <Topic id="548dc6d7-6d08-4006-82b3-d5830be96f04" visible="True" isExpanded="true" title="Version History">
     <HelpKeywords>
       <HelpKeyword index="K" term="version, history" />
     </HelpKeywords>
-    <Topic id="bb88f7d5-2491-457e-9ba3-8d7d0bbc8615" visible="True" title="Version 2021.1.23.0">
+    <Topic id="e1588046-393b-4864-a3c1-6771b73bf124" visible="True" title="Version 2021.3.1.0">
+      <HelpKeywords>
+        <HelpKeyword index="K" term="versions, 2021.3.1.0" />
+      </HelpKeywords>
+    </Topic>
+    <Topic id="bb88f7d5-2491-457e-9ba3-8d7d0bbc8615" visible="True" isSelected="true" title="Version 2021.1.23.0">
       <HelpKeywords>
         <HelpKeyword index="K" term="versions, 2021.1.23.0" />
       </HelpKeywords>
diff --git a/Docs/VSSpellCheckerDocs.shfbproj b/Docs/VSSpellCheckerDocs.shfbproj
index 2623dc4..d9924d6 100644
--- a/Docs/VSSpellCheckerDocs.shfbproj
+++ b/Docs/VSSpellCheckerDocs.shfbproj
@@ -49,7 +49,7 @@
     </NamespaceSummaries>
     <ComponentConfigurations>
     </ComponentConfigurations>
-    <HelpFileVersion>2021.1.23.0</HelpFileVersion>
+    <HelpFileVersion>2021.3.1.0</HelpFileVersion>
     <SaveComponentCacheCapacity>0</SaveComponentCacheCapacity>
     <SourceCodeBasePath>..\Source\</SourceCodeBasePath>
     <WarnOnMissingSourceContext>True</WarnOnMissingSourceContext>
@@ -183,6 +183,7 @@
     <None Include="Content\VersionHistory\v2020.6.11.0.aml" />
     <None Include="Content\VersionHistory\v2020.8.24.0.aml" />
     <None Include="Content\VersionHistory\v2021.1.23.0.aml" />
+    <None Include="Content\VersionHistory\v2021.3.1.0.aml" />
     <None Include="Content\VersionHistory\VersionHistory.aml" />
     <None Include="Content\VersionHistory\v2015.8.15.0.aml" />
     <None Include="Content\VersionHistory\v2015.9.19.0.aml" />
diff --git a/Source/VSSpellChecker/ProjectSpellCheck/CodeClassifier.cs b/Source/VSSpellChecker/ProjectSpellCheck/CodeClassifier.cs
index 7f53087..da0e34f 100644
--- a/Source/VSSpellChecker/ProjectSpellCheck/CodeClassifier.cs
+++ b/Source/VSSpellChecker/ProjectSpellCheck/CodeClassifier.cs
@@ -2,9 +2,8 @@
 // System  : Visual Studio Spell Checker Package
 // File    : CodeClassifier.cs
 // Author  : Eric Woodruff  (Eric@EWoodruff.us)
-// Updated : 09/02/2018
-// Note    : Copyright 2015-2018, Eric Woodruff, All rights reserved
-// Compiler: Microsoft Visual C#
+// Updated : 02/28/2021
+// Note    : Copyright 2015-2021, Eric Woodruff, All rights reserved
 //
 // This file contains a class used to classify source code file content using a set of regular expressions
 //
@@ -199,41 +198,73 @@ private void ParseNode(HtmlNode node, List<SpellCheckSpan> spans)
                     var commentNode = (HtmlCommentNode)node;
 
                     if(commentNode.OuterHtml.StartsWith("<!--", StringComparison.Ordinal))
+                    {
+#if DEBUG
+                        // The parser offsets changed in an update to the HtmlAgilityPack.  Catch any further
+                        // changes as we'll need to fix our computed offsets again.
+                        if(!this.Text.Substring(this.GetOffset(commentNode.Line, commentNode.LinePosition + 1),
+                          commentNode.OuterHtml.Length).Equals(commentNode.OuterHtml, StringComparison.OrdinalIgnoreCase))
+                        {
+                            System.Diagnostics.Debugger.Break();
+                        }
+#endif
                         spans.Add(new SpellCheckSpan
                         {
                             Span = new Span(this.AdjustedOffset(this.GetOffset(commentNode.Line,
-                                commentNode.LinePosition) - 1, commentNode.OuterHtml),
+                                commentNode.LinePosition + 1), commentNode.OuterHtml),
                                 commentNode.OuterHtml.Length),
                             Text = commentNode.OuterHtml,
                             Classification = RangeClassification.XmlFileComment
                         });
+                    }
                     break;
 
                 case HtmlNodeType.Text:
                     var textNode = (HtmlTextNode)node;
 
                     if(!HtmlNode.IsOverlappedClosingElement(textNode.Text) && textNode.Text.Trim().Length != 0)
+                    {
+#if DEBUG
+                        // See above
+                        if(!this.Text.Substring(this.GetOffset(textNode.Line, textNode.LinePosition + 1),
+                          textNode.Text.Length).Equals(textNode.Text, StringComparison.OrdinalIgnoreCase))
+                        {
+                            System.Diagnostics.Debugger.Break();
+                        }
+#endif
                         spans.Add(new SpellCheckSpan
                         {
-                            Span = new Span(this.GetOffset(textNode.Line, textNode.LinePosition),
+                            Span = new Span(this.GetOffset(textNode.Line, textNode.LinePosition + 1),
                                 textNode.Text.Length),
                             Text = textNode.Text,
                             Classification = RangeClassification.XmlCommentsInnerText
                         });
+                    }
                     break;
 
                 case HtmlNodeType.Element:
                     foreach(var attribute in node.Attributes)
                         if(this.SpellCheckConfiguration.SpellCheckedXmlAttributes.Contains(attribute.Name) &&
                           !String.IsNullOrWhiteSpace(attribute.Value))
+                        {
+#if DEBUG
+                            // See above
+                            if(!this.Text.Substring(this.GetOffset(attribute.Line, attribute.LinePosition +
+                              attribute.Name.Length + 3), attribute.Value.Length).Equals(attribute.Value,
+                              StringComparison.OrdinalIgnoreCase))
+                            {
+                                System.Diagnostics.Debugger.Break();
+                            }
+#endif
                             spans.Add(new SpellCheckSpan
                             {
                                 Span = new Span(this.AdjustedOffset(this.GetOffset(attribute.Line,
-                                    attribute.LinePosition + attribute.Name.Length + 1), attribute.Value),
+                                    attribute.LinePosition + attribute.Name.Length + 3), attribute.Value),
                                     attribute.Value.Length),
                                 Text = attribute.Value,
                                 Classification = RangeClassification.AttributeValue
                             });
+                        }
 
                     if(!this.SpellCheckConfiguration.IgnoredXmlElements.Contains(node.Name) && node.HasChildNodes)
                         foreach(HtmlNode subnode in node.ChildNodes)
diff --git a/Source/VSSpellChecker/ProjectSpellCheck/HtmlClassifier.cs b/Source/VSSpellChecker/ProjectSpellCheck/HtmlClassifier.cs
index ddac58d..4298a09 100644
--- a/Source/VSSpellChecker/ProjectSpellCheck/HtmlClassifier.cs
+++ b/Source/VSSpellChecker/ProjectSpellCheck/HtmlClassifier.cs
@@ -2,9 +2,8 @@
 // System  : Visual Studio Spell Checker Package
 // File    : HtmlClassifier.cs
 // Author  : Eric Woodruff  (Eric@EWoodruff.us)
-// Updated : 09/17/2018
-// Note    : Copyright 2015-2018, Eric Woodruff, All rights reserved
-// Compiler: Microsoft Visual C#
+// Updated : 02/28/2021
+// Note    : Copyright 2015-2021, Eric Woodruff, All rights reserved
 //
 // This file contains a class used to classify HTML file content
 //
@@ -132,11 +131,19 @@ private void ParseNode(HtmlNode node, List<SpellCheckSpan> spans)
                     // by the node parser but we don't want to include them.
                     if(commentNode.OuterHtml.StartsWith("<!--", StringComparison.Ordinal))
                     {
+#if DEBUG
+                        // The parser offsets changed in an update to the HtmlAgilityPack.  Catch any further
+                        // changes as we'll need to fix our computed offsets again.
+                        if(!this.Text.Substring(this.GetOffset(commentNode.Line, commentNode.LinePosition + 1),
+                          commentNode.OuterHtml.Length).Equals(commentNode.OuterHtml, StringComparison.OrdinalIgnoreCase))
+                        {
+                            System.Diagnostics.Debugger.Break();
+                        }
+#endif
                         spans.Add(new SpellCheckSpan
                         {
                             Span = new Span(this.AdjustedOffset(this.GetOffset(commentNode.Line,
-                                commentNode.LinePosition) - 1, commentNode.OuterHtml),
-                                commentNode.OuterHtml.Length),
+                                commentNode.LinePosition + 1), commentNode.OuterHtml), commentNode.OuterHtml.Length),
                             Text = commentNode.OuterHtml,
                             Classification = RangeClassification.XmlFileComment
                         });
@@ -148,8 +155,20 @@ private void ParseNode(HtmlNode node, List<SpellCheckSpan> spans)
 
                     if(!HtmlNode.IsOverlappedClosingElement(textNode.Text) && textNode.Text.Trim().Length != 0)
                     {
-                        if(!this.DeterminePageLanguage(textNode.Text, this.GetOffset(textNode.Line, textNode.LinePosition), spans))
-                            this.ParseScriptBlocks(textNode.Text, this.GetOffset(textNode.Line, textNode.LinePosition), spans);
+                        if(!this.DeterminePageLanguage(textNode.Text, this.GetOffset(textNode.Line,
+                          textNode.LinePosition + 1), spans))
+                        {
+#if DEBUG
+                            // See above
+                            if(!this.Text.Substring(this.GetOffset(textNode.Line, textNode.LinePosition + 1),
+                              textNode.Text.Length).Equals(textNode.Text, StringComparison.OrdinalIgnoreCase))
+                            {
+                                System.Diagnostics.Debugger.Break();
+                            }
+#endif
+                            this.ParseScriptBlocks(textNode.Text, this.GetOffset(textNode.Line,
+                                textNode.LinePosition + 1), spans);
+                        }
                     }
                     break;
 
@@ -158,10 +177,19 @@ private void ParseNode(HtmlNode node, List<SpellCheckSpan> spans)
                         if(this.SpellCheckConfiguration.SpellCheckedXmlAttributes.Contains(attribute.Name) &&
                           !String.IsNullOrWhiteSpace(attribute.Value))
                         {
+#if DEBUG
+                            // See above
+                            if(!this.Text.Substring(this.GetOffset(attribute.Line, attribute.LinePosition +
+                              attribute.Name.Length + 3), attribute.Value.Length).Equals(attribute.Value,
+                              StringComparison.OrdinalIgnoreCase))
+                            {
+                                System.Diagnostics.Debugger.Break();
+                            }
+#endif
                             spans.Add(new SpellCheckSpan
                             {
                                 Span = new Span(this.AdjustedOffset(this.GetOffset(attribute.Line,
-                                    attribute.LinePosition + attribute.Name.Length + 1), attribute.Value),
+                                    attribute.LinePosition + attribute.Name.Length + 3), attribute.Value),
                                     attribute.Value.Length),
                                 Text = attribute.Value,
                                 Classification = RangeClassification.AttributeValue
@@ -171,7 +199,18 @@ private void ParseNode(HtmlNode node, List<SpellCheckSpan> spans)
                     if(!this.SpellCheckConfiguration.IgnoredXmlElements.Contains(node.Name) && node.HasChildNodes)
                     {
                         if(node.Name == "script")
-                            this.ParseScriptElement(node.OuterHtml, this.GetOffset(node.Line, node.LinePosition), spans);
+                        {
+#if DEBUG
+                            // See above
+                            if(!this.Text.Substring(this.GetOffset(node.Line, node.LinePosition + 1),
+                              node.OuterHtml.Length).Equals(node.OuterHtml, StringComparison.OrdinalIgnoreCase))
+                            {
+                                System.Diagnostics.Debugger.Break();
+                            }
+#endif
+                            this.ParseScriptElement(node.OuterHtml, this.GetOffset(node.Line,
+                                node.LinePosition + 1), spans);
+                        }
                         else
                             foreach(HtmlNode subnode in node.ChildNodes)
                                 this.ParseNode(subnode, spans);
@@ -248,10 +287,15 @@ private void ParseScriptBlocks(string text, int offset, List<SpellCheckSpan> spa
                     {
                         // Adjust the span to set the position relative to the start of the block within this file
                         s.Span = new Span(s.Span.Start + offset, s.Span.Length);
-
-                        System.Diagnostics.Debug.Assert(this.Text.Substring(s.Span.Start, s.Span.Length) ==
-                            s.Text.Replace('<', '\xFE').Replace('>', '\xFF'));
-
+#if DEBUG
+                        // The parser offsets changed in an update to the HtmlAgilityPack.  Catch any further
+                        // changes as we'll need to fix our computed offsets again.
+                        if(!this.Text.Substring(s.Span.Start, s.Span.Length).Equals(
+                          s.Text.Replace('<', '\xFE').Replace('>', '\xFF'), StringComparison.OrdinalIgnoreCase))
+                        {
+                            System.Diagnostics.Debugger.Break();
+                        }
+#endif
                         spans.Add(s);
                     }
                 }
@@ -295,9 +339,14 @@ private void ParseScriptElement(string script, int offset, List<SpellCheckSpan>
                 {
                     // Adjust the span to set the position relative to the start of the block within this file
                     s.Span = new Span(s.Span.Start + offset + scriptElement.Index + scriptElement.Length, s.Span.Length);
-
-                    System.Diagnostics.Debug.Assert(this.Text.Substring(s.Span.Start, s.Span.Length) == s.Text);
-
+#if DEBUG
+                    // The parser offsets changed in an update to the HtmlAgilityPack.  Catch any further
+                    // changes as we'll need to fix our computed offsets again.
+                    if(!this.Text.Substring(s.Span.Start, s.Span.Length).Equals(s.Text, StringComparison.OrdinalIgnoreCase))
+                    {
+                        System.Diagnostics.Debugger.Break();
+                    }
+#endif
                     spans.Add(s);
                 }
             }
@@ -336,6 +385,6 @@ private TextClassifier GetClassifier(string language)
 
             return c;
         }
-        #endregion
+#endregion
     }
 }
diff --git a/Source/VSSpellChecker/ProjectSpellCheck/SpellCheckFileInfo.cs b/Source/VSSpellChecker/ProjectSpellCheck/SpellCheckFileInfo.cs
index 422d3fe..0bad671 100644
--- a/Source/VSSpellChecker/ProjectSpellCheck/SpellCheckFileInfo.cs
+++ b/Source/VSSpellChecker/ProjectSpellCheck/SpellCheckFileInfo.cs
@@ -2,9 +2,8 @@
 // System  : Visual Studio Spell Checker Package
 // File    : SpellCheckFileInfo.cs
 // Author  : Eric Woodruff  (Eric@EWoodruff.us)
-// Updated : 03/17/2020
-// Note    : Copyright 2015-2020, Eric Woodruff, All rights reserved
-// Compiler: Microsoft Visual C#
+// Updated : 02/28/2021
+// Note    : Copyright 2015-2021, Eric Woodruff, All rights reserved
 //
 // This file contains a class used to hold information about a file that will be spell checked
 //
@@ -89,6 +88,11 @@ internal class SpellCheckFileInfo
         /// </summary>
         public string DependencyConfigurationFile { get; private set; }
 
+        /// <summary>
+        /// This read-only property returns true if this item represents a code analysis dictionary, false if not
+        /// </summary>
+        public bool IsCodeAnalysisDictionary { get; private set; }
+
         /// <summary>
         /// This returns a description of the item with the solution and relative path to the file
         /// </summary>
@@ -145,6 +149,18 @@ public static SpellCheckFileInfo ForOpenDocument(string filename)
             };
         }
 
+        /// <summary>
+        /// This is used to get the code analysis dictionaries from the named project
+        /// </summary>
+        /// <param name="projectName">The project from which to get code analysis dictionaries</param>
+        /// <returns>An enumerable list of the code analysis dictionary files if any</returns>
+        public static IEnumerable<SpellCheckFileInfo> ProjectCodeAnalysisDictionaries(string projectName)
+        {
+            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
+
+            return AllProjectFiles(projectName).Where(f => f.IsCodeAnalysisDictionary);
+        }
+
         /// <summary>
         /// This is used to get information for all files in the solution or a specific project
         /// </summary>
@@ -507,9 +523,9 @@ private static void ProcessHierarchyNodeRecursively(IVsHierarchy hierarchy, uint
                     result = hierarchy.GetProperty(itemId, (int)__VSHPROPID.VSHPROPID_FirstVisibleChild,
                         out object value);
 
-                    while(result == VSConstants.S_OK && value != null && value is int)
+                    while(result == VSConstants.S_OK && value != null && value is int nodeId)
                     {
-                        uint visibleChildNode = (uint)(int)value;
+                        uint visibleChildNode = (uint)nodeId;
 
                         if(visibleChildNode == VSConstants.VSITEMID_NIL)
                             break;
@@ -564,11 +580,17 @@ private static SpellCheckFileInfo DetermineProjectFileInformation(IVsHierarchy h
                       Path.IsPathRooted(canonicalName) && !canonicalName.EndsWith("\\", StringComparison.Ordinal) &&
                       !canonicalName.Equals(projectName, StringComparison.OrdinalIgnoreCase))
                     {
+                        result = hierarchy.GetProperty(itemId, (int)__VSHPROPID4.VSHPROPID_BuildAction, out value);
+
+                        bool isCodeAnalysisDictionary = (result == VSConstants.S_OK && value != null &&
+                            ((string)value).Equals("CodeAnalysisDictionary", StringComparison.OrdinalIgnoreCase));
+
                         return new SpellCheckFileInfo
                         {
                             ProjectFile = projectName,
                             Filename = name,
-                            CanonicalName = canonicalName
+                            CanonicalName = canonicalName,
+                            IsCodeAnalysisDictionary = isCodeAnalysisDictionary
                         };
                     }
                 }
diff --git a/Source/VSSpellChecker/ProjectSpellCheck/XmlClassifier.cs b/Source/VSSpellChecker/ProjectSpellCheck/XmlClassifier.cs
index 1c016f6..414497d 100644
--- a/Source/VSSpellChecker/ProjectSpellCheck/XmlClassifier.cs
+++ b/Source/VSSpellChecker/ProjectSpellCheck/XmlClassifier.cs
@@ -2,9 +2,8 @@
 // System  : Visual Studio Spell Checker Package
 // File    : XmlClassifier.cs
 // Author  : Eric Woodruff  (Eric@EWoodruff.us)
-// Updated : 08/18/2018
-// Note    : Copyright 2015-2018, Eric Woodruff, All rights reserved
-// Compiler: Microsoft Visual C#
+// Updated : 02/28/2021
+// Note    : Copyright 2015-2021, Eric Woodruff, All rights reserved
 //
 // This file contains a class used to classify XML file content
 //
@@ -122,7 +121,7 @@ public override IEnumerable<SpellCheckSpan> Parse()
 
                                             if(!value.Equals(this.Text.Substring(this.GetOffset(lineInfo.LineNumber,
                                               lineInfo.LinePosition + reader.Settings.LinePositionOffset +
-                                              reader.Name.Length + 2)), StringComparison.Ordinal))
+                                              reader.Name.Length + 2), value.Length), StringComparison.Ordinal))
                                             {
                                                 value = WebUtility.HtmlEncode(value).Replace("&quot;", "\"").Replace(
                                                     "&#39;", "'");
diff --git a/Source/VSSpellChecker/SpellingServiceProxy.cs b/Source/VSSpellChecker/SpellingServiceProxy.cs
index 99408e4..6a819f8 100644
--- a/Source/VSSpellChecker/SpellingServiceProxy.cs
+++ b/Source/VSSpellChecker/SpellingServiceProxy.cs
@@ -2,8 +2,8 @@
 // System  : Visual Studio Spell Checker Package
 // File    : SpellingServiceProxy.cs
 // Author  : Eric Woodruff  (Eric@EWoodruff.us)
-// Updated : 01/22/2020
-// Note    : Copyright 2015-2020, Eric Woodruff, All rights reserved
+// Updated : 02/28/2021
+// Note    : Copyright 2015-2021, Eric Woodruff, All rights reserved
 //
 // This file contains a class that implements the spelling service interface to expose the spell checker to
 // third-party tagger providers.
@@ -32,6 +32,7 @@
 
 using VisualStudio.SpellChecker.Definitions;
 using VisualStudio.SpellChecker.Configuration;
+using VisualStudio.SpellChecker.ProjectSpellCheck;
 
 namespace VisualStudio.SpellChecker
 {
@@ -278,23 +279,11 @@ private static SpellCheckerConfiguration GenerateConfiguration(ITextBuffer buffe
                     // Load code analysis dictionaries if wanted
                     if(projectFilename != null && config.CadOptions.ImportCodeAnalysisDictionaries)
                     {
-                        // I'm not sure if there's a better way to do this but it does seem to work.  We need to
-                        // find one or more arbitrary files with an item type of "CodeAnalysisDictionary".  We
-                        // do so by getting the MSBuild project from the global project collection and using its
-                        // GetItems() method to find them.
-                        var loadedProject = Microsoft.Build.Evaluation.ProjectCollection.GlobalProjectCollection.GetLoadedProjects(
-                            projectFilename).FirstOrDefault();
-
-                        if(loadedProject != null)
+                        // Typically there is only one but multiple files are supported
+                        foreach(var cad in SpellCheckFileInfo.ProjectCodeAnalysisDictionaries(projectFilename))
                         {
-                            // Typically there is only one but multiple files are supported
-                            foreach(var cad in loadedProject.GetItems("CodeAnalysisDictionary"))
-                            {
-                                filename = Path.Combine(Path.GetDirectoryName(projectFilename), cad.EvaluatedInclude);
-
-                                if(File.Exists(filename))
-                                    config.ImportCodeAnalysisDictionary(filename);
-                            }
+                            if(File.Exists(cad.CanonicalName))
+                                config.ImportCodeAnalysisDictionary(cad.CanonicalName);
                         }
                     }
 
diff --git a/Source/VSSpellChecker/ToolWindows/SolutionProjectSpellCheckControl.xaml.cs b/Source/VSSpellChecker/ToolWindows/SolutionProjectSpellCheckControl.xaml.cs
index 78ac45b..c969d2d 100644
--- a/Source/VSSpellChecker/ToolWindows/SolutionProjectSpellCheckControl.xaml.cs
+++ b/Source/VSSpellChecker/ToolWindows/SolutionProjectSpellCheckControl.xaml.cs
@@ -2,8 +2,8 @@
 // System  : Visual Studio Spell Checker Package
 // File    : SolutionProjectSpellCheckControl.cs
 // Authors : Eric Woodruff  (Eric@EWoodruff.us)
-// Updated : 04/18/2020
-// Note    : Copyright 2015-2020, Eric Woodruff, All rights reserved
+// Updated : 02/28/2021
+// Note    : Copyright 2015-2021, Eric Woodruff, All rights reserved
 //
 // This file contains the user control that handles spell checking a document interactively
 //
@@ -503,8 +503,8 @@ private static string GetDocumentText(string filename, out IEnumerable<Span> ign
                             object docDataObj = Marshal.GetObjectForIUnknown(docDataUnk);
                             IVsTextLines buffer = null;
 
-                            if(docDataObj is IVsTextLines)
-                                buffer = (IVsTextLines)docDataObj;
+                            if(docDataObj is IVsTextLines lines)
+                                buffer = lines;
                             else
                                 if(docDataObj is IVsTextBufferProvider tp)
                                 {
@@ -997,31 +997,28 @@ private async void btnStartCancel_ClickAsync(object sender, RoutedEventArgs e)
                             od => SpellCheckFileInfo.ForOpenDocument(od))).ToList();
             }
 
-            // I'm not sure if there's a better way to do this but it does seem to work.  We need to find one or
-            // more arbitrary files with an item type of "CodeAnalysisDictionary".  We do so by getting the
-            // MSBuild project from the global project collection and using its GetItems() method to find them.
-            foreach(var p in Microsoft.Build.Evaluation.ProjectCollection.GlobalProjectCollection.LoadedProjects)
+            // Track the code analysis dictionaries used by each project and exclude them from being spell checked
+            foreach(var cad in SpellCheckFileInfo.ProjectCodeAnalysisDictionaries(null).GroupBy(f => f.ProjectFile))
             {
                 List<string> files = new List<string>();
 
                 // Typically there is only one but multiple files are supported
-                foreach(var cad in p.GetItems("CodeAnalysisDictionary"))
+                foreach(var c in cad)
                 {
-                    string filename = Path.Combine(Path.GetDirectoryName(p.FullPath), cad.EvaluatedInclude);
-
-                    if(File.Exists(filename))
-                        files.Add(filename);
+                    if(File.Exists(c.CanonicalName))
+                        files.Add(c.CanonicalName);
                 }
 
                 if(files.Count != 0)
-                {
-                    codeAnalysisFiles.Add(p.FullPath, files);
+                    codeAnalysisFiles.Add(cad.Key, files);
+            }
 
-                    var excludeFiles = new HashSet<string>(codeAnalysisFiles.Values.SelectMany(c => c).Distinct(),
-                        StringComparer.OrdinalIgnoreCase);
+            if(codeAnalysisFiles.Count != 0)
+            {
+                var excludeFiles = new HashSet<string>(codeAnalysisFiles.Values.SelectMany(c => c),
+                    StringComparer.OrdinalIgnoreCase);
 
-                    spellCheckFiles = spellCheckFiles.Where(s => !excludeFiles.Contains(s.CanonicalName)).ToList();
-                }
+                spellCheckFiles = spellCheckFiles.Where(s => !excludeFiles.Contains(s.CanonicalName)).ToList();
             }
 
             try
diff --git a/Source/VSSpellChecker/VSSpellChecker2017AndLater.csproj b/Source/VSSpellChecker/VSSpellChecker2017AndLater.csproj
index d46aa78..769c73d 100644
--- a/Source/VSSpellChecker/VSSpellChecker2017AndLater.csproj
+++ b/Source/VSSpellChecker/VSSpellChecker2017AndLater.csproj
@@ -388,8 +388,8 @@
     <Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
-    <Reference Include="HtmlAgilityPack, Version=1.8.7.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlAgilityPack.1.8.7\lib\Net45\HtmlAgilityPack.dll</HintPath>
+    <Reference Include="HtmlAgilityPack, Version=1.11.30.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.11.30\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Build.15.8.166\lib\net46\Microsoft.Build.dll</HintPath>
diff --git a/Source/VSSpellChecker/packages.config b/Source/VSSpellChecker/packages.config
index 6ccbf70..607979c 100644
--- a/Source/VSSpellChecker/packages.config
+++ b/Source/VSSpellChecker/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HtmlAgilityPack" version="1.8.7" targetFramework="net46" />
+  <package id="HtmlAgilityPack" version="1.11.30" targetFramework="net46" />
   <package id="Microsoft.Build" version="15.8.166" targetFramework="net46" />
   <package id="Microsoft.Build.Framework" version="15.8.166" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.ComponentModelHost" version="15.5.27130" targetFramework="net46" />
diff --git a/Source/VSSpellChecker/source.extension.vsixmanifest b/Source/VSSpellChecker/source.extension.vsixmanifest
index dfaa355..bc23cd5 100644
--- a/Source/VSSpellChecker/source.extension.vsixmanifest
+++ b/Source/VSSpellChecker/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="43EA967E-0DE2-4136-8E52-C6DCFB5C2748" Version="2021.1.23.0" Language="en-US" Publisher="EWSoftware" />
+        <Identity Id="43EA967E-0DE2-4136-8E52-C6DCFB5C2748" Version="2021.3.1.0" Language="en-US" Publisher="EWSoftware" />
         <DisplayName>Visual Studio Spell Checker (VS2017 and Later)</DisplayName>
         <Description xml:space="preserve">An editor extension that checks the spelling of comments, strings, and plain text as you type or interactively with a tool window.  It can also spell check an entire solution, project, or selected items.  Options are available to define multiple languages to spell check against, define ignored words, control how elements and attributes in XML and MAML files are spell checked, and much more.</Description>
         <MoreInfo>https://ewsoftware.github.io/VSSpellChecker</MoreInfo>
diff --git a/Source/VSSpellCheckerDefinitions/Properties/AssemblyInfoShared.cs b/Source/VSSpellCheckerDefinitions/Properties/AssemblyInfoShared.cs
index a96390e..32dee2c 100644
--- a/Source/VSSpellCheckerDefinitions/Properties/AssemblyInfoShared.cs
+++ b/Source/VSSpellCheckerDefinitions/Properties/AssemblyInfoShared.cs
@@ -2,7 +2,7 @@
 // System  : Visual Studio Spell Checker
 // File    : AssemblyInfoShared.cs
 // Author  : Eric Woodruff  (Eric@EWoodruff.us)
-// Updated : 01/23/2021
+// Updated : 03/01/2021
 // Note    : Copyright 2013-2021, Eric Woodruff, All rights reserved
 //
 // Visual Studio spell checker common assembly attributes
@@ -82,13 +82,13 @@ internal static partial class AssemblyInfo
     //
     // This is used to set the assembly file version.  This will change with each new release.  MSIs only
     // support a Major value between 0 and 255 so we drop the century from the year on this one.
-    public const string FileVersion = "21.1.23.0";
+    public const string FileVersion = "21.3.1.0";
 
     // Common product version
     //
     // This may contain additional text to indicate Alpha or Beta states.  The version number will always match
     // the file version above but includes the century on the year.
-    public const string ProductVersion = "2021.1.23.0";
+    public const string ProductVersion = "2021.3.1.0";
 
     // Assembly copyright information
     public const string Copyright = "Copyright \xA9 2013-2021, Eric Woodruff, All Rights Reserved.\r\n" +