Enable new analyzers CA1862, CA1864 in runtime and fix findings. (#88700)

buyaa-n · web-flow · commit 9409e2d5019d · 2023-07-13T19:57:02.000-07:00
* Enable new analyzers CA1862, CA1864 in runtime and fix findings
diff --git a/eng/CodeAnalysis.src.globalconfig b/eng/CodeAnalysis.src.globalconfig
@@ -474,6 +474,12 @@ dotnet_diagnostic.CA1860.severity = warning
 # CA1861: Avoid constant arrays as arguments
 dotnet_diagnostic.CA1861.severity = warning
 
+# CA1862: Prefer using 'StringComparer'/'StringComparison' to perform case-insensitive string comparisons
+dotnet_diagnostic.CA1862.severity = warning
+
+# CA1864: Prefer the 'IDictionary.TryAdd(TKey, TValue)' method
+dotnet_diagnostic.CA1864.severity = warning
+
 # CA2000: Dispose objects before losing scope
 dotnet_diagnostic.CA2000.severity = none
 
diff --git a/eng/CodeAnalysis.test.globalconfig b/eng/CodeAnalysis.test.globalconfig
@@ -471,6 +471,12 @@ dotnet_diagnostic.CA1860.severity = none
 # CA1861: Avoid constant arrays as arguments
 dotnet_diagnostic.CA1861.severity = none
 
+# CA1862: Prefer using 'StringComparer'/'StringComparison' to perform case-insensitive string comparisons
+dotnet_diagnostic.CA1862.severity = none
+
+# CA1864: Prefer the 'IDictionary.TryAdd(TKey, TValue)' method
+dotnet_diagnostic.CA1864.severity = none
+
 # CA2000: Dispose objects before losing scope
 dotnet_diagnostic.CA2000.severity = none
 
diff --git a/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs b/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs
@@ -353,8 +353,7 @@ private string ComputeMangledTypeName(TypeDesc type)
             lock (this)
             {
                 // Ensure that name is unique and update our tables accordingly.
-                if (!_mangledTypeNames.ContainsKey(type))
-                    _mangledTypeNames.Add(type, mangledName);
+                _mangledTypeNames.TryAdd(type, mangledName);
             }
 
             return mangledName;
@@ -386,8 +385,7 @@ public override Utf8String GetMangledMethodName(MethodDesc method)
 
                 lock (this)
                 {
-                    if (!_mangledMethodNames.ContainsKey(method))
-                        _mangledMethodNames.Add(method, utf8MangledName);
+                    _mangledMethodNames.TryAdd(method, utf8MangledName);
                 }
 
                 return utf8MangledName;
@@ -557,8 +555,7 @@ private Utf8String ComputeUnqualifiedMangledMethodName(MethodDesc method)
             {
                 lock (this)
                 {
-                    if (!_unqualifiedMangledMethodNames.ContainsKey(method))
-                        _unqualifiedMangledMethodNames.Add(method, utf8MangledName);
+                    _unqualifiedMangledMethodNames.TryAdd(method, utf8MangledName);
                 }
             }
 
@@ -622,8 +619,7 @@ private Utf8String ComputeMangledFieldName(FieldDesc field)
 
             lock (this)
             {
-                if (!_mangledFieldNames.ContainsKey(field))
-                    _mangledFieldNames.Add(field, utf8MangledName);
+                _mangledFieldNames.TryAdd(field, utf8MangledName);
             }
 
             return utf8MangledName;
@@ -644,8 +640,7 @@ public override string GetMangledStringName(string literal)
 
             lock (this)
             {
-                if (!_mangledStringLiterals.ContainsKey(literal))
-                    _mangledStringLiterals.Add(literal, mangledName);
+                _mangledStringLiterals.TryAdd(literal, mangledName);
             }
 
             return mangledName;
diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/IBC/IBCProfileData.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/IBC/IBCProfileData.cs
@@ -51,10 +51,7 @@ public IBCProfileData(MibcConfig config, bool partialNGen, IEnumerable<MethodPro
             MethodProfileData[] dataArray = methodData.ToArray();
             foreach (MethodProfileData data in dataArray)
             {
-                if (!_methodData.ContainsKey(data.Method))
-                {
-                    _methodData.Add(data.Method, data);
-                }
+                _methodData.TryAdd(data.Method, data);
             }
             _partialNGen = partialNGen;
             _config = config;
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/AggregationManager.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/AggregationManager.cs
@@ -129,8 +129,9 @@ private void PublishedInstrument(Instrument instrument, MeterListener _)
             if (state != null)
             {
                 _beginInstrumentMeasurements(instrument);
-
+#pragma warning disable CA1864 // Prefer the 'IDictionary.TryAdd(TKey, TValue)' method. IDictionary.TryAdd() is not available in one of the builds
                 if (!_instruments.ContainsKey(instrument))
+#pragma warning restore CA1864
                 {
                     // This has side effects that prompt MeasurementsCompleted
                     // to be called if this is called multiple times on an
diff --git a/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Windows.cs b/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Windows.cs
@@ -522,7 +522,7 @@ private static ProcessInfo[] GetProcessInfos(PerformanceCounterLib library, int
                         }
                         else
                         {
-                            if (processInfos.ContainsKey(processInfo.ProcessId))
+                            if (!processInfos.TryAdd(processInfo.ProcessId, processInfo))
                             {
                                 // We've found two entries in the perfcounters that claim to be the
                                 // same process.  We throw an exception.  Is this really going to be
@@ -549,7 +549,6 @@ private static ProcessInfo[] GetProcessInfos(PerformanceCounterLib library, int
                                     }
                                 }
                                 processInfo.ProcessName = instanceName.ToString();
-                                processInfos.Add(processInfo.ProcessId, processInfo);
                             }
                         }
                     }
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADDNLinkedAttrSet.cs b/src/libraries/System.DirectoryServices.AccountManagement/src/System/DirectoryServices/AccountManagement/AD/ADDNLinkedAttrSet.cs
@@ -667,11 +667,10 @@ private bool MoveNextForeign(ref bool outerNeedToRetry)
                     if (null == foreignSid.sidIssuerName)
                     {
                         // create and return the unknown principal if it is not yet present in usersVisited
-                        if (!_usersVisited.ContainsKey(foreignSid.name))
+                        if (_usersVisited.TryAdd(foreignSid.name, true))
                         {
                             byte[] sid = Utils.ConvertNativeSidToByteArray(foreignSid.pSid);
                             UnknownPrincipal unknownPrincipal = UnknownPrincipal.CreateUnknownPrincipal(_storeCtx.OwningContext, sid, foreignSid.name);
-                            _usersVisited.Add(foreignSid.name, true);
                             this.current = null;
                             _currentForeignDE = null;
                             _currentForeignPrincipal = unknownPrincipal;
diff --git a/src/libraries/System.Private.Xml.Linq/src/System/Xml/Schema/XNodeValidator.cs b/src/libraries/System.Private.Xml.Linq/src/System/Xml/Schema/XNodeValidator.cs
@@ -157,10 +157,7 @@ private void ReplaceSchemaInfo(XObject o, XmlSchemaInfo schemaInfo)
             XmlSchemaInfo? si = o.Annotation<XmlSchemaInfo>();
             if (si != null)
             {
-                if (!schemaInfos.ContainsKey(si))
-                {
-                    schemaInfos.Add(si, si);
-                }
+                schemaInfos.TryAdd(si, si);
                 o.RemoveAnnotations<XmlSchemaInfo>();
             }
             if (!schemaInfos.TryGetValue(schemaInfo, out si))
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/DtdParser.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/DtdParser.cs
@@ -1229,17 +1229,11 @@ private void ParseEntityDecl()
 
                     if (isParamEntity)
                     {
-                        if (!_schemaInfo.ParameterEntities.ContainsKey(entityName))
-                        {
-                            _schemaInfo.ParameterEntities.Add(entityName, entity);
-                        }
+                        _schemaInfo.ParameterEntities.TryAdd(entityName, entity);
                     }
                     else
                     {
-                        if (!_schemaInfo.GeneralEntities.ContainsKey(entityName))
-                        {
-                            _schemaInfo.GeneralEntities.Add(entityName, entity);
-                        }
+                        _schemaInfo.GeneralEntities.TryAdd(entityName, entity);
                     }
                     entity.DeclaredInExternal = !ParsingInternalSubset;
                     entity.ParsingInProgress = true;
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/DtdParserAsync.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/DtdParserAsync.cs
@@ -861,17 +861,11 @@ private async Task ParseEntityDeclAsync()
 
                     if (isParamEntity)
                     {
-                        if (!_schemaInfo.ParameterEntities.ContainsKey(entityName))
-                        {
-                            _schemaInfo.ParameterEntities.Add(entityName, entity);
-                        }
+                        _schemaInfo.ParameterEntities.TryAdd(entityName, entity);
                     }
                     else
                     {
-                        if (!_schemaInfo.GeneralEntities.ContainsKey(entityName))
-                        {
-                            _schemaInfo.GeneralEntities.Add(entityName, entity);
-                        }
+                        _schemaInfo.GeneralEntities.TryAdd(entityName, entity);
                     }
                     entity.DeclaredInExternal = !ParsingInternalSubset;
                     entity.ParsingInProgress = true;
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaCollectionCompiler.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaCollectionCompiler.cs
@@ -305,10 +305,7 @@ private void Output(SchemaInfo schemaInfo)
                 SchemaNotation no = new SchemaNotation(notation.QualifiedName);
                 no.SystemLiteral = notation.System;
                 no.Pubid = notation.Public;
-                if (!schemaInfo.Notations.ContainsKey(no.Name.Name))
-                {
-                    schemaInfo.Notations.Add(no.Name.Name, no);
-                }
+                schemaInfo.Notations.TryAdd(no.Name.Name, no);
             }
         }
 
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaInfo.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaInfo.cs
@@ -299,10 +299,7 @@ internal void Add(SchemaInfo sinfo, ValidationEventHandler? eventhandler)
 
             foreach (string tns in sinfo.TargetNamespaces.Keys)
             {
-                if (!_targetNamespaces.ContainsKey(tns))
-                {
-                    _targetNamespaces.Add(tns, true);
-                }
+                _targetNamespaces.TryAdd(tns, true);
             }
 
             foreach (KeyValuePair<XmlQualifiedName, SchemaElementDecl> entry in sinfo._elementDecls)
@@ -321,17 +318,11 @@ internal void Add(SchemaInfo sinfo, ValidationEventHandler? eventhandler)
             }
             foreach (SchemaAttDef attdef in sinfo.AttributeDecls.Values)
             {
-                if (!_attributeDecls.ContainsKey(attdef.Name))
-                {
-                    _attributeDecls.Add(attdef.Name, attdef);
-                }
+                _attributeDecls.TryAdd(attdef.Name, attdef);
             }
             foreach (SchemaNotation notation in sinfo.Notations.Values)
             {
-                if (!Notations.ContainsKey(notation.Name.Name))
-                {
-                    Notations.Add(notation.Name.Name, notation);
-                }
+                Notations.TryAdd(notation.Name.Name, notation);
             }
         }
 
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaSetCompiler.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/SchemaSetCompiler.cs
@@ -167,10 +167,7 @@ private void Output(SchemaInfo schemaInfo)
                 SchemaNotation no = new SchemaNotation(notation!.QualifiedName);
                 no.SystemLiteral = notation.System;
                 no.Pubid = notation.Public;
