Skip to content

Commit

Permalink
fix bug 990897 : [.NET] Exclude CollectionsExtensions class from Micr… (
Browse files Browse the repository at this point in the history
#707)

…osoft.Extensions.DependencyModel.dll in mdoc (#706)

* update

* update

* update

* update

---------
  • Loading branch information
huangmin-ms authored Aug 22, 2024
2 parents 65aa82d + 3a36c04 commit c3d713f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
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.9.3.3";
public static string MonoVersion = "5.9.3.4";
public const string DocId = "DocId";
public const string CppCli = "C++ CLI";
public const string CppCx = "C++ CX";
Expand Down
11 changes: 11 additions & 0 deletions mdoc/Mono.Documentation/MDocUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,12 @@ public override void Run (IEnumerable<string> args)
foreach (var type in assembly.GetTypes().Where(t => DocUtils.IsPublic(t)))
{
var t = a.ProcessType(type, assembly);

// Workaround for https://dev.azure.com/ceapex/Engineering/_workitems/edit/990897
if (t.Name == "System.Collections.Generic.CollectionExtensions" && assembly.MainModule.Name == "Microsoft.Extensions.DependencyModel.dll")
{
continue;
}
foreach (var member in type.GetMembers().Where(i => !DocUtils.IsIgnored(i) && IsMemberNotPrivateEII(i)))
t.ProcessMember(member);
}
Expand Down Expand Up @@ -1132,6 +1138,11 @@ private void DoUpdateAssembly (AssemblySet assemblySet, AssemblyDefinition assem

var typeEntry = frameworkEntry.ProcessType (type, assembly);

// Workaround for https://dev.azure.com/ceapex/Engineering/_workitems/edit/990897
if (typeEntry.Name == "System.Collections.Generic.CollectionExtensions" && assembly.MainModule.Name == "Microsoft.Extensions.DependencyModel.dll")
{
continue;
}
string reltypepath = DoUpdateType (assemblySet, assembly, type, typeEntry, source, dest);
if (reltypepath == null)
continue;
Expand Down
2 changes: 1 addition & 1 deletion mdoc/mdoc.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>mdoc</id>
<version>5.9.3.3</version>
<version>5.9.3.4</version>
<title>mdoc</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
Expand Down

0 comments on commit c3d713f

Please sign in to comment.