From 4602f78bd93f14be24d2e89afde28e9f5ba5a33c Mon Sep 17 00:00:00 2001 From: kasperk81 <83082615+kasperk81@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:53:56 +0300 Subject: [PATCH] fix typos (#108116) --- docs/tools/illink/error-codes.md | 4 +- eng/DotNetBuild.props | 2 +- src/coreclr/gc/gc.cpp | 2 +- .../Common/MetadataVirtualMethodAlgorithm.cs | 2 +- .../TypeSystem/IL/Stubs/StreamIntrinsics.cs | 8 +- .../Compiler/DependencyAnalysis/EETypeNode.cs | 6 +- .../DependencyAnalysis/GVMDependenciesNode.cs | 2 +- .../ILCompiler.Compiler/Compiler/ILScanner.cs | 6 +- .../Compiler/MetadataManager.cs | 2 +- .../ReadyToRun/TypeValidationChecker.cs | 12 +-- .../VirtualFunctionOverrideTests.cs | 2 +- src/coreclr/vm/methodtable.inl | 2 +- .../src/Resources/Strings.resx | 2 +- .../System/Reflection/Emit/TypeBuilderImpl.cs | 2 +- .../Security/Cryptography/Cose/CoseMessage.cs | 4 +- .../tests/HmacMD5Tests.cs | 12 +-- .../tests/HmacSha1Tests.cs | 12 +-- .../tests/HmacSha256Tests.cs | 12 +-- .../tests/HmacSha384Tests.cs | 12 +-- .../tests/HmacSha3_256Tests.cs | 12 +-- .../tests/HmacSha3_384Tests.cs | 12 +-- .../tests/HmacSha3_512Tests.cs | 12 +-- .../tests/HmacSha512Tests.cs | 12 +-- .../tests/MD5Tests.cs | 8 +- .../tests/Sha1Tests.cs | 8 +- .../tests/Sha256Tests.cs | 8 +- .../tests/Sha384Tests.cs | 8 +- .../tests/Sha3_256Tests.cs | 8 +- .../tests/Sha3_384Tests.cs | 8 +- .../tests/Sha3_512Tests.cs | 8 +- .../tests/Sha512Tests.cs | 8 +- src/mono/Directory.Build.props | 2 +- .../DebuggerTestSuite/CustomViewTests.cs | 34 +++---- .../EvaluateOnCallFrame2Tests.cs | 2 +- .../debugger-test/debugger-evaluate-test.cs | 2 +- .../tests/debugger-test/debugger-test.cs | 90 +++++++++---------- src/mono/mono/metadata/class-setup-vtable.c | 6 +- src/mono/mono/mini/interp/transform.c | 2 +- .../ISymbolExtensions.cs | 6 +- ...rloadedMethodGetsStrippedInGenericClass.cs | 2 +- 40 files changed, 182 insertions(+), 182 deletions(-) diff --git a/docs/tools/illink/error-codes.md b/docs/tools/illink/error-codes.md index 282ff575a94489..002c753f61ef4e 100644 --- a/docs/tools/illink/error-codes.md +++ b/docs/tools/illink/error-codes.md @@ -802,7 +802,7 @@ This is technically possible if a custom assembly defines `DynamicDependencyAttr public override void TestMethod() {} } ``` - A derived member has the attribute but the overriden base member does not have the attribute + A derived member has the attribute but the overridden base member does not have the attribute ```C# public class Base { @@ -1953,7 +1953,7 @@ void TestMethod() public override void TestMethod() {} } ``` - A derived member has the attribute but the overriden base member does not have the attribute + A derived member has the attribute but the overridden base member does not have the attribute ```C# public class Base { diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index ce13d6ca5b0022..1b23f8f95e80e9 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -70,7 +70,7 @@ $(InnerBuildArgs) /p:MonoBundleLLVMOptimizer=$(DotNetBuildMonoBundleLLVMOptimizer) $(InnerBuildArgs) $(FlagParameterPrefix)pgoinstrument - + $(InnerBuildArgs) /p:DotNetBuildRepo=true $(InnerBuildArgs) /p:DotNetBuildOrchestrator=true $(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId) diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp index 168a5ea6576e17..9a9f8f782d3c9d 100644 --- a/src/coreclr/gc/gc.cpp +++ b/src/coreclr/gc/gc.cpp @@ -48839,7 +48839,7 @@ HRESULT GCHeap::Initialize() nhp_from_config = static_cast(GCConfig::GetHeapCount()); - // The CPU count may be overriden by the user. Ensure that we create no more than g_num_processors + // The CPU count may be overridden by the user. Ensure that we create no more than g_num_processors // heaps as that is the number of slots we have allocated for handle tables. g_num_active_processors = min (GCToEEInterface::GetCurrentProcessCpuCount(), g_num_processors); diff --git a/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs b/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs index d87331f3926b36..f1d4cde1ad3bab 100644 --- a/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs +++ b/src/coreclr/tools/Common/TypeSystem/Common/MetadataVirtualMethodAlgorithm.cs @@ -465,7 +465,7 @@ private static void FindBaseUnificationGroup(MetadataType currentType, Unificati // We may want to build up a unification group for the base just to check the further MethodImpl case here. FindBaseUnificationGroup(baseType, unificationGroup); - // We should check to see if a the DefiningMethod on the base unification group is overriden via MethodImpl + // We should check to see if a the DefiningMethod on the base unification group is overridden via MethodImpl // TODO! check to see if we need to check for MethodImpls affecting other members of the unification group // other than the defining method if (unificationGroup.DefiningMethod != null) diff --git a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/StreamIntrinsics.cs b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/StreamIntrinsics.cs index fc28505f84ced3..c9e65cc40fa9e0 100644 --- a/src/coreclr/tools/Common/TypeSystem/IL/Stubs/StreamIntrinsics.cs +++ b/src/coreclr/tools/Common/TypeSystem/IL/Stubs/StreamIntrinsics.cs @@ -27,24 +27,24 @@ public static MethodIL EmitIL(MethodDesc method) ILEmitter emitter = new ILEmitter(); ILCodeStream codestream = emitter.NewCodeStream(); - ILCodeLabel lOverriden = emitter.NewCodeLabel(); + ILCodeLabel lOverridden = emitter.NewCodeLabel(); ILToken beginMethodToken = emitter.NewToken(beginMethod); codestream.EmitLdArg(0); codestream.Emit(ILOpcode.ldvirtftn, beginMethodToken); codestream.Emit(ILOpcode.ldftn, beginMethodToken); - codestream.Emit(ILOpcode.bne_un, lOverriden); + codestream.Emit(ILOpcode.bne_un, lOverridden); ILToken endMethodToken = emitter.NewToken(endMethod); codestream.EmitLdArg(0); codestream.Emit(ILOpcode.ldvirtftn, endMethodToken); codestream.Emit(ILOpcode.ldftn, endMethodToken); - codestream.Emit(ILOpcode.bne_un, lOverriden); + codestream.Emit(ILOpcode.bne_un, lOverridden); codestream.EmitLdc(0); codestream.Emit(ILOpcode.ret); - codestream.EmitLabel(lOverriden); + codestream.EmitLabel(lOverridden); codestream.EmitLdc(1); codestream.Emit(ILOpcode.ret); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs index a27a77882ab130..524dfe97847958 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs @@ -400,10 +400,10 @@ public sealed override IEnumerable GetConditionalSt // If this is an abstract type, only request a tentative entrypoint (whose body // might just be stubbed out). This lets us avoid generating method bodies for - // virtual method on abstract types that are overriden in all their children. + // virtual method on abstract types that are overridden in all their children. // // We don't do this if the method can be placed in the sealed vtable since - // those can never be overriden by children anyway. + // those can never be overridden by children anyway. bool canUseTentativeMethod = isNonInterfaceAbstractType && !decl.CanMethodBeInSealedVTable(factory) && factory.CompilationModuleGroup.AllowVirtualMethodOnAbstractTypeOptimization(canonImpl); @@ -1031,7 +1031,7 @@ private void OutputVirtualSlots(NodeFactory factory, ref ObjectDataBuilder objDa // If the type we're generating now is abstract, and the implementation comes from an abstract type, // only use a tentative method entrypoint that can have its body replaced by a throwing stub // if no "hard" reference to that entrypoint exists in the program. - // This helps us to eliminate method bodies for virtual methods on abstract types that are fully overriden + // This helps us to eliminate method bodies for virtual methods on abstract types that are fully overridden // in the children of that abstract type. bool canUseTentativeEntrypoint = implType is MetadataType mdImplType && mdImplType.IsAbstract && !mdImplType.IsInterface && implMethod.OwningType is MetadataType mdImplMethodType && mdImplMethodType.IsAbstract diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GVMDependenciesNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GVMDependenciesNode.cs index 618d7e68c9b7b1..7218bf0d7d9639 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GVMDependenciesNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GVMDependenciesNode.cs @@ -143,7 +143,7 @@ public override IEnumerable SearchDynamicDependenci openInstantiation[instArg] = context.GetSignatureVariable(instArg, method: true); MethodDesc implementingMethodInstantiation = slotDecl.MakeInstantiatedMethod(openInstantiation).InstantiateSignature(potentialOverrideType.Instantiation, _method.Instantiation); - // Static virtuals cannot be further overriden so this is an impl use. Otherwise it's a virtual slot use. + // Static virtuals cannot be further overridden so this is an impl use. Otherwise it's a virtual slot use. if (implementingMethodInstantiation.Signature.IsStatic) dynamicDependencies.Add(new CombinedDependencyListEntry(factory.GenericVirtualMethodImpl(implementingMethodInstantiation.GetCanonMethodTarget(CanonicalFormKind.Specific)), null, "ImplementingMethodInstantiation")); else diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ILScanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ILScanner.cs index f2c31155d5f453..e314e80e319757 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ILScanner.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ILScanner.cs @@ -428,7 +428,7 @@ private sealed class ScannedDevirtualizationManager : DevirtualizationManager private HashSet _unsealedTypes = new HashSet(); private Dictionary> _implementators = new(); private HashSet _disqualifiedTypes = new(); - private HashSet _overridenMethods = new(); + private HashSet _overriddenMethods = new(); private HashSet _generatedVirtualMethods = new(); public ScannedDevirtualizationManager(NodeFactory factory, ImmutableArray> markedNodes) @@ -583,7 +583,7 @@ static List BuildVTable(NodeFactory factory, TypeDesc currentType, T for (int i = 0; i < baseVtable.Count; i++) { if (baseVtable[i] != vtable[i]) - _overridenMethods.Add(baseVtable[i]); + _overriddenMethods.Add(baseVtable[i]); } } } @@ -681,7 +681,7 @@ public override bool IsEffectivelySealed(MethodDesc method) return false; // If we haven't seen any other method override this, this method is sealed - return !_overridenMethods.Contains(canonMethod); + return !_overriddenMethods.Contains(canonMethod); } protected override MethodDesc ResolveVirtualMethod(MethodDesc declMethod, DefType implType, out CORINFO_DEVIRTUALIZATION_DETAIL devirtualizationDetail) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/MetadataManager.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/MetadataManager.cs index d481c8ae4327df..11b3bf944d83a8 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/MetadataManager.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/MetadataManager.cs @@ -616,7 +616,7 @@ public virtual void GetDependenciesDueToDelegateCreation(ref CombinedDependencyL } /// - /// This method is an extension point that can provide additional dependencies for overriden methods on constructed types. + /// This method is an extension point that can provide additional dependencies for overridden methods on constructed types. /// public virtual void GetDependenciesForOverridingMethod(ref CombinedDependencyList dependencies, NodeFactory factory, MethodDesc decl, MethodDesc impl) { diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/TypeValidationChecker.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/TypeValidationChecker.cs index a257dbbe967fd7..e6ef9cad2c10f9 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/TypeValidationChecker.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/TypeValidationChecker.cs @@ -305,7 +305,7 @@ Task ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation) // Override rules // Validate that each override results does not violate accessibility rules -- UNIMPLEMENTED - HashSet overridenDeclMethods = new HashSet(); + HashSet overriddenDeclMethods = new HashSet(); foreach (var methodImplHandle in typeDef.GetMethodImplementations()) { @@ -352,7 +352,7 @@ Task ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation) } // Validate that multiple MethodImpls don't override the same method - if (!overridenDeclMethods.Add(methodDecl)) + if (!overriddenDeclMethods.Add(methodDecl)) { AddTypeValidationError(type, $"Multiple MethodImpl records override '{methodDecl}'"); return false; @@ -388,7 +388,7 @@ Task ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation) // Validate that for every override involving generic methods that the generic method constraints are matching if (!CompareMethodConstraints(interfaceMethod, resolvedMethod)) { - AddTypeValidationError(type, $"Interface method '{interfaceMethod}' overriden by method '{resolvedMethod}' which does not have matching generic constraints"); + AddTypeValidationError(type, $"Interface method '{interfaceMethod}' overridden by method '{resolvedMethod}' which does not have matching generic constraints"); return false; } } @@ -410,7 +410,7 @@ Task ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation) // Validate that for every override involving generic methods that the generic method constraints are matching if (!CompareMethodConstraints(interfaceMethod, impl)) { - AddTypeValidationError(type, $"Interface method '{interfaceMethod}' overriden by method '{impl}' which does not have matching generic constraints"); + AddTypeValidationError(type, $"Interface method '{interfaceMethod}' overridden by method '{impl}' which does not have matching generic constraints"); return false; } } @@ -428,7 +428,7 @@ Task ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation) // Validate that for every override involving generic methods that the generic method constraints are matching if (!CompareMethodConstraints(virtualMethod, implementationMethod)) { - AddTypeValidationError(type, $"Virtual method '{virtualMethod}' overriden by method '{implementationMethod}' which does not have matching generic constraints"); + AddTypeValidationError(type, $"Virtual method '{virtualMethod}' overridden by method '{implementationMethod}' which does not have matching generic constraints"); return false; } @@ -439,7 +439,7 @@ Task ValidateTypeWorkerHelper(TypeDesc typeToCheckForSkipValidation) var implementationOnBaseType = baseTypeVirtualMethodAlgorithm.FindVirtualFunctionTargetMethodOnObjectType(virtualMethod, type.BaseType); if (!implementationMethod.Signature.ApplySubstitution(type.Instantiation).EquivalentWithCovariantReturnType(implementationOnBaseType.Signature.ApplySubstitution(type.Instantiation))) { - AddTypeValidationError(type, $"Virtual method '{virtualMethod}' overriden by method '{implementationMethod}' does not satisfy the covariant return type introduced with '{implementationOnBaseType}'"); + AddTypeValidationError(type, $"Virtual method '{virtualMethod}' overridden by method '{implementationMethod}' does not satisfy the covariant return type introduced with '{implementationOnBaseType}'"); return false; } } diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/VirtualFunctionOverrideTests.cs b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/VirtualFunctionOverrideTests.cs index 25adae65bda26f..a078d10305dde8 100644 --- a/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/VirtualFunctionOverrideTests.cs +++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/VirtualFunctionOverrideTests.cs @@ -435,7 +435,7 @@ public void TestPreserveBaseOverridesBehavior(string exactScenarioName, string s [InlineData("Impl", "ImplCovariant")] [InlineData("SubImpl", "SubImplCovariant")] [InlineData("SubImpl_OverrideViaNameSig", "SubImplCovariant2")] - [InlineData("SubImpl_OverrideViaNameSig_OverridenViaMethodImpl", "SubSubImplCovariant")] + [InlineData("SubImpl_OverrideViaNameSig_OverriddenViaMethodImpl", "SubSubImplCovariant")] public void TestSubImplCovariant(string exactScenarioName, string typeToConstruct) { this._logger.WriteLine(exactScenarioName); diff --git a/src/coreclr/vm/methodtable.inl b/src/coreclr/vm/methodtable.inl index 819bc0eb8d434e..7710efe98d0489 100644 --- a/src/coreclr/vm/methodtable.inl +++ b/src/coreclr/vm/methodtable.inl @@ -434,7 +434,7 @@ inline MethodDesc* MethodTable::GetMethodDescForSlot_NoThrow(DWORD slot) if (pCode == (PCODE)NULL) { - // This code path should only be hit for methods which have not been overriden + // This code path should only be hit for methods which have not been overridden MethodTable *pMTToSearchForMethodDesc = this->GetCanonicalMethodTable(); while (pMTToSearchForMethodDesc != NULL) { diff --git a/src/libraries/System.Reflection.Emit/src/Resources/Strings.resx b/src/libraries/System.Reflection.Emit/src/Resources/Strings.resx index 8ec0577d1f8ea8..f90a00c0be133a 100644 --- a/src/libraries/System.Reflection.Emit/src/Resources/Strings.resx +++ b/src/libraries/System.Reflection.Emit/src/Resources/Strings.resx @@ -243,7 +243,7 @@ Interface not found. - + Method '{0}' on type '{1}' is overriding a method that has been overridden. diff --git a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs index 469b229b20dc75..a5c00306657d45 100644 --- a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs +++ b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs @@ -326,7 +326,7 @@ protected override void DefineMethodOverrideCore(MethodInfo methodInfoBody, Meth { if (im.Exists(pair => pair.ifaceMethod.Equals(methodInfoDeclaration))) { - throw new ArgumentException(SR.Format(SR.Argument_MethodOverriden, methodInfoBody.Name, FullName), nameof(methodInfoDeclaration)); + throw new ArgumentException(SR.Format(SR.Argument_MethodOverridden, methodInfoBody.Name, FullName), nameof(methodInfoDeclaration)); } im.Add((methodInfoDeclaration, methodInfoBody)); diff --git a/src/libraries/System.Security.Cryptography.Cose/src/System/Security/Cryptography/Cose/CoseMessage.cs b/src/libraries/System.Security.Cryptography.Cose/src/System/Security/Cryptography/Cose/CoseMessage.cs index 6395c966246ff1..32ce27a508387a 100644 --- a/src/libraries/System.Security.Cryptography.Cose/src/System/Security/Cryptography/Cose/CoseMessage.cs +++ b/src/libraries/System.Security.Cryptography.Cose/src/System/Security/Cryptography/Cose/CoseMessage.cs @@ -621,7 +621,7 @@ public int Encode(Span destination) } /// - /// When overriden in a derived class, attempts to encode this message into the specified buffer. + /// When overridden in a derived class, attempts to encode this message into the specified buffer. /// /// The buffer in which to write the encoded value. /// On success, receives the number of bytes written to . This parameter is treated as uninitialized. @@ -632,7 +632,7 @@ public int Encode(Span destination) public abstract bool TryEncode(Span destination, out int bytesWritten); /// - /// When overriden in a derived class, calculates the number of bytes produced by encoding this . + /// When overridden in a derived class, calculates the number of bytes produced by encoding this . /// /// The number of bytes produced by encoding this message. public abstract int GetEncodedLength(); diff --git a/src/libraries/System.Security.Cryptography/tests/HmacMD5Tests.cs b/src/libraries/System.Security.Cryptography/tests/HmacMD5Tests.cs index 17d6a278999d44..1099b65976a2cf 100644 --- a/src/libraries/System.Security.Cryptography/tests/HmacMD5Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/HmacMD5Tests.cs @@ -159,7 +159,7 @@ public void HMacMD5_EmptyKey() [Fact] public void HmacMD5_Stream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl md5 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -171,7 +171,7 @@ public void HmacMD5_Stream_MultipleOf4096() [Fact] public void HmacMD5_Stream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl md5 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -183,7 +183,7 @@ public void HmacMD5_Stream_NotMultipleOf4096() [Fact] public void HmacMD5_Stream_Empty() { - // Verfied with: + // Verified with: // echo -n "" | openssl md5 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "", @@ -195,7 +195,7 @@ public void HmacMD5_Stream_Empty() [Fact] public async Task HmacMD5_Stream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl md5 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -207,7 +207,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacMD5_Stream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl md5 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -219,7 +219,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacMD5_Stream_Empty_Async() { - // Verfied with: + // Verified with: // echo -n "" | openssl md5 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "", diff --git a/src/libraries/System.Security.Cryptography/tests/HmacSha1Tests.cs b/src/libraries/System.Security.Cryptography/tests/HmacSha1Tests.cs index 11a8652727ba1e..fcb9022b64c1fa 100644 --- a/src/libraries/System.Security.Cryptography/tests/HmacSha1Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/HmacSha1Tests.cs @@ -182,7 +182,7 @@ public void HmacSha1_Rfc2104_2() [Fact] public void HmacSha1_Stream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha1 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -194,7 +194,7 @@ public void HmacSha1_Stream_MultipleOf4096() [Fact] public void HmacSha1_Stream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha1 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -206,7 +206,7 @@ public void HmacSha1_Stream_NotMultipleOf4096() [Fact] public void HmacSha1_Stream_Empty() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha1 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "", @@ -218,7 +218,7 @@ public void HmacSha1_Stream_Empty() [Fact] public async Task HmacSha1_Stream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha1 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -230,7 +230,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacSha1_Stream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha1 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -242,7 +242,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacSha1_Stream_Empty_Async() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha1 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "", diff --git a/src/libraries/System.Security.Cryptography/tests/HmacSha256Tests.cs b/src/libraries/System.Security.Cryptography/tests/HmacSha256Tests.cs index 59303c267bb952..b7826bb5dda37c 100644 --- a/src/libraries/System.Security.Cryptography/tests/HmacSha256Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/HmacSha256Tests.cs @@ -146,7 +146,7 @@ public void HmacSha256_EmptyKey() [Fact] public void HmacSha256_Stream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -158,7 +158,7 @@ public void HmacSha256_Stream_MultipleOf4096() [Fact] public void HmacSha256_Stream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -170,7 +170,7 @@ public void HmacSha256_Stream_NotMultipleOf4096() [Fact] public void HmacSha256_Stream_Empty() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "", @@ -182,7 +182,7 @@ public void HmacSha256_Stream_Empty() [Fact] public async Task HmacSha256_Stream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -194,7 +194,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacSha256_Stream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -206,7 +206,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacSha256_Stream_Empty_Async() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "", diff --git a/src/libraries/System.Security.Cryptography/tests/HmacSha384Tests.cs b/src/libraries/System.Security.Cryptography/tests/HmacSha384Tests.cs index 85918c7842ee03..1d9df93fcb0026 100644 --- a/src/libraries/System.Security.Cryptography/tests/HmacSha384Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/HmacSha384Tests.cs @@ -159,7 +159,7 @@ public void HmacSha384_EmptyKey() [Fact] public void HmacSha384_Stream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -171,7 +171,7 @@ public void HmacSha384_Stream_MultipleOf4096() [Fact] public void HmacSha384_Stream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -183,7 +183,7 @@ public void HmacSha384_Stream_NotMultipleOf4096() [Fact] public void HmacSha384_Stream_Empty() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "", @@ -195,7 +195,7 @@ public void HmacSha384_Stream_Empty() [Fact] public async Task HmacSha384_Stream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -207,7 +207,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacSha384_Stream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -219,7 +219,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacSha384_Stream_Empty_Async() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "", diff --git a/src/libraries/System.Security.Cryptography/tests/HmacSha3_256Tests.cs b/src/libraries/System.Security.Cryptography/tests/HmacSha3_256Tests.cs index 4967c7207d5e8a..6d769977604715 100644 --- a/src/libraries/System.Security.Cryptography/tests/HmacSha3_256Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/HmacSha3_256Tests.cs @@ -150,7 +150,7 @@ public void HmacSha3_256_EmptyKey() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_256_Stream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha3-256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -162,7 +162,7 @@ public void HmacSha3_256_Stream_MultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_256_Stream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha3-256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -174,7 +174,7 @@ public void HmacSha3_256_Stream_NotMultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_256_Stream_Empty() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha3-256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "", @@ -186,7 +186,7 @@ public void HmacSha3_256_Stream_Empty() [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_256_Stream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha3-256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -198,7 +198,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_256_Stream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha3-256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -210,7 +210,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_256_Stream_Empty_Async() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha3-256 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "", diff --git a/src/libraries/System.Security.Cryptography/tests/HmacSha3_384Tests.cs b/src/libraries/System.Security.Cryptography/tests/HmacSha3_384Tests.cs index a0ed34ed0593fe..e02e1ab6e01034 100644 --- a/src/libraries/System.Security.Cryptography/tests/HmacSha3_384Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/HmacSha3_384Tests.cs @@ -158,7 +158,7 @@ public void HmacSha3_384_EmptyKey() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_384_Stream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha3-384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -170,7 +170,7 @@ public void HmacSha3_384_Stream_MultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_384_Stream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha3-384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -182,7 +182,7 @@ public void HmacSha3_384_Stream_NotMultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_384_Stream_Empty() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha3-384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "", @@ -194,7 +194,7 @@ public void HmacSha3_384_Stream_Empty() [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_384_Stream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha3-384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -206,7 +206,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_384_Stream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha3-384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -218,7 +218,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_384_Stream_Empty_Async() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha3-384 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "", diff --git a/src/libraries/System.Security.Cryptography/tests/HmacSha3_512Tests.cs b/src/libraries/System.Security.Cryptography/tests/HmacSha3_512Tests.cs index 3a0dd0eefcaa22..43971c5a45983d 100644 --- a/src/libraries/System.Security.Cryptography/tests/HmacSha3_512Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/HmacSha3_512Tests.cs @@ -158,7 +158,7 @@ public void HmacSha3_512_EmptyKey() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_512_Stream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha3-512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -171,7 +171,7 @@ public void HmacSha3_512_Stream_MultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_512_Stream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha3-512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -184,7 +184,7 @@ public void HmacSha3_512_Stream_NotMultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void HmacSha3_512_Stream_Empty() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha3-512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "", @@ -197,7 +197,7 @@ public void HmacSha3_512_Stream_Empty() [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_512_Stream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha3-512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -210,7 +210,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_512_Stream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha3-512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -223,7 +223,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task HmacSha3_512_Stream_Empty_Async() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha3-512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "", diff --git a/src/libraries/System.Security.Cryptography/tests/HmacSha512Tests.cs b/src/libraries/System.Security.Cryptography/tests/HmacSha512Tests.cs index 4072300bbc8561..f72fa25d2742ba 100644 --- a/src/libraries/System.Security.Cryptography/tests/HmacSha512Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/HmacSha512Tests.cs @@ -159,7 +159,7 @@ public void HmacSha512_EmptyKey() [Fact] public void HmacSha512_Stream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -171,7 +171,7 @@ public void HmacSha512_Stream_MultipleOf4096() [Fact] public void HmacSha512_Stream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "0102030405060708", @@ -183,7 +183,7 @@ public void HmacSha512_Stream_NotMultipleOf4096() [Fact] public void HmacSha512_Stream_Empty() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F VerifyRepeating( input: "", @@ -195,7 +195,7 @@ public void HmacSha512_Stream_Empty() [Fact] public async Task HmacSha512_Stream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl sha512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -207,7 +207,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacSha512_Stream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl sha512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "0102030405060708", @@ -219,7 +219,7 @@ await VerifyRepeatingAsync( [Fact] public async Task HmacSha512_Stream_Empty_Async() { - // Verfied with: + // Verified with: // echo -n "" | openssl sha512 -hex -mac HMAC -macopt hexkey:000102030405060708090A0B0C0D0E0F await VerifyRepeatingAsync( input: "", diff --git a/src/libraries/System.Security.Cryptography/tests/MD5Tests.cs b/src/libraries/System.Security.Cryptography/tests/MD5Tests.cs index 6e9f4a724fffc1..d6323b8fed6ebe 100644 --- a/src/libraries/System.Security.Cryptography/tests/MD5Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/MD5Tests.cs @@ -46,7 +46,7 @@ protected override ValueTask HashDataAsync(Stream source, CancellationTo [Fact] public void MD5_VerifyLargeStream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -md5 VerifyRepeating("0102030405060708", 1024, "5fc6366852074da6e4795a014574282c"); } @@ -54,7 +54,7 @@ public void MD5_VerifyLargeStream_MultipleOf4096() [Fact] public void MD5_VerifyLargeStream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -md5 VerifyRepeating("0102030405060708", 1025, "c5f6181a24446a583b14282f32786513"); } @@ -62,7 +62,7 @@ public void MD5_VerifyLargeStream_NotMultipleOf4096() [Fact] public async Task MD5_VerifyLargeStream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -md5 await VerifyRepeatingAsync("0102030405060708", 1025, "c5f6181a24446a583b14282f32786513"); } @@ -70,7 +70,7 @@ public async Task MD5_VerifyLargeStream_NotMultipleOf4096_Async() [Fact] public async Task MD5_VerifyLargeStream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -md5 await VerifyRepeatingAsync("0102030405060708", 1024, "5fc6366852074da6e4795a014574282c"); } diff --git a/src/libraries/System.Security.Cryptography/tests/Sha1Tests.cs b/src/libraries/System.Security.Cryptography/tests/Sha1Tests.cs index ede541452f59f2..6b0e393f02d118 100644 --- a/src/libraries/System.Security.Cryptography/tests/Sha1Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/Sha1Tests.cs @@ -66,7 +66,7 @@ public async Task Sha1_Empty_Stream_Async() [Fact] public void Sha1_VerifyLargeStream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha1 VerifyRepeating("0102030405060708", 1024, "fc8053215c935a5e9cdc51b94bb40b3e66128d41"); } @@ -74,7 +74,7 @@ public void Sha1_VerifyLargeStream_MultipleOf4096() [Fact] public void Sha1_VerifyLargeStream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha1 VerifyRepeating("0102030405060708", 1025, "18c6aa8d255c47941958729faaae9614c9793bb2"); } @@ -82,7 +82,7 @@ public void Sha1_VerifyLargeStream_NotMultipleOf4096() [Fact] public async Task Sha1_VerifyLargeStream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha1 await VerifyRepeatingAsync("0102030405060708", 1025, "18c6aa8d255c47941958729faaae9614c9793bb2"); } @@ -90,7 +90,7 @@ public async Task Sha1_VerifyLargeStream_NotMultipleOf4096_Async() [Fact] public async Task Sha1_VerifyLargeStream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha1 await VerifyRepeatingAsync("0102030405060708", 1024, "fc8053215c935a5e9cdc51b94bb40b3e66128d41"); } diff --git a/src/libraries/System.Security.Cryptography/tests/Sha256Tests.cs b/src/libraries/System.Security.Cryptography/tests/Sha256Tests.cs index c19008e5580ccf..b32958c7561c59 100644 --- a/src/libraries/System.Security.Cryptography/tests/Sha256Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/Sha256Tests.cs @@ -68,7 +68,7 @@ public async Task Sha256_Empty_Stream_Async() [Fact] public void Sha256_VerifyLargeStream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha256 VerifyRepeating( "0102030405060708", @@ -79,7 +79,7 @@ public void Sha256_VerifyLargeStream_MultipleOf4096() [Fact] public void Sha256_VerifyLargeStream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha256 VerifyRepeating( "0102030405060708", @@ -90,7 +90,7 @@ public void Sha256_VerifyLargeStream_NotMultipleOf4096() [Fact] public async Task Sha256_VerifyLargeStream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha256 await VerifyRepeatingAsync( "0102030405060708", @@ -101,7 +101,7 @@ await VerifyRepeatingAsync( [Fact] public async Task Sha256_VerifyLargeStream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha256 await VerifyRepeatingAsync( "0102030405060708", diff --git a/src/libraries/System.Security.Cryptography/tests/Sha384Tests.cs b/src/libraries/System.Security.Cryptography/tests/Sha384Tests.cs index 53b557b4219044..e71e9a31e054af 100644 --- a/src/libraries/System.Security.Cryptography/tests/Sha384Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/Sha384Tests.cs @@ -74,7 +74,7 @@ await VerifyRepeatingAsync( [Fact] public void Sha384_VerifyLargeStream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha384 VerifyRepeating( "0102030405060708", @@ -85,7 +85,7 @@ public void Sha384_VerifyLargeStream_MultipleOf4096() [Fact] public void Sha384_VerifyLargeStream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha384 VerifyRepeating( "0102030405060708", @@ -96,7 +96,7 @@ public void Sha384_VerifyLargeStream_NotMultipleOf4096() [Fact] public async Task Sha384_VerifyLargeStream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha384 await VerifyRepeatingAsync( "0102030405060708", @@ -107,7 +107,7 @@ await VerifyRepeatingAsync( [Fact] public async Task Sha384_VerifyLargeStream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha384 await VerifyRepeatingAsync( "0102030405060708", diff --git a/src/libraries/System.Security.Cryptography/tests/Sha3_256Tests.cs b/src/libraries/System.Security.Cryptography/tests/Sha3_256Tests.cs index f5c002d64e4a9a..2e62d6324b6b6c 100644 --- a/src/libraries/System.Security.Cryptography/tests/Sha3_256Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/Sha3_256Tests.cs @@ -67,7 +67,7 @@ public async Task SHA3_256_Empty_Stream_Async() [ConditionalFact(nameof(IsSupported))] public void SHA3_256_VerifyLargeStream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha3-256 VerifyRepeating( "0102030405060708", @@ -78,7 +78,7 @@ public void SHA3_256_VerifyLargeStream_MultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void SHA3_256_VerifyLargeStream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha3-256 VerifyRepeating( "0102030405060708", @@ -89,7 +89,7 @@ public void SHA3_256_VerifyLargeStream_NotMultipleOf4096() [ConditionalFact(nameof(IsSupported))] public async Task SHA3_256_VerifyLargeStream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha3-256 await VerifyRepeatingAsync( "0102030405060708", @@ -100,7 +100,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task SHA3_256_VerifyLargeStream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha3-256 await VerifyRepeatingAsync( "0102030405060708", diff --git a/src/libraries/System.Security.Cryptography/tests/Sha3_384Tests.cs b/src/libraries/System.Security.Cryptography/tests/Sha3_384Tests.cs index 416e6ae1b6cb87..5da321980e8414 100644 --- a/src/libraries/System.Security.Cryptography/tests/Sha3_384Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/Sha3_384Tests.cs @@ -73,7 +73,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public void SHA3_384_VerifyLargeStream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha3-384 VerifyRepeating( "0102030405060708", @@ -84,7 +84,7 @@ public void SHA3_384_VerifyLargeStream_MultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void SHA3_384_VerifyLargeStream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha3-384 VerifyRepeating( "0102030405060708", @@ -95,7 +95,7 @@ public void SHA3_384_VerifyLargeStream_NotMultipleOf4096() [ConditionalFact(nameof(IsSupported))] public async Task SHA3_384_VerifyLargeStream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha3-384 await VerifyRepeatingAsync( "0102030405060708", @@ -106,7 +106,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task SHA3_384_VerifyLargeStream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha3-384 await VerifyRepeatingAsync( "0102030405060708", diff --git a/src/libraries/System.Security.Cryptography/tests/Sha3_512Tests.cs b/src/libraries/System.Security.Cryptography/tests/Sha3_512Tests.cs index 843d87110fc633..54a9a6587de861 100644 --- a/src/libraries/System.Security.Cryptography/tests/Sha3_512Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/Sha3_512Tests.cs @@ -73,7 +73,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public void SHA3_512_VerifyLargeStream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha3-512 VerifyRepeating( "0102030405060708", @@ -84,7 +84,7 @@ public void SHA3_512_VerifyLargeStream_MultipleOf4096() [ConditionalFact(nameof(IsSupported))] public void SHA3_512_VerifyLargeStream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha3-512 VerifyRepeating( "0102030405060708", @@ -95,7 +95,7 @@ public void SHA3_512_VerifyLargeStream_NotMultipleOf4096() [ConditionalFact(nameof(IsSupported))] public async Task SHA3_512_VerifyLargeStream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha3-512 await VerifyRepeatingAsync( "0102030405060708", @@ -106,7 +106,7 @@ await VerifyRepeatingAsync( [ConditionalFact(nameof(IsSupported))] public async Task SHA3_512_VerifyLargeStream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha3-512 await VerifyRepeatingAsync( "0102030405060708", diff --git a/src/libraries/System.Security.Cryptography/tests/Sha512Tests.cs b/src/libraries/System.Security.Cryptography/tests/Sha512Tests.cs index 7abfdb8a546084..9147247362468b 100644 --- a/src/libraries/System.Security.Cryptography/tests/Sha512Tests.cs +++ b/src/libraries/System.Security.Cryptography/tests/Sha512Tests.cs @@ -74,7 +74,7 @@ await VerifyRepeatingAsync( [Fact] public void Sha512_VerifyLargeStream_MultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha512 VerifyRepeating( "0102030405060708", @@ -85,7 +85,7 @@ public void Sha512_VerifyLargeStream_MultipleOf4096() [Fact] public void Sha512_VerifyLargeStream_NotMultipleOf4096() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha512 VerifyRepeating( "0102030405060708", @@ -96,7 +96,7 @@ public void Sha512_VerifyLargeStream_NotMultipleOf4096() [Fact] public async Task Sha512_VerifyLargeStream_NotMultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1025}; do echo -n "0102030405060708"; done | openssl dgst -sha512 await VerifyRepeatingAsync( "0102030405060708", @@ -107,7 +107,7 @@ await VerifyRepeatingAsync( [Fact] public async Task Sha512_VerifyLargeStream_MultipleOf4096_Async() { - // Verfied with: + // Verified with: // for _ in {1..1024}; do echo -n "0102030405060708"; done | openssl dgst -sha512 await VerifyRepeatingAsync( "0102030405060708", diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index 2e57616b173607..24e83e50107de6 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -12,7 +12,7 @@ - + diff --git a/src/mono/browser/debugger/DebuggerTestSuite/CustomViewTests.cs b/src/mono/browser/debugger/DebuggerTestSuite/CustomViewTests.cs index 775fdd9ec8694e..0024d46dad4e60 100644 --- a/src/mono/browser/debugger/DebuggerTestSuite/CustomViewTests.cs +++ b/src/mono/browser/debugger/DebuggerTestSuite/CustomViewTests.cs @@ -112,32 +112,32 @@ async Task CheckProperties(JObject pause_location) } [ConditionalFact(nameof(RunningOnChrome))] - public async Task InspectObjectOfTypeWithToStringOverriden() + public async Task InspectObjectOfTypeWithToStringOverridden() { - var expression = $"{{ invoke_static_method('[debugger-test] ToStringOverriden:Run'); }}"; + var expression = $"{{ invoke_static_method('[debugger-test] ToStringOverridden:Run'); }}"; await EvaluateAndCheck( "window.setTimeout(function() {" + expression + "; }, 1);", "dotnet://debugger-test.dll/debugger-test.cs", 1561, 8, - "ToStringOverriden.Run", + "ToStringOverridden.Run", wait_for_event_fn: async (pause_location) => { var id = pause_location["callFrames"][0]["callFrameId"].Value(); await EvaluateOnCallFrameAndCheck(id, - ("a", TObject("ToStringOverriden", description:"helloToStringOverriden")), - ("b", TObject("ToStringOverriden.ToStringOverridenB", description:"helloToStringOverridenA")), - ("c", TObject("ToStringOverriden.ToStringOverridenD", description:"helloToStringOverridenD")), - ("d", TObject("ToStringOverriden.ToStringOverridenE", description:"helloToStringOverridenE")), - ("e", TObject("ToStringOverriden.ToStringOverridenB", description:"helloToStringOverridenA")), - ("f", TObject("ToStringOverriden.ToStringOverridenB", description:"helloToStringOverridenA")), - ("g", TObject("ToStringOverriden.ToStringOverridenG", description:"helloToStringOverridenG")), - ("h", TObject("ToStringOverriden.ToStringOverridenH", description:"helloToStringOverridenH")), - ("i", TObject("ToStringOverriden.ToStringOverridenI", description:"ToStringOverriden.ToStringOverridenI")), - ("j", TObject("ToStringOverriden.ToStringOverridenJ", description:"helloToStringOverridenJ")), - ("k", TObject("ToStringOverriden.ToStringOverridenK", description:"ToStringOverriden.ToStringOverridenK")), - ("l", TObject("ToStringOverriden.ToStringOverridenL", description:"helloToStringOverridenL")), - ("m", TObject("ToStringOverriden.ToStringOverridenM", description:"ToStringOverridenM { }")), - ("n", TObject("ToStringOverriden.ToStringOverridenN", description:"helloToStringOverridenN")) + ("a", TObject("ToStringOverridden", description:"helloToStringOverridden")), + ("b", TObject("ToStringOverridden.ToStringOverriddenB", description:"helloToStringOverriddenA")), + ("c", TObject("ToStringOverridden.ToStringOverriddenD", description:"helloToStringOverriddenD")), + ("d", TObject("ToStringOverridden.ToStringOverriddenE", description:"helloToStringOverriddenE")), + ("e", TObject("ToStringOverridden.ToStringOverriddenB", description:"helloToStringOverriddenA")), + ("f", TObject("ToStringOverridden.ToStringOverriddenB", description:"helloToStringOverriddenA")), + ("g", TObject("ToStringOverridden.ToStringOverriddenG", description:"helloToStringOverriddenG")), + ("h", TObject("ToStringOverridden.ToStringOverriddenH", description:"helloToStringOverriddenH")), + ("i", TObject("ToStringOverridden.ToStringOverriddenI", description:"ToStringOverridden.ToStringOverriddenI")), + ("j", TObject("ToStringOverridden.ToStringOverriddenJ", description:"helloToStringOverriddenJ")), + ("k", TObject("ToStringOverridden.ToStringOverriddenK", description:"ToStringOverridden.ToStringOverriddenK")), + ("l", TObject("ToStringOverridden.ToStringOverriddenL", description:"helloToStringOverriddenL")), + ("m", TObject("ToStringOverridden.ToStringOverriddenM", description:"ToStringOverriddenM { }")), + ("n", TObject("ToStringOverridden.ToStringOverriddenN", description:"helloToStringOverriddenN")) ); } ); diff --git a/src/mono/browser/debugger/DebuggerTestSuite/EvaluateOnCallFrame2Tests.cs b/src/mono/browser/debugger/DebuggerTestSuite/EvaluateOnCallFrame2Tests.cs index 43806f2076da7f..44e9f90d95380e 100644 --- a/src/mono/browser/debugger/DebuggerTestSuite/EvaluateOnCallFrame2Tests.cs +++ b/src/mono/browser/debugger/DebuggerTestSuite/EvaluateOnCallFrame2Tests.cs @@ -736,7 +736,7 @@ public async Task EvaluateSumBetweenObjectAndString() => await CheckInspectLocal await EvaluateOnCallFrameAndCheck(id, ("myList+\"asd\"", TString("System.Collections.Generic.List`1[System.Int32]asd")), ("dt+\"asd\"", TString("1/1/0001 12:00:00 AMasd")), - ("myClass+\"asd\"", TString("OverridenToStringasd")), + ("myClass+\"asd\"", TString("OverriddenToStringasd")), ("listNull+\"asd\"", TString("asd")) ); await CheckEvaluateFail(id, diff --git a/src/mono/browser/debugger/tests/debugger-test/debugger-evaluate-test.cs b/src/mono/browser/debugger/tests/debugger-test/debugger-evaluate-test.cs index c6a5945e51fd1d..50fb3d0a860f19 100644 --- a/src/mono/browser/debugger/tests/debugger-test/debugger-evaluate-test.cs +++ b/src/mono/browser/debugger/tests/debugger-test/debugger-evaluate-test.cs @@ -2230,7 +2230,7 @@ public class MyClass { public override string ToString() { - return "OverridenToString"; + return "OverriddenToString"; } } public static void run() diff --git a/src/mono/browser/debugger/tests/debugger-test/debugger-test.cs b/src/mono/browser/debugger/tests/debugger-test/debugger-test.cs index f4132f82c4a820..a0a0cc0aa2827a 100644 --- a/src/mono/browser/debugger/tests/debugger-test/debugger-test.cs +++ b/src/mono/browser/debugger/tests/debugger-test/debugger-test.cs @@ -1429,136 +1429,136 @@ public static void CheckArguments(ReadOnlySpan parameters) } } -public class ToStringOverriden +public class ToStringOverridden { - class ToStringOverridenA { + class ToStringOverriddenA { public override string ToString() { - return "helloToStringOverridenA"; + return "helloToStringOverriddenA"; } } - class ToStringOverridenB: ToStringOverridenA {} + class ToStringOverriddenB: ToStringOverriddenA {} - class ToStringOverridenC {} - class ToStringOverridenD: ToStringOverridenC + class ToStringOverriddenC {} + class ToStringOverriddenD: ToStringOverriddenC { public override string ToString() { - return "helloToStringOverridenD"; + return "helloToStringOverriddenD"; } } - struct ToStringOverridenE + struct ToStringOverriddenE { public override string ToString() { - return "helloToStringOverridenE"; + return "helloToStringOverriddenE"; } } - class ToStringOverridenF + class ToStringOverriddenF { public override string ToString() { - return "helloToStringOverridenF"; + return "helloToStringOverriddenF"; } } - class ToStringOverridenG: ToStringOverridenF + class ToStringOverriddenG: ToStringOverriddenF { public override string ToString() { - return "helloToStringOverridenG"; + return "helloToStringOverriddenG"; } } - class ToStringOverridenH + class ToStringOverriddenH { public override string ToString() { - return "helloToStringOverridenH"; + return "helloToStringOverriddenH"; } public string ToString(bool withParms = true) { - return "helloToStringOverridenHWrong"; + return "helloToStringOverriddenHWrong"; } } - class ToStringOverridenI + class ToStringOverriddenI { public string ToString(bool withParms = true) { - return "helloToStringOverridenIWrong"; + return "helloToStringOverriddenIWrong"; } } - struct ToStringOverridenJ + struct ToStringOverriddenJ { public override string ToString() { - return "helloToStringOverridenJ"; + return "helloToStringOverriddenJ"; } public string ToString(bool withParms = true) { - return "helloToStringOverridenJWrong"; + return "helloToStringOverriddenJWrong"; } } - struct ToStringOverridenK + struct ToStringOverriddenK { public string ToString(bool withParms = true) { - return "helloToStringOverridenKWrong"; + return "helloToStringOverriddenKWrong"; } } - record ToStringOverridenL + record ToStringOverriddenL { public override string ToString() { - return "helloToStringOverridenL"; + return "helloToStringOverriddenL"; } } - record ToStringOverridenM + record ToStringOverriddenM { public string ToString(bool withParms = true) { - return "helloToStringOverridenMWrong"; + return "helloToStringOverriddenMWrong"; } } - record ToStringOverridenN + record ToStringOverriddenN { public override string ToString() { - return "helloToStringOverridenN"; + return "helloToStringOverriddenN"; } public string ToString(bool withParms = true) { - return "helloToStringOverridenNWrong"; + return "helloToStringOverriddenNWrong"; } } public override string ToString() { - return "helloToStringOverriden"; + return "helloToStringOverridden"; } public static void Run() { - var a = new ToStringOverriden(); - var b = new ToStringOverridenB(); - var c = new ToStringOverridenD(); - var d = new ToStringOverridenE(); - ToStringOverridenA e = new ToStringOverridenB(); - object f = new ToStringOverridenB(); - var g = new ToStringOverridenG(); - var h = new ToStringOverridenH(); - var i = new ToStringOverridenI(); - var j = new ToStringOverridenJ(); - var k = new ToStringOverridenK(); - var l = new ToStringOverridenL(); - var m = new ToStringOverridenM(); - var n = new ToStringOverridenN(); + var a = new ToStringOverridden(); + var b = new ToStringOverriddenB(); + var c = new ToStringOverriddenD(); + var d = new ToStringOverriddenE(); + ToStringOverriddenA e = new ToStringOverriddenB(); + object f = new ToStringOverriddenB(); + var g = new ToStringOverriddenG(); + var h = new ToStringOverriddenH(); + var i = new ToStringOverriddenI(); + var j = new ToStringOverriddenJ(); + var k = new ToStringOverriddenK(); + var l = new ToStringOverriddenL(); + var m = new ToStringOverriddenM(); + var n = new ToStringOverriddenN(); System.Diagnostics.Debugger.Break(); } } diff --git a/src/mono/mono/metadata/class-setup-vtable.c b/src/mono/mono/metadata/class-setup-vtable.c index b2f13d72dfc47c..3828a5e7cf577b 100644 --- a/src/mono/mono/metadata/class-setup-vtable.c +++ b/src/mono/mono/metadata/class-setup-vtable.c @@ -1925,7 +1925,7 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o if ((vtable [im_slot] == NULL) && klass->parent != NULL) { // For covariant returns we might need to lookup matching virtual methods in parent types - // that were overriden with a method that doesn't exactly match interface method signature. + // that were overridden with a method that doesn't exactly match interface method signature. gboolean found = FALSE; for (MonoClass *parent_klass = klass->parent; parent_klass != NULL && !found; parent_klass = parent_klass->parent) { gpointer iter = NULL; @@ -1936,10 +1936,10 @@ mono_class_setup_vtable_general (MonoClass *klass, MonoMethod **overrides, int o found = TRUE; if (vtable [cm->slot]) { // We match the current method was overriding it. If this method will - // get overriden again, the interface slot will also be updated + // get overridden again, the interface slot will also be updated vtable [im_slot] = vtable [cm->slot]; } else { - // We add abstract method in the vtable. This method will be overriden + // We add abstract method in the vtable. This method will be overridden // with the actual implementation once we resolve the abstract method later. // FIXME If klass is abstract, we can end up with abstract method in the vtable. Is this a problem ? vtable [im_slot] = cm; diff --git a/src/mono/mono/mini/interp/transform.c b/src/mono/mono/mini/interp/transform.c index 22c5518a82c041..d9efd0ddd29d82 100644 --- a/src/mono/mono/mini/interp/transform.c +++ b/src/mono/mono/mini/interp/transform.c @@ -3364,7 +3364,7 @@ interp_try_devirt (MonoClass *this_klass, MonoMethod *target_method) if (m_class_is_valuetype (new_target_method->klass)) return NULL; - // final methods can still be overriden with explicit overrides + // final methods can still be overridden with explicit overrides if (m_class_is_sealed (this_klass)) return new_target_method; diff --git a/src/tools/illink/src/ILLink.RoslynAnalyzer/ISymbolExtensions.cs b/src/tools/illink/src/ILLink.RoslynAnalyzer/ISymbolExtensions.cs index f5ff0e8a8fe549..b00811f4fc500e 100644 --- a/src/tools/illink/src/ILLink.RoslynAnalyzer/ISymbolExtensions.cs +++ b/src/tools/illink/src/ILLink.RoslynAnalyzer/ISymbolExtensions.cs @@ -103,15 +103,15 @@ internal static bool TryGetReturnAttribute (this IMethodSymbol member, string at internal static DynamicallyAccessedMemberTypes GetDynamicallyAccessedMemberTypesOnAssociatedSymbol (this IMethodSymbol methodSymbol) => methodSymbol.AssociatedSymbol is ISymbol associatedSymbol ? GetDynamicallyAccessedMemberTypes (associatedSymbol) : DynamicallyAccessedMemberTypes.None; - internal static bool TryGetOverriddenMember (this ISymbol? symbol, [NotNullWhen (returnValue: true)] out ISymbol? overridenMember) + internal static bool TryGetOverriddenMember (this ISymbol? symbol, [NotNullWhen (returnValue: true)] out ISymbol? overriddenMember) { - overridenMember = symbol switch { + overriddenMember = symbol switch { IMethodSymbol method => method.OverriddenMethod, IPropertySymbol property => property.OverriddenProperty, IEventSymbol @event => @event.OverriddenEvent, _ => null, }; - return overridenMember != null; + return overriddenMember != null; } public static SymbolDisplayFormat ILLinkTypeDisplayFormat { get; } = diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/Generics/CorrectOverloadedMethodGetsStrippedInGenericClass.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/Generics/CorrectOverloadedMethodGetsStrippedInGenericClass.cs index e673b3f75b9277..c4e3fe74b1c1f6 100644 --- a/src/tools/illink/test/Mono.Linker.Tests.Cases/Generics/CorrectOverloadedMethodGetsStrippedInGenericClass.cs +++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/Generics/CorrectOverloadedMethodGetsStrippedInGenericClass.cs @@ -19,7 +19,7 @@ public abstract class GenericClassWithTwoOverloadedAbstractMethods public abstract string OverloadedMethod (T thing); // Don't call this one, it should be stripped [Kept] - public abstract string OverloadedMethod (int thing); // Call to this should preserve the overriden one + public abstract string OverloadedMethod (int thing); // Call to this should preserve the overridden one } [KeptMember (".ctor()")]