-                if (!schemaInfo.Notations.ContainsKey(no.Name.Name))
-                {
-                    schemaInfo.Notations.Add(no.Name.Name, no);
-                }
+                schemaInfo.Notations.TryAdd(no.Name.Name, no);
             }
         }
 
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XdrBuilder.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XdrBuilder.cs
@@ -1051,11 +1051,7 @@ private static void XDR_BuildAttributeType_Name(XdrBuilder builder, object obj,
                 // Global AttributeTypes are URN qualified so that we can look them up across schemas.
                 qname = new XmlQualifiedName(qname.Name, builder._TargetNamespace);
                 builder._AttributeDef._AttDef.Name = qname;
-                if (!builder._SchemaInfo.AttributeDecls.ContainsKey(qname))
-                {
-                    builder._SchemaInfo.AttributeDecls.Add(qname, builder._AttributeDef._AttDef);
-                }
-                else
+                if (!builder._SchemaInfo.AttributeDecls.TryAdd(qname, builder._AttributeDef._AttDef))
                 {
                     builder.SendValidationEvent(SR.Sch_DupAttribute, XmlQualifiedName.ToString(qname.Name, prefix));
                 }
diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmPublishAssets.cs
@@ -577,6 +577,7 @@ private void GroupResolvedFilesToPublish(
 
         foreach (var candidate in resolvedFilesToPublish)
         {
+#pragma warning disable CA1864 // Prefer the 'IDictionary.TryAdd(TKey, TValue)' method. Dictionary.TryAdd() not available in .Net framework.
             if (AssetsComputingHelper.ShouldFilterCandidate(candidate, TimeZoneSupport, InvariantGlobalization, CopySymbols, customIcuCandidateFilename, EnableThreads, EmitSourceMap, out var reason))
             {
                 Log.LogMessage(MessageImportance.Low, "Skipping asset '{0}' because '{1}'", candidate.ItemSpec, reason);
@@ -654,6 +655,7 @@ private void GroupResolvedFilesToPublish(
                 }
                 continue;
             }
+#pragma warning restore CA1864
         }
     }
 
diff --git a/src/tools/illink/src/tlens/TLens.Analyzers/UnnecessaryFieldsAssignmentAnalyzer.cs b/src/tools/illink/src/tlens/TLens.Analyzers/UnnecessaryFieldsAssignmentAnalyzer.cs
@@ -72,9 +72,7 @@ protected override void ProcessMethod (MethodDefinition method)
 					methods.Add (method);
 				}
 
