Skip to content

Commit 3a36c04

Browse files
fix bug 990897 : [.NET] Exclude CollectionsExtensions class from Microsoft.Extensions.DependencyModel.dll in mdoc (#706)
* update * update * update * update --------- Co-authored-by: huangmin-ms <[email protected]>
1 parent 5bf22cb commit 3a36c04

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
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.3.3";
6+
public static string MonoVersion = "5.9.3.4";
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: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,12 @@ public override void Run (IEnumerable<string> args)
412412
foreach (var type in assembly.GetTypes().Where(t => DocUtils.IsPublic(t)))
413413
{
414414
var t = a.ProcessType(type, assembly);
415+
416+
// Workaround for https://dev.azure.com/ceapex/Engineering/_workitems/edit/990897
417+
if (t.Name == "System.Collections.Generic.CollectionExtensions" && assembly.MainModule.Name == "Microsoft.Extensions.DependencyModel.dll")
418+
{
419+
continue;
420+
}
415421
foreach (var member in type.GetMembers().Where(i => !DocUtils.IsIgnored(i) && IsMemberNotPrivateEII(i)))
416422
t.ProcessMember(member);
417423
}
@@ -1132,6 +1138,11 @@ private void DoUpdateAssembly (AssemblySet assemblySet, AssemblyDefinition assem
11321138

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

1141+
// Workaround for https://dev.azure.com/ceapex/Engineering/_workitems/edit/990897
1142+
if (typeEntry.Name == "System.Collections.Generic.CollectionExtensions" && assembly.MainModule.Name == "Microsoft.Extensions.DependencyModel.dll")
1143+
{
1144+
continue;
1145+
}
11351146
string reltypepath = DoUpdateType (assemblySet, assembly, type, typeEntry, source, dest);
11361147
if (reltypepath == null)
11371148
continue;

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.3.3</version>
5+
<version>5.9.3.4</version>
66
<title>mdoc</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>

0 commit comments

Comments
 (0)