Skip to content

Commit ff1e4b1

Browse files
authored
Support .NET 10 extension members (#741)
* Support .NET 10 extension members * Fix typename * Update * bump version to 5.9.6
1 parent 6935391 commit ff1e4b1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

mdoc/Consts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace Mono.Documentation
33
{
44
public static class Consts
55
{
6-
public static string MonoVersion = "5.9.5";
6+
public static string MonoVersion = "5.9.6";
77
public const string DocId = "DocId";
88
public const string CppCli = "C++ CLI";
99
public const string CppCx = "C++ CX";

mdoc/Mono.Documentation/MDocUpdater.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ IndexForTypes CreateIndexForTypes (string dest)
818818
/// <param name="result">A typle that contains 1) the 'reltypefile', 2) the 'typefile', and 3) the file info</param>
819819
bool TryFindTypeFile (string nsname, string typename, string basepath, out Tuple<string, string, FileInfo> result)
820820
{
821-
string reltypefile = DocUtils.PathCombine (nsname, typename + ".xml");
821+
string reltypefile = DocUtils.PathCombine (nsname, typename.Replace("<", "&lt;").Replace(">", "&gt;") + ".xml");
822822
string typefile = Path.Combine (basepath, reltypefile);
823823
System.IO.FileInfo file = new System.IO.FileInfo (typefile);
824824

@@ -1127,7 +1127,7 @@ private void DoUpdateAssembly (AssemblySet assemblySet, AssemblyDefinition assem
11271127
foreach (TypeDefinition type in docEnum.GetDocumentationTypes (assembly, null))
11281128
{
11291129
string typename = GetTypeFileName (type);
1130-
if (!DocUtils.IsPublic (type) || DocUtils.IsIgnored(type) || typename.IndexOfAny (InvalidFilenameChars) >= 0)
1130+
if (!DocUtils.IsPublic (type) || DocUtils.IsIgnored(type) || (typename.IndexOfAny (InvalidFilenameChars) >= 0 && !typename.Contains("<G>$") && !typename.Contains("<M>$")))
11311131
continue;
11321132

11331133
var typeEntry = frameworkEntry.ProcessType (type, assembly);
@@ -1437,7 +1437,7 @@ private static void CleanupIndexTypes (XmlElement index_types, HashSet<string> g
14371437
MyXmlNodeList remove = new MyXmlNodeList ();
14381438
foreach (XmlElement typenode in index_types.SelectNodes ("Namespace/Type"))
14391439
{
1440-
string fulltypename = Path.Combine (((XmlElement)typenode.ParentNode).GetAttribute ("Name"), typenode.GetAttribute ("Name") + ".xml");
1440+
string fulltypename = Path.Combine (((XmlElement)typenode.ParentNode).GetAttribute ("Name"), typenode.GetAttribute ("Name").Replace("<", "&lt;").Replace(">", "&gt;") + ".xml");
14411441
if (!goodfiles.Contains (fulltypename))
14421442
{
14431443
remove.Add (typenode);

mdoc/mdoc.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>mdoc</id>
5-
<version>5.9.5</version>
5+
<version>5.9.6</version>
66
<title>mdoc</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>

0 commit comments

Comments
 (0)