Skip to content

[.NET] Support additional extension members for .NET 10 release #729

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.

Sign up for GitHub

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[.NET] Support additional extension members for .NET 10 release #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
376f146
update
v-fuquanli Jun 11, 2025
89b2dbd
update
v-fuquanli Jun 11, 2025
4c38475
update
v-fuquanli Jun 11, 2025
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
View file
Open in desktop
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.9.4";
public static string MonoVersion = "5.9.4.1";
public const string DocId = "DocId";
public const string CppCli = "C++ CLI";
public const string CppCx = "C++ CX";
Expand Down
10 changes: 5 additions & 5 deletions mdoc/Mono.Documentation/MDocUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,14 +818,14 @@ IndexForTypes CreateIndexForTypes (string dest)
/// <param name="result">A typle that contains 1) the 'reltypefile', 2) the 'typefile', and 3) the file info</param>
bool TryFindTypeFile (string nsname, string typename, string basepath, out Tuple<string, string, FileInfo> result)
{
string reltypefile = DocUtils.PathCombine (nsname, typename + ".xml");
string reltypefile = DocUtils.PathCombine (nsname, typename.Replace("<>", "&lt;&gt;") + ".xml");
string typefile = Path.Combine (basepath, reltypefile);
System.IO.FileInfo file = new System.IO.FileInfo (typefile);

result = new Tuple<string, string, FileInfo> (reltypefile, typefile, file);

return file.Exists;
}
return file.Exists;
}

public string DoUpdateType (AssemblySet set, AssemblyDefinition assembly, TypeDefinition type, FrameworkTypeEntry typeEntry, string basepath, string dest)
{
Expand Down Expand Up @@ -1127,7 +1127,7 @@ private void DoUpdateAssembly (AssemblySet assemblySet, AssemblyDefinition assem
foreach (TypeDefinition type in docEnum.GetDocumentationTypes (assembly, null))
{
string typename = GetTypeFileName (type);
if (!DocUtils.IsPublic (type) || DocUtils.IsIgnored(type) || typename.IndexOfAny (InvalidFilenameChars) >= 0)
if (!DocUtils.IsPublic (type) || DocUtils.IsIgnored(type) || (typename.IndexOfAny(InvalidFilenameChars) >= 0 && !typename.Contains("<>")))
continue;

var typeEntry = frameworkEntry.ProcessType (type, assembly);
Expand Down Expand Up @@ -1437,7 +1437,7 @@ private static void CleanupIndexTypes (XmlElement index_types, HashSet<string> g
MyXmlNodeList remove = new MyXmlNodeList ();
foreach (XmlElement typenode in index_types.SelectNodes ("Namespace/Type"))
{
string fulltypename = Path.Combine (((XmlElement)typenode.ParentNode).GetAttribute ("Name"), typenode.GetAttribute ("Name") + ".xml");
string fulltypename = Path.Combine (((XmlElement)typenode.ParentNode).GetAttribute ("Name"), typenode.GetAttribute ("Name").Replace("<>", "&lt;&gt;") + ".xml");
if (!goodfiles.Contains (fulltypename))
{
remove.Add (typenode);
Expand Down
2 changes: 1 addition & 1 deletion mdoc/mdoc.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>mdoc</id>
<version>5.9.4</version>
<version>5.9.4.1</version>
<title>mdoc</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
Expand Down
Loading