Rebased from main to Release/6.0.2xx and fixed issues with rebase

2 files changed, 3 insertions, 2 deletions

diff --git a/src/ILLink.RoslynAnalyzer/RequiresAnalyzerBase.cs b/src/ILLink.RoslynAnalyzer/RequiresAnalyzerBase.cs
index a49ceb439..312e9bcdc 100644
--- a/src/ILLink.RoslynAnalyzer/RequiresAnalyzerBase.cs
+++ b/src/ILLink.RoslynAnalyzer/RequiresAnalyzerBase.cs
@@ -337,8 +337,8 @@ namespace ILLink.RoslynAnalyzer
 
 		private bool HasMismatchingAttributes (ISymbol member1, ISymbol member2)
 		{
-			bool member1HasAttribute = IsOverrideMemberInRequiresScope (member1);
-			bool member2HasAttribute = IsOverrideMemberInRequiresScope (member2);
+			bool member1HasAttribute = member1.IsOverrideInRequiresScope (RequiresAttributeName);
+			bool member2HasAttribute = member2.IsOverrideInRequiresScope (RequiresAttributeName);
 			return member1HasAttribute ^ member2HasAttribute;
 		}
 
diff --git a/src/ILLink.RoslynAnalyzer/RequiresISymbolExtensions.cs b/src/ILLink.RoslynAnalyzer/RequiresISymbolExtensions.cs
index e08359149..f4ae7a3e7 100644
--- a/src/ILLink.RoslynAnalyzer/RequiresISymbolExtensions.cs
+++ b/src/ILLink.RoslynAnalyzer/RequiresISymbolExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Microsoft.CodeAnalysis;