Merge pull request #644 from mono/developmdoc-5.8.9.2

bump mdoc to 5.8.9.2

8 files changed, 35 insertions, 463 deletions

diff --git a/mdoc/Consts.cs b/mdoc/Consts.cs
index e0b10fce..7d64b319 100644
--- a/mdoc/Consts.cs
+++ b/mdoc/Consts.cs
@@ -3,7 +3,7 @@ namespace Mono.Documentation
 {
     public static class Consts
     {
-        public static string MonoVersion = "5.8.9.1";
+        public static string MonoVersion = "5.8.9.2";
         public const string DocId = "DocId";
         public const string CppCli = "C++ CLI";
         public const string CppCx = "C++ CX";
diff --git a/mdoc/Mono.Documentation/MDocUpdater.cs b/mdoc/Mono.Documentation/MDocUpdater.cs
index 8b858edd..269e36ea 100644
--- a/mdoc/Mono.Documentation/MDocUpdater.cs
+++ b/mdoc/Mono.Documentation/MDocUpdater.cs
@@ -988,7 +988,7 @@ namespace Mono.Documentation
             AssemblyNameDefinition name = assembly.Name;
             if (name.HasPublicKey)
             {
-                XmlElement pubkey = parent.OwnerDocument.CreateElement ("AssemblyPublicKey");
+                XmlElement pubkey = WriteElement (index_assembly, "AssemblyPublicKey");
                 var key = new StringBuilder (name.PublicKey.Length * 3 + 2);
                 key.Append ("[");
                 foreach (byte b in name.PublicKey)
@@ -1000,7 +1000,7 @@ namespace Mono.Documentation
 
             if (!string.IsNullOrEmpty (name.Culture))
             {
-                XmlElement culture = parent.OwnerDocument.CreateElement ("AssemblyCulture");
+                XmlElement culture = WriteElement (index_assembly, "AssemblyCulture");
                 culture.InnerText = name.Culture;
                 index_assembly.AppendChild (culture);
             }
diff --git a/mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs b/mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs
index 3b710a98..abe87e2c 100644
--- a/mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs
+++ b/mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs
@@ -256,8 +256,8 @@ namespace Mono.Documentation.Updater
             //  1. "Normal" (non-generic) member names: GetEnumerator
             //    - Lookup as-is.
             //  2. Explicitly-implemented interface member names: System.Collections.IEnumerable.Current
-            //    - try as-is, and try type.member (due to "kludge" for property
-            //      support.
+            //    - try as-is, try global::namespace.type.member, and try
+            //      type.member (due to "kludge" for property support.
             //  3. "Normal" Generic member names: Sort<T> (CSC)
             //    - need to remove generic parameters --> "Sort"
             //  4. Explicitly-implemented interface members for generic interfaces: 
@@ -294,6 +294,13 @@ namespace Mono.Documentation.Updater
                     };
 
 
+                    // An explicitly-implemented interface member may have been updated to use a global alias.
+                    foreach (MemberReference mi in type.GetMembers ($"global::{docName}"))
+                    {
+                        memberCount++;
+                        yield return mi;
+                    }
+
                     // might be a property; try only type.member instead of
                     // namespace.type.member.
                     var typeMember = DocUtils.GetTypeDotMember (docName);
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
index 976d1b64..39fc085b 100644
--- a/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
+++ b/mdoc/Mono.Documentation/Updater/Formatters/CppFormatters/CppWinRtFullMemberFormatter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Remoting.Contexts;
 using System.Text;
 using Mono.Cecil;
 
diff --git a/mdoc/Mono.Documentation/Updater/XmlSyncer.cs b/mdoc/Mono.Documentation/Updater/XmlSyncer.cs
deleted file mode 100644
index dda4cd0e..00000000
--- a/mdoc/Mono.Documentation/Updater/XmlSyncer.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml;
-using Mono.Cecil;
-using Mono.Documentation.Updater.Frameworks;
-
-namespace Mono.Documentation.Updater
-{
-    public static class XmlSyncer
-    {
-        public static void MakeParameters (XmlElement root, MemberReference member, IList<ParameterDefinition> parameters, FrameworkTypeEntry typeEntry, ref bool fxAlternateTriggered)
-        {
-            XmlElement e = DocUtils.WriteElement (root, "Parameters");
-
-            /// addParameter does the work of adding the actual parameter to the XML
-            Action<ParameterDefinition, XmlElement, string, int, bool, string, bool> addParameter = (ParameterDefinition param, XmlElement nextTo, string paramType, int index, bool addIndex, string fx, bool addfx) =>
-            {
-                var pe = root.OwnerDocument.CreateElement ("Parameter");
-
-                if (nextTo == null)
-                    e.AppendChild (pe);
-                else
-                    e.InsertAfter (pe, nextTo);
-
-                pe.SetAttribute ("Name", param.Name);
-                pe.SetAttribute ("Type", paramType);
-                if (param.ParameterType is ByReferenceType)
-                {
-                    if (param.IsOut)
-                        pe.SetAttribute ("RefType", "out");
-                    else
-                        pe.SetAttribute ("RefType", "ref");
-                }
-                if (addIndex)
-                    pe.SetAttribute ("Index", index.ToString ());
-                if (addfx)
-					pe.SetAttribute (Consts.FrameworkAlternate, fx);
-
-                MakeAttributes (pe, GetCustomAttributes (param.CustomAttributes, ""));
-            };
-
-            /// addFXAttributes, adds the index attribute to all existing elements.
-            /// Used when we first detect the scenario which requires this.
-            Action<XmlNodeList> addFXAttributes = nodes =>
-            {
-                var i = 0;
-                foreach (var node in nodes.Cast<XmlElement> ())
-                {
-                    node.SetAttribute ("Index", i.ToString ());
-                    i++;
-                }
-            };
-
-            int parameterIndex = 0;
-            int parameterIndexOffset = 0;
-
-            var paramNodes = e.GetElementsByTagName ("Parameter");
-            bool inFXMode = frameworksCache.Frameworks.Count () > 1;
-
-            foreach (ParameterDefinition p in parameters)
-            {
-                var ptype = GetDocParameterType (p.ParameterType);
-                if (parameterIndex >= paramNodes.Count)
-                {
-                    // this parameter hasn't been added yet
-                    bool hasParameterName = string.IsNullOrWhiteSpace (p.Name);
-                    addParameter (p, null, ptype, parameterIndex, false, "", false);
-                }
-                else // there's enough nodes, see if it truly exists
-                {
-                    //look for < parameter > that matches position
-                    XmlElement parameterNode = e.ChildNodes[parameterIndex + parameterIndexOffset] as XmlElement;
-
-
-                    if (parameterNode != null)
-                    {
-                        //Assert Type Matches (if not, throw?)
-                        if (parameterNode.HasAttribute ("Name") && parameterNode.Attributes["Name"].Value == p.Name)
-                        {
-                            // we're good, continue on.
-                        }
-                        else
-                        { // name doesn't match
-                            if (parameterNode.HasAttribute ("Index"))
-                            {
-                                // TODO: add a FrameworkAlternate check, and set offset correctly
-                                int pindex;
-                                if (int.TryParse (parameterNode.GetAttribute ("Index"), out pindex) && pindex < parameterIndex)
-                                {
-                                    parameterIndexOffset++;
-
-                                    continue;
-                                }
-                            }
-                            else
-                            {
-                                if (!inFXMode) throw new Exception ("shit");
-                                addFXAttributes (paramNodes);
-                                //-find type in previous frameworks
-
-
-                                string fxList = FXUtils.PreviouslyProcessedFXString (typeEntry);
-
-                                //-find < parameter where index = currentIndex >
-                                var currentNode = paramNodes[parameterIndex] as XmlElement;
-                                currentNode.SetAttribute (Consts.FrameworkAlternate, fxList);
-
-                                addParameter (p, parameterNode, ptype, parameterIndex - parameterIndexOffset, true, typeEntry.Framework.Name, true);
-                                parameterIndexOffset++;
-                                fxAlternateTriggered = true;
-                            }
-                        }
-
-                    }
-                    else
-                    { // no element at this index
-                        // TODO: does this ever happen?
-                        throw new Exception ("This wasn't supposed to happen");
-                        //addParameter (p);
-                    }
-                    /*
-                    - If found
-                       - Assert Type Matches (if not, throw?)
-                        -If Name Matches … 
-                            - if “FrameworkAlternate” 
-                                -Add typeEntry.Framework.Name to list
-                           - done!
-                       -Else (exists, but name doesn’t match … FrameworkAlternate path)
-                           - check if inFXMode if not, throw
-                           -AddFXParameters
-                               - adds Index to all existing<parameters
-                                -find type in previous frameworks
-                                -find < parameter where index = currentIndex >
-                                -Add FrameworkAlternate = allPreviousFrameworks and Index = currentIndex
-                           - Add new node with Index = currentIndex
-                   - else not found
-                        -add
-                                */
-                }
-                parameterIndex++;
-            }
-            //-purge `typeEntry.Framework` from any<parameter> that 
-            // has FrameworkAlternate, and “name” doesn’t match any 
-            // `parameters`
-            var alternates = paramNodes
-                .Cast<XmlElement> ()
-                .Select (p => new
-                {
-                    Element = p,
-                    Name = p.GetAttribute ("Name"),
-                    FrameworkAlternate = p.GetAttribute (Consts.FrameworkAlternate)
-                })
-                .Where (p =>
-                        !string.IsNullOrWhiteSpace (p.FrameworkAlternate) &&
-                        p.FrameworkAlternate.Contains (typeEntry.Framework.Name) &&
-                        !parameters.Any (param => param.Name == p.Name))
-                .ToArray ();
-            if (alternates.Any ())
-            {
-                foreach (var a in alternates)
-                {
-                    string newValue = FXUtils.RemoveFXFromList (a.FrameworkAlternate, typeEntry.Framework.Name);
-                    if (string.IsNullOrWhiteSpace (newValue))
-                    {
-                        a.Element.RemoveAttribute (Consts.FrameworkAlternate);
-                    }
-                    else
-                    {
-                        a.Element.SetAttribute (Consts.FrameworkAlternate, newValue);
-                    }
-                }
-            }
-
-            return;
-            /*
-            // old code
-            foreach (ParameterDefinition p in parameters)
-            {
-                XmlElement pe;
-
-                // param info
-                var ptype = GetDocParameterType (p.ParameterType);
-                var newPType = ptype;
-
-                if (MDocUpdater.SwitchingToMagicTypes)
-                {
-                    newPType = NativeTypeManager.ConvertFromNativeType (ptype);
-                }
-
-                // now find the existing node, if it's there so we can reuse it.
-                var nodes = root.SelectSingleNode ("Parameters").SelectNodes ("Parameter")
-                    .Cast<XmlElement> ().Where (x => x.GetAttribute ("Name") == p.Name)
-                    .ToArray ();
-
-                // FYI: Exists? No?
-                if (nodes.Count () == 0)
-                {
-                    // TODO: instead of this. Needs to be replaced with a better
-                    // check for Parameter index ... should I add parameter index?
-
-                    // are we in frameworks mode?
-                    // add Index to all existing parameter nodes if they don't have them
-                    // match existing to position and type
-                    bool _inFXMode = typeEntry.Framework.Frameworks.Count () > 1;
-
-                    // when I find the one, name won't match ... 
-
-                    //  find all "previous" frameworks
-                    //  Add FrameworkAlternate with previous frameworks to found/pre-existing node
-                    var allPreviousTypes_ = typeEntry.Framework.Frameworks
-                                            .Where (f => f.index < typeEntry.Framework.index)
-                                            .Select (f => f.FindTypeEntry (typeEntry))
-                                            .ToArray ();
-
-                    var allPreviousFrameworks = allPreviousTypes.Value.Select (previous => previous.Framework.Name).ToArray ();
-                    string fxList = string.Join (";", allPreviousFrameworks);
-
-                    // find the parameters in `root` that have an index == this parameter's index
-                    // if they don't match, then we need to make a new one for this
-
-                    // Create new "Parameter" node, with FrameworkAlternate = this
-
-                    // Legacy: wasn't found, let's make sure it wasn't just cause the param name was changed
-                    nodes = root.SelectSingleNode ("Parameters").SelectNodes ("Parameter")
-                        .Cast<XmlElement> ()
-                        .Skip (parameterIndex) // this makes sure we don't inadvertently "reuse" nodes when adding new ones
-                        .Where (x => x.GetAttribute ("Name") != p.Name && (x.GetAttribute ("Type") == ptype || x.GetAttribute ("Type") == newPType))
-                        .Take (1) // there might be more than one that meets this parameter ... only take the first.
-                        .ToArray ();
-                }
-
-                AddXmlNode (nodes,
-                    x => x.GetAttribute ("Type") == ptype,
-                    x => x.SetAttribute ("Type", ptype),
-                    () =>
-                    {
-                        pe = root.OwnerDocument.CreateElement ("Parameter");
-                        e.AppendChild (pe);
-
-                        pe.SetAttribute ("Name", p.Name);
-                        pe.SetAttribute ("Type", ptype);
-                        if (p.ParameterType is ByReferenceType)
-                        {
-                            if (p.IsOut)
-                                pe.SetAttribute ("RefType", "out");
-                            else
-                                pe.SetAttribute ("RefType", "ref");
-                        }
-
-                        MakeAttributes (pe, GetCustomAttributes (p.CustomAttributes, ""));
-                        return pe;
-                    },
-                    member);
-
-                parameterIndex++;
-            }
-
-            // TODO: was there a `Parameter` that we didn't process that has FrameworkAlternate?
-            // if yes, remove this framework from that FrameworkAlternate
-            // if that makes the list empty, remove the node and corresponding /Docs/parameter node
-            */
-        }
-
-
-
-
-    }
-}
diff --git a/mdoc/mdoc.csproj b/mdoc/mdoc.csproj
index e87db9c6..f0051cc0 100644
--- a/mdoc/mdoc.csproj
+++ b/mdoc/mdoc.csproj
@@ -1,144 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project Sdk="Microsoft.NET.Sdk">

   <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.30703</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{7DA7CD97-614F-4BCD-A2FA-B379590CEA48}</ProjectGuid>

+    <TargetFramework>net471</TargetFramework>

     <OutputType>Exe</OutputType>

-    <RootNamespace>mdoc</RootNamespace>

-    <AssemblyName>mdoc</AssemblyName>

-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>

+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

+    <OutputPath>$(MSBuildThisFileDirectory)..\bin\$(Configuration)</OutputPath>

   </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>True</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>False</Optimize>

-    <OutputPath>..\bin\Debug</OutputPath>

-    <DefineConstants>DEBUG;NET_4_5</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <PlatformTarget>AnyCPU</PlatformTarget>

-    <Externalconsole>True</Externalconsole>

-    <Prefer32Bit>false</Prefer32Bit>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <DebugType>none</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>..\bin\Release</OutputPath>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <PlatformTarget>AnyCPU</PlatformTarget>

-    <Externalconsole>True</Externalconsole>

-    <Prefer32Bit>false</Prefer32Bit>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Web" />

-    <Reference Include="System.Xml.Linq" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+

   <ItemGroup>

-    <Compile Include="Mono.Documentation\Updater\DynamicTypeProvider.cs" />

-    <Compile Include="Mono.Documentation\Updater\EmptyAttributeParserContext.cs" />

-    <Compile Include="Mono.Documentation\Framework\FrameworkIndexHelper.cs" />

-    <Compile Include="Mono.Documentation\Framework\FrameworkTypeModel.cs" />

-    <Compile Include="Mono.Documentation\Framework\FrameworkNamespaceModel.cs" />

-    <Compile Include="Mono.Documentation\Updater\IAttributeParserContext.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\AttributeFormatters\AttributeFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\AttributeFormatters\CppWinRtAttributeFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\AttributeFormatters\FSharpAttributeFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\AttributeFormatters\CSharpAttributeFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CppFormatters\CppWinRtMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\NullableReferenceTypeProvider.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\FormatterManager.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\FSharpFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\JsFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\JsMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\JsUsageFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\FSharpFullMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\FSharpMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\FSharpUsageFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CppFormatters\CppWinRtFullMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CppFormatters\CppCxFullMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CppFormatters\CppFullMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CppFormatters\CppCxMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CSharpMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\SlashDocCSharpMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\MsxdocSlashDocMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\AttributeFormatters\AttributeValueFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\VBFullMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\VBMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\FileNameMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\SlashDocMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\DocTypeMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\DocTypeFullMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CppFormatters\CppMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CSharpFullMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\CSharpNativeTypeMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\ILNativeTypeMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\ILMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\ILFullMemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\DocIdFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Formatters\MemberFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\MemberFormatterState.cs" />

-    <Compile Include="Mono.Documentation\Updater\AttributeParserContext.cs" />

-    <Compile Include="Mono.Documentation\Updater\DocumentationMember.cs" />

-    <Compile Include="Mono.Documentation\Updater\EcmaDocumentationImporter.cs" />

-    <Compile Include="Mono.Documentation\Updater\MsxdocDocumentationImporter.cs" />

-    <Compile Include="Mono.Documentation\Updater\DocumentationImporter.cs" />

-    <Compile Include="Mono.Documentation\Updater\EcmaDocumentationEnumerator.cs" />

-    <Compile Include="Mono.Documentation\Updater\DocumentationEnumerator.cs" />

-    <Compile Include="Mono.Documentation\Updater\DocsNodeInfo.cs" />

-    <Compile Include="Mono.Documentation\Updater\Statistics\StatisticsCollector.cs" />

-    <Compile Include="Mono.Documentation\Updater\Statistics\StatisticsFormatter.cs" />

-    <Compile Include="Mono.Documentation\Updater\Statistics\StatisticsItem.cs" />

-    <Compile Include="Mono.Documentation\Updater\Statistics\StatisticsMetrics.cs" />

-    <Compile Include="Mono.Documentation\Updater\Statistics\StatisticsSaver.cs" />

-    <Compile Include="Mono.Documentation\Updater\Statistics\StatisticsStorage.cs" />

-    <Compile Include="Mono.Documentation\Updater\TypeMap.cs" />

-    <Compile Include="Mono.Documentation\Util\ApiStyle.cs" />

-    <Compile Include="Mono.Documentation\Updater\DocUtils.cs" />

-    <Compile Include="Mono.Documentation\Util\AttachedEventDefinition.cs" />

-    <Compile Include="Mono.Documentation\Util\AttachedEntitiesHelper.cs" />

-    <Compile Include="Mono.Documentation\Util\AttachedEventReference.cs" />

-    <Compile Include="Mono.Documentation\Util\AttachedPropertyDefinition.cs" />

-    <Compile Include="Mono.Documentation\Util\AttachedPropertyReference.cs" />

-    <Compile Include="Mono.Documentation\Util\CecilExtensions.cs" />

-    <Compile Include="Mono.Documentation\Util\DataModel.cs" />

-    <Compile Include="Mono.Documentation\Util\NativeTypeManager.cs" />

-    <Compile Include="Mono.Rocks\ObjectRocks.cs" />

-    <Compile Include="Mono.Rocks\StreamRocks.cs" />

-    <Compile Include="Mono.Documentation\assembler.cs" />

-    <Compile Include="Mono.Documentation\dump.cs" />

-    <Compile Include="Mono.Documentation\ecmadoc.cs" />

-    <Compile Include="Mono.Documentation\mdoc.cs" />

-    <Compile Include="Mono.Documentation\MdocFile.cs" />

-    <Compile Include="Mono.Documentation\monodocs2html.cs" />

-    <Compile Include="Mono.Documentation\monodocs2slashdoc.cs" />

-    <Compile Include="Mono.Documentation\msitomsx.cs" />

-    <Compile Include="Mono.Documentation\normalize.cs" />

-    <Compile Include="Mono.Documentation\MDocValidator.cs" />

-    <Compile Include="Mono.Documentation\webdoc.cs" />

-    <Compile Include="Mono.Documentation\XhtmlWriter.cs" />

-    <Compile Include="Mono.Documentation\exceptions.cs" />

-    <Compile Include="Mono.Documentation\index.cs" />

-    <Compile Include="Mono.Documentation\frameworksbootstrapper.cs" />

-    <Compile Include="Consts.cs" />

-    <Compile Include="Options.cs" />

-    <Compile Include="Mono.Documentation\Updater\Frameworks\FrameworkIndex.cs" />

-    <Compile Include="Mono.Documentation\Updater\Frameworks\FrameworkEntry.cs" />

-    <Compile Include="Mono.Documentation\Updater\Frameworks\FrameworkTypeEntry.cs" />

-    <Compile Include="Mono.Documentation\Updater\Frameworks\AssemblySet.cs" />

-    <Compile Include="Mono.Documentation\Updater\Frameworks\MDocResolver.cs" />

-    <Compile Include="Mono.Documentation\MDocUpdater.cs" />

-    <Compile Include="Mono.Documentation\Updater\Frameworks\FXUtils.cs" />

-    <Compile Include="GlobalSuppressions.cs" />

-    <Compile Include="Mono.Documentation\Updater\Frameworks\MDocMetadataResolver.cs" />

-    <Compile Include="Mono.Documentation\MDocException.cs" />

+    <Compile Remove="mdoc.Test\**" />

+    <Compile Remove="Test\**" />

+    <None Remove="mdoc.Test\**" />

+    <None Remove="Test\**" />

   </ItemGroup>

+

   <ItemGroup>

     <EmbeddedResource Include="Resources\defaulttemplate.xsl">

       <LogicalName>defaulttemplate.xsl</LogicalName>

@@ -156,6 +32,7 @@
       <LogicalName>stylesheet.xsl</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

+

   <ItemGroup>

     <None Include="..\monodoc\Resources\mdoc-html-format.xsl">

       <Link>Resources\mdoc-html-format.xsl</Link>

@@ -170,16 +47,14 @@
       <Link>Resources\mono-ecma-css.xsl</Link>

     </None>

   </ItemGroup>

+

   <ItemGroup>

     <PackageReference Include="Mono.Cecil" Version="$(NuGetVersionMonoCecil)" />

     <PackageReference Include="SharpZipLib" Version="$(NuGetVersionSharpZipLib)" />

     <PackageReference Include="QuickIO.NET" Version="$(NuGetVersionQuickIONET)" />

   </ItemGroup>

+

   <ItemGroup>

-    <ProjectReference Include="..\monodoc\monodoc.csproj">

-      <Project>{6e644802-b579-4037-9809-9cf4c7172c9d}</Project>

-      <Name>monodoc</Name>

-    </ProjectReference>

+    <ProjectReference Include="..\monodoc\monodoc.csproj" />

   </ItemGroup>

-  <ItemGroup />

 </Project>

diff --git a/mdoc/mdoc.nuspec b/mdoc/mdoc.nuspec
index b73cc40d..a491afc9 100644
--- a/mdoc/mdoc.nuspec
+++ b/mdoc/mdoc.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>mdoc</id>
-    <version>5.8.9.1</version>
+    <version>5.8.9.2</version>
     <title>mdoc</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
diff --git a/monodoc/Test/Monodoc.Test.csproj b/monodoc/Test/Monodoc.Test.csproj
index 37d9b576..e721e11c 100644
--- a/monodoc/Test/Monodoc.Test.csproj
+++ b/monodoc/Test/Monodoc.Test.csproj
@@ -1,59 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project Sdk="Microsoft.NET.Sdk">

   <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProductVersion>8.0.30703</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{1EE70E2C-A289-4C36-AD0A-3D0C6CE56615}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <RootNamespace>Monodoc.Test</RootNamespace>

-    <AssemblyName>Monodoc.Test</AssemblyName>

-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>

-    <NuGetPackageImportStamp>

-    </NuGetPackageImportStamp>

-    <TargetFrameworkProfile />

+    <TargetFramework>net471</TargetFramework>

+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

   </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug</OutputPath>

-    <DefineConstants>DEBUG;</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release</OutputPath>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

+

   <ItemGroup>

     <PackageReference Include="NUnit" Version="$(NuGetVersionNUnit)" />

   </ItemGroup>

+

   <ItemGroup>

-    <Compile Include="Monodoc\EcmaDocTests.cs" />

-    <Compile Include="Monodoc\HelpSourceTests.cs" />

-    <Compile Include="Monodoc\NodeTest.cs" />

-    <Compile Include="Monodoc\RootTreeTest.cs" />

-    <Compile Include="Monodoc\SettingsTest.cs" />

-    <Compile Include="Monodoc\TreeTest.cs" />

-    <Compile Include="Monodoc.Ecma\EcmaUrlTests.cs" />

-    <Compile Include="Monodoc.Generators\RawGeneratorTests.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\monodoc.csproj">

-      <Project>{6e644802-b579-4037-9809-9cf4c7172c9d}</Project>

-      <Name>monodoc</Name>

-    </ProjectReference>

+    <ProjectReference Include="..\monodoc.csproj" />

   </ItemGroup>

+

   <ItemGroup>

     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

   </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

 </Project>
\ No newline at end of file