-				if (!fields.ContainsKey (field))
-					fields.Add (field, access);
-				else
+				if (!fields.TryAdd (field, access))
 					fields[field] |= access;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -353,8 +353,7 @@ private string ComputeMangledTypeName(TypeDesc type)`
`353`	`353`	`lock (this)`
`354`	`354`	`{`
`355`	`355`	`// Ensure that name is unique and update our tables accordingly.`
`356`		`- if (!_mangledTypeNames.ContainsKey(type))`
`357`		`- _mangledTypeNames.Add(type, mangledName);`
	`356`	`+ _mangledTypeNames.TryAdd(type, mangledName);`
`358`	`357`	`}`
`359`	`358`
`360`	`359`	`return mangledName;`
`@@ -386,8 +385,7 @@ public override Utf8String GetMangledMethodName(MethodDesc method)`
`386`	`385`
`387`	`386`	`lock (this)`
`388`	`387`	`{`
`389`		`- if (!_mangledMethodNames.ContainsKey(method))`
`390`		`- _mangledMethodNames.Add(method, utf8MangledName);`
	`388`	`+ _mangledMethodNames.TryAdd(method, utf8MangledName);`
`391`	`389`	`}`
`392`	`390`
`393`	`391`	`return utf8MangledName;`
`@@ -557,8 +555,7 @@ private Utf8String ComputeUnqualifiedMangledMethodName(MethodDesc method)`
`557`	`555`	`{`
`558`	`556`	`lock (this)`
`559`	`557`	`{`
`560`		`- if (!_unqualifiedMangledMethodNames.ContainsKey(method))`
`561`		`- _unqualifiedMangledMethodNames.Add(method, utf8MangledName);`
	`558`	`+ _unqualifiedMangledMethodNames.TryAdd(method, utf8MangledName);`
`562`	`559`	`}`
`563`	`560`	`}`
`564`	`561`
`@@ -622,8 +619,7 @@ private Utf8String ComputeMangledFieldName(FieldDesc field)`
`622`	`619`
`623`	`620`	`lock (this)`
`624`	`621`	`{`
`625`		`- if (!_mangledFieldNames.ContainsKey(field))`
`626`		`- _mangledFieldNames.Add(field, utf8MangledName);`
	`622`	`+ _mangledFieldNames.TryAdd(field, utf8MangledName);`
`627`	`623`	`}`
`628`	`624`
`629`	`625`	`return utf8MangledName;`
`@@ -644,8 +640,7 @@ public override string GetMangledStringName(string literal)`
`644`	`640`
`645`	`641`	`lock (this)`
`646`	`642`	`{`
`647`		`- if (!_mangledStringLiterals.ContainsKey(literal))`
`648`		`- _mangledStringLiterals.Add(literal, mangledName);`
	`643`	`+ _mangledStringLiterals.TryAdd(literal, mangledName);`
`649`	`644`	`}`
`650`	`645`
`651`	`646`	`return mangledName;`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,7 @@ public IBCProfileData(MibcConfig config, bool partialNGen, IEnumerable<MethodPro`
`51`	`51`	`MethodProfileData[] dataArray = methodData.ToArray();`
`52`	`52`	`foreach (MethodProfileData data in dataArray)`
`53`	`53`	`{`
`54`		`- if (!_methodData.ContainsKey(data.Method))`
`55`		`- {`
`56`		`- _methodData.Add(data.Method, data);`
`57`		`- }`
	`54`	`+ _methodData.TryAdd(data.Method, data);`
`58`	`55`	`}`
`59`	`56`	`_partialNGen = partialNGen;`
`60`	`57`	`_config = config;`
Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,9 @@ private void PublishedInstrument(Instrument instrument, MeterListener _)`
`129`	`129`	`if (state != null)`
`130`	`130`	`{`
`131`	`131`	`_beginInstrumentMeasurements(instrument);`
`132`		`-`
	`132`	`+#pragma warning disable CA1864 // Prefer the 'IDictionary.TryAdd(TKey, TValue)' method. IDictionary.TryAdd() is not available in one of the builds`
`133`	`133`	`if (!_instruments.ContainsKey(instrument))`
	`134`	`+#pragma warning restore CA1864`
`134`	`135`	`{`
`135`	`136`	`// This has side effects that prompt MeasurementsCompleted`
`136`	`137`	`// to be called if this is called multiple times on an`
Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ private static ProcessInfo[] GetProcessInfos(PerformanceCounterLib library, int`
`522`	`522`	`}`
`523`	`523`	`else`
`524`	`524`	`{`
`525`		`- if (processInfos.ContainsKey(processInfo.ProcessId))`
	`525`	`+ if (!processInfos.TryAdd(processInfo.ProcessId, processInfo))`
`526`	`526`	`{`
`527`	`527`	`// We've found two entries in the perfcounters that claim to be the`
`528`	`528`	`// same process. We throw an exception. Is this really going to be`
`@@ -549,7 +549,6 @@ private static ProcessInfo[] GetProcessInfos(PerformanceCounterLib library, int`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`	`processInfo.ProcessName = instanceName.ToString();`
`552`		`- processInfos.Add(processInfo.ProcessId, processInfo);`
`553`	`552`	`}`
`554`	`553`	`}`
`555`	`554`	`}`
Original file line number	Diff line number	Diff line change
`@@ -667,11 +667,10 @@ private bool MoveNextForeign(ref bool outerNeedToRetry)`
`667`	`667`	`if (null == foreignSid.sidIssuerName)`
`668`	`668`	`{`
`669`	`669`	`// create and return the unknown principal if it is not yet present in usersVisited`
`670`		`- if (!_usersVisited.ContainsKey(foreignSid.name))`
	`670`	`+ if (_usersVisited.TryAdd(foreignSid.name, true))`
`671`	`671`	`{`
`672`	`672`	`byte[] sid = Utils.ConvertNativeSidToByteArray(foreignSid.pSid);`
`673`	`673`	`UnknownPrincipal unknownPrincipal = UnknownPrincipal.CreateUnknownPrincipal(_storeCtx.OwningContext, sid, foreignSid.name);`
`674`		`- _usersVisited.Add(foreignSid.name, true);`
`675`	`674`	`this.current = null;`
`676`	`675`	`_currentForeignDE = null;`
`677`	`676`	`_currentForeignPrincipal = unknownPrincipal;`
Original file line number	Diff line number	Diff line change
`@@ -157,10 +157,7 @@ private void ReplaceSchemaInfo(XObject o, XmlSchemaInfo schemaInfo)`
`157`	`157`	`XmlSchemaInfo? si = o.Annotation<XmlSchemaInfo>();`
`158`	`158`	`if (si != null)`
`159`	`159`	`{`
`160`		`- if (!schemaInfos.ContainsKey(si))`
`161`		`- {`
`162`		`- schemaInfos.Add(si, si);`
`163`		`- }`
	`160`	`+ schemaInfos.TryAdd(si, si);`
`164`	`161`	`o.RemoveAnnotations<XmlSchemaInfo>();`
`165`	`162`	`}`
`166`	`163`	`if (!schemaInfos.TryGetValue(schemaInfo, out si))`
Original file line number	Diff line number	Diff line change
`@@ -1229,17 +1229,11 @@ private void ParseEntityDecl()`
`1229`	`1229`
`1230`	`1230`	`if (isParamEntity)`
`1231`	`1231`	`{`
`1232`		`- if (!_schemaInfo.ParameterEntities.ContainsKey(entityName))`
`1233`		`- {`
`1234`		`- _schemaInfo.ParameterEntities.Add(entityName, entity);`
`1235`		`- }`
	`1232`	`+ _schemaInfo.ParameterEntities.TryAdd(entityName, entity);`
`1236`	`1233`	`}`
`1237`	`1234`	`else`
`1238`	`1235`	`{`
`1239`		`- if (!_schemaInfo.GeneralEntities.ContainsKey(entityName))`
`1240`		`- {`
`1241`		`- _schemaInfo.GeneralEntities.Add(entityName, entity);`
`1242`		`- }`
	`1236`	`+ _schemaInfo.GeneralEntities.TryAdd(entityName, entity);`
`1243`	`1237`	`}`
`1244`	`1238`	`entity.DeclaredInExternal = !ParsingInternalSubset;`
`1245`	`1239`	`entity.ParsingInProgress = true;`
Original file line number	Diff line number	Diff line change
`@@ -861,17 +861,11 @@ private async Task ParseEntityDeclAsync()`
`861`	`861`
`862`	`862`	`if (isParamEntity)`
`863`	`863`	`{`
`864`		`- if (!_schemaInfo.ParameterEntities.ContainsKey(entityName))`
`865`		`- {`
`866`		`- _schemaInfo.ParameterEntities.Add(entityName, entity);`
`867`		`- }`
	`864`	`+ _schemaInfo.ParameterEntities.TryAdd(entityName, entity);`
`868`	`865`	`}`
`869`	`866`	`else`
`870`	`867`	`{`
`871`		`- if (!_schemaInfo.GeneralEntities.ContainsKey(entityName))`
`872`		`- {`
`873`		`- _schemaInfo.GeneralEntities.Add(entityName, entity);`
`874`		`- }`
	`868`	`+ _schemaInfo.GeneralEntities.TryAdd(entityName, entity);`
`875`	`869`	`}`
`876`	`870`	`entity.DeclaredInExternal = !ParsingInternalSubset;`
`877`	`871`	`entity.ParsingInProgress = true;`