Skip to content

Commit ee8eba5

Browse files
authored
fix policheck (#687)
1 parent 3685d38 commit ee8eba5

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

mdoc/Mono.Documentation/MDocUpdater.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2151,34 +2151,34 @@ public void UpdateType (XmlElement root, TypeDefinition type, FrameworkTypeEntry
21512151

21522152
string assemblyInfoNodeFilter = MDocUpdater.HasDroppedNamespace (type) ? "[@apistyle='unified']" : "[not(@apistyle) or @apistyle='classic']";
21532153
Func<XmlElement, bool> assemblyFilter = x => x.SelectSingleNode ("AssemblyName").InnerText == type.Module.Assembly.Name.Name;
2154-
foreach (var ass in root.SelectNodes ("AssemblyInfo" + assemblyInfoNodeFilter).Cast<XmlElement> ().Where (assemblyFilter))
2154+
foreach (var assembly in root.SelectNodes ("AssemblyInfo" + assemblyInfoNodeFilter).Cast<XmlElement> ().Where (assemblyFilter))
21552155
{
2156-
WriteElementText (ass, "AssemblyName", type.Module.Assembly.Name.Name);
2156+
WriteElementText (assembly, "AssemblyName", type.Module.Assembly.Name.Name);
21572157
if (!no_assembly_versions)
21582158
{
2159-
UpdateAssemblyVersions (ass, type, true);
2159+
UpdateAssemblyVersions (assembly, type, true);
21602160
}
21612161
else
21622162
{
2163-
var versions = ass.SelectNodes ("AssemblyVersion").Cast<XmlNode> ().ToList ();
2163+
var versions = assembly.SelectNodes ("AssemblyVersion").Cast<XmlNode> ().ToList ();
21642164
foreach (var version in versions)
2165-
ass.RemoveChild (version);
2165+
assembly.RemoveChild (version);
21662166
}
21672167
if (!string.IsNullOrEmpty (type.Module.Assembly.Name.Culture))
2168-
WriteElementText (ass, "AssemblyCulture", type.Module.Assembly.Name.Culture);
2168+
WriteElementText (assembly, "AssemblyCulture", type.Module.Assembly.Name.Culture);
21692169
else
2170-
ClearElement (ass, "AssemblyCulture");
2170+
ClearElement (assembly, "AssemblyCulture");
21712171

21722172

21732173
// Why-oh-why do we put assembly attributes in each type file?
21742174
// Neither monodoc nor monodocs2html use them, so I'm deleting them
21752175
// since they're outdated in current docs, and a waste of space.
2176-
//MakeAttributes(ass, type.Assembly, true);
2177-
XmlNode assattrs = ass.SelectSingleNode ("Attributes");
2176+
//MakeAttributes(assembly, type.Assembly, true);
2177+
XmlNode assattrs = assembly.SelectSingleNode ("Attributes");
21782178
if (assattrs != null)
2179-
ass.RemoveChild (assattrs);
2179+
assembly.RemoveChild (assattrs);
21802180

2181-
NormalizeWhitespace (ass);
2181+
NormalizeWhitespace (assembly);
21822182
}
21832183

21842184
if (type.IsGenericType ())
@@ -2370,13 +2370,13 @@ XmlElement AddAssemblyNameToNodeCore (XmlElement root, AssemblyNameReference ass
23702370
assemblyFilter, x => WriteElementText (x, "AssemblyName", assembly.Name),
23712371
() =>
23722372
{
2373-
XmlElement ass = WriteElement (root, "AssemblyInfo", forceNewElement: true);
2373+
XmlElement assemblyNode = WriteElement (root, "AssemblyInfo", forceNewElement: true);
23742374

23752375
if (MDocUpdater.HasDroppedNamespace (assembly))
2376-
ass.AddApiStyle (ApiStyle.Unified);
2376+
assemblyNode.AddApiStyle (ApiStyle.Unified);
23772377
if (isClassicRun)
2378-
ass.AddApiStyle (ApiStyle.Classic);
2379-
return ass;
2378+
assemblyNode.AddApiStyle (ApiStyle.Classic);
2379+
return assemblyNode;
23802380
}, assembly);
23812381
}
23822382

@@ -3524,7 +3524,7 @@ public void UpdateParameters (XmlElement e, string element, string[] values, Fra
35243524
}
35253525
seen = null;
35263526

3527-
// on last, get a list of all parent elements, and then nuke `param` if name doesn't match one on the list
3527+
// on last, get a list of all parent elements, and then remove `param` if name doesn't match one on the list
35283528
if (typeEntry.IsOnLastFramework)
35293529
{
35303530
var mainRoots = e.ParentNode.SelectNodes($"{rootParentElement}/{parentElement}")

mdoc/Mono.Documentation/Updater/Frameworks/FrameworkEntry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public FrameworkEntry[] AllFrameworksWithAssembly(string assemblyName)
108108
{
109109
var fxlist = this.allcachedframeworks
110110
.Where(f => f.allAssemblies
111-
.Any(ass => ass.Assemblies
111+
.Any(item => item.Assemblies
112112
.Any(a => a.Name.Name.Equals(assemblyName, StringComparison.OrdinalIgnoreCase))));
113113
return fxlist.ToArray();
114114
}

0 commit comments

Comments
 (0)