diff --git a/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.TypeEquivalence.cs b/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.TypeEquivalence.cs index 3ae8c0f2a5f2ec..8c5e22b735b73b 100644 --- a/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.TypeEquivalence.cs +++ b/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.TypeEquivalence.cs @@ -136,20 +136,20 @@ public bool TypeHasCharacteristicsRequiredToBeLoadableTypeEquivalentType return false; } - foreach (var field in GetFields()) + foreach (var fieldInfo in GetFields()) { - if (field.IsLiteral) + if (fieldInfo.IsLiteral) { // Literal fields are ok continue; } - if (field.IsStatic) + if (fieldInfo.IsStatic) { return false; } - if (field.GetEffectiveVisibility() != EffectiveVisibility.Public) + if (fieldInfo.GetEffectiveVisibility() != EffectiveVisibility.Public) { return false; } diff --git a/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.cs b/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.cs index 00dd1f70d4aafe..c390e9eba5bb11 100644 --- a/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.cs +++ b/src/coreclr/tools/Common/TypeSystem/Common/TypeDesc.cs @@ -472,10 +472,10 @@ public virtual TypeDesc UnderlyingType if (!this.IsEnum) return this; - foreach (var field in this.GetFields()) + foreach (var fieldInfo in this.GetFields()) { - if (!field.IsStatic) - return field.FieldType; + if (!fieldInfo.IsStatic) + return fieldInfo.FieldType; } ThrowHelper.ThrowTypeLoadException(ExceptionStringID.ClassLoadGeneral, this); diff --git a/src/coreclr/tools/Common/TypeSystem/Ecma/EcmaType.cs b/src/coreclr/tools/Common/TypeSystem/Ecma/EcmaType.cs index 239537bbd09514..3c349b3615c3d2 100644 --- a/src/coreclr/tools/Common/TypeSystem/Ecma/EcmaType.cs +++ b/src/coreclr/tools/Common/TypeSystem/Ecma/EcmaType.cs @@ -464,9 +464,9 @@ public override TypeDesc UnderlyingType foreach (var handle in _typeDefinition.GetFields()) { - var field = _module.GetField(handle, this); - if (!field.IsStatic) - return field.FieldType; + var fieldInfo = _module.GetField(handle, this); + if (!fieldInfo.IsStatic) + return fieldInfo.FieldType; } return base.UnderlyingType; // Use the base implementation to get consistent error behavior diff --git a/src/libraries/Common/src/System/Net/CookieParser.cs b/src/libraries/Common/src/System/Net/CookieParser.cs index 9148b479a1f113..3cc3826457b8fd 100644 --- a/src/libraries/Common/src/System/Net/CookieParser.cs +++ b/src/libraries/Common/src/System/Net/CookieParser.cs @@ -553,9 +553,9 @@ private static FieldInfo IsQuotedDomainField if (s_isQuotedDomainField == null) { // TODO https://github.com/dotnet/runtime/issues/19348: - FieldInfo? field = typeof(Cookie).GetField("IsQuotedDomain", BindingFlags.Instance | BindingFlags.NonPublic); - Debug.Assert(field != null, "We need to use an internal field named IsQuotedDomain that is declared on Cookie."); - s_isQuotedDomainField = field; + FieldInfo? fieldInfo = typeof(Cookie).GetField("IsQuotedDomain", BindingFlags.Instance | BindingFlags.NonPublic); + Debug.Assert(fieldInfo != null, "We need to use an internal field named IsQuotedDomain that is declared on Cookie."); + s_isQuotedDomainField = fieldInfo; } return s_isQuotedDomainField; @@ -570,9 +570,9 @@ private static FieldInfo IsQuotedVersionField if (s_isQuotedVersionField == null) { // TODO https://github.com/dotnet/runtime/issues/19348: - FieldInfo? field = typeof(Cookie).GetField("IsQuotedVersion", BindingFlags.Instance | BindingFlags.NonPublic); - Debug.Assert(field != null, "We need to use an internal field named IsQuotedVersion that is declared on Cookie."); - s_isQuotedVersionField = field; + FieldInfo? fieldInfo = typeof(Cookie).GetField("IsQuotedVersion", BindingFlags.Instance | BindingFlags.NonPublic); + Debug.Assert(fieldInfo != null, "We need to use an internal field named IsQuotedVersion that is declared on Cookie."); + s_isQuotedVersionField = fieldInfo; } return s_isQuotedVersionField; diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs index d00a64dbb782f8..3594515245e744 100644 --- a/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs +++ b/src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Symbols/Symbol.cs @@ -131,9 +131,9 @@ public bool isStatic { get { - if (this is FieldSymbol field) + if (this is FieldSymbol fieldInfo) { - return field.isStatic; + return fieldInfo.isStatic; } if (this is EventSymbol ev) diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataMember.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataMember.cs index c06fc829069fd1..5c07f7d8265e1e 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataMember.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/DataMember.cs @@ -170,8 +170,8 @@ internal Type MemberType { if (_memberType == null) { - if (MemberInfo is FieldInfo field) - _memberType = field.FieldType; + if (MemberInfo is FieldInfo fieldInfo) + _memberType = fieldInfo.FieldType; else if (MemberInfo is PropertyInfo prop) _memberType = prop.PropertyType; else diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/Models.cs b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/Models.cs index 2f3d20c19f4638..9319de05d7deb7 100644 --- a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/Models.cs +++ b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/Models.cs @@ -431,8 +431,8 @@ internal ConstantModel[] Constants FieldInfo[] fields = Type.GetFields(); for (int i = 0; i < fields.Length; i++) { - FieldInfo field = fields[i]; - ConstantModel? constant = GetConstantModel(field); + FieldInfo fieldInfo = fields[i]; + ConstantModel? constant = GetConstantModel(fieldInfo); if (constant != null) list.Add(constant); } _constants = list.ToArray(); diff --git a/src/libraries/System.Reflection.TypeExtensions/tests/TypeTests.cs b/src/libraries/System.Reflection.TypeExtensions/tests/TypeTests.cs index 20f91ef81bfe04..f8ca55d2058a6e 100644 --- a/src/libraries/System.Reflection.TypeExtensions/tests/TypeTests.cs +++ b/src/libraries/System.Reflection.TypeExtensions/tests/TypeTests.cs @@ -792,8 +792,8 @@ public class GenericClassWithVarArgMethod public T publicField { - get { return field; } - set { field = value; } + get { return this.field; } + set { this.field = value; } } public T ReturnAndSetField(T newFieldValue, params T[] moreFieldValues) @@ -815,8 +815,8 @@ public class ClassWithVarArgMethod public int publicField { - get { return field; } - set { field = value; } + get { return this.field; } + set { this.field = value; } } public int ReturnAndSetField(int newFieldValue, params int[] moreFieldValues) diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs index 91e57848757f7b..c629448732697a 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/SerializationTestTypes/DataContract.cs @@ -1057,9 +1057,9 @@ public Type MemberType { get { - FieldInfo field = MemberInfo as FieldInfo; - if (field != null) - return field.FieldType; + FieldInfo fieldInfo = MemberInfo as FieldInfo; + if (fieldInfo != null) + return fieldInfo.FieldType; return ((PropertyInfo)MemberInfo).PropertyType; } } diff --git a/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs index 9fc58b8a5c82e1..8777fc77537127 100644 --- a/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs +++ b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.+=.cs @@ -302,12 +302,12 @@ public Dele Field { get { - return field; + return this.field; } set { - field = value; + this.field = value; } } @@ -372,12 +372,12 @@ public Dele Field { get { - return field; + return this.field; } set { - field = value; + this.field = value; } } diff --git a/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs index 59ddeda115bda8..64373f13eb3fdc 100644 --- a/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs +++ b/src/libraries/System.Runtime/tests/System.Dynamic.Runtime.Tests/Dynamic.Context/Conformance.dynamic.context.operator.compound.event.-=.cs @@ -776,12 +776,12 @@ public Dele Field { get { - return field; + return this.field; } set { - field = value; + this.field = value; } } @@ -864,12 +864,12 @@ public Dele Field { get { - return field; + return this.field; } set { - field = value; + this.field = value; } } @@ -952,12 +952,12 @@ public Dele Field { get { - return field; + return this.field; } set { - field = value; + this.field = value; } } @@ -1041,12 +1041,12 @@ public Dele Field { get { - return field; + return this.field; } set { - field = value; + this.field = value; } }