Skip to content

bump mdoc to 5.8.9.2 #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mdoc/Consts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions mdoc/Mono.Documentation/MDocUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ private void AddIndexAssembly (AssemblyDefinition assembly, XmlElement parent, F
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)
Expand All @@ -1000,7 +1000,7 @@ private void AddIndexAssembly (AssemblyDefinition assembly, XmlElement parent, F

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);
}
Expand Down
11 changes: 9 additions & 2 deletions mdoc/Mono.Documentation/Updater/DocumentationEnumerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ private static IEnumerable<MemberReference> GetReflectionMembersCore (TypeDefini
// 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:
Expand Down Expand Up @@ -294,6 +294,13 @@ private static IEnumerable<MemberReference> GetReflectionMembersCore (TypeDefini
};


// 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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Remoting.Contexts;
using System.Text;
using Mono.Cecil;

Expand Down
269 changes: 0 additions & 269 deletions mdoc/Mono.Documentation/Updater/XmlSyncer.cs

This file was deleted.

Loading