diff options
| author | Jackson Schuster <jschuster@microsoft.com> | 2021-12-10 02:07:10 +0300 |
|---|---|---|
| committer | Jackson Schuster <jschuster@microsoft.com> | 2021-12-10 02:07:10 +0300 |
| commit | fd8aa603ec738bbf953167543430bc017986530a (patch) | |
| tree | 4a5a765384d0ffad4ef372fc36a4d983461cbd09 | |
| parent | 012f3c0773c498c8601eb9af806aba1267b40342 (diff) | |
Rebased from main to Release/6.0.2xx and fixed issues with rebase
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/ILLink.RoslynAnalyzer/RequiresAnalyzerBase.cs | 4 | ||||
| -rw-r--r-- | src/ILLink.RoslynAnalyzer/RequiresISymbolExtensions.cs | 1 | ||||
| -rw-r--r-- | test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 414ad0275..0bbf8367c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ *.user *.userprefs .vs/ +.vscode/ .idea/ packages/ @@ -35,5 +36,7 @@ bin/ .packages artifacts *.binlog +# Emacs / vim backup files +*~ test/Mono.Linker.Tests/TestResults.xml 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; diff --git a/test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs b/test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs index 0904bb4e4..c78418ae7 100644 --- a/test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs +++ b/test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs @@ -1013,7 +1013,6 @@ namespace Mono.Linker.Tests.Cases.RequiresCapability { [ExpectedWarning ("IL2046", "DerivedClassWithAllWarnings.VirtualMethod()", "BaseClassWithRequires.VirtualMethod()")] [ExpectedWarning ("IL3003", "DerivedClassWithAllWarnings.VirtualMethod()", "BaseClassWithRequires.VirtualMethod()", ProducedBy = ProducedBy.Analyzer)] - [ExpectedWarning ("IL3051", "DerivedClassWithAllWarnings.VirtualMethod()", "BaseClassWithRequires.VirtualMethod()", ProducedBy = ProducedBy.Analyzer)] public override void VirtualMethod () { } @@ -1025,7 +1024,6 @@ namespace Mono.Linker.Tests.Cases.RequiresCapability public override string VirtualPropertyAnnotationInAccesor { [ExpectedWarning ("IL2046", "DerivedClassWithAllWarnings.VirtualPropertyAnnotationInAccesor.get", "BaseClassWithRequires.VirtualPropertyAnnotationInAccesor.get")] [ExpectedWarning ("IL3003", "DerivedClassWithAllWarnings.VirtualPropertyAnnotationInAccesor.get", "BaseClassWithRequires.VirtualPropertyAnnotationInAccesor.get", ProducedBy = ProducedBy.Analyzer)] - [ExpectedWarning ("IL3051", "DerivedClassWithAllWarnings.VirtualPropertyAnnotationInAccesor.get", "BaseClassWithRequires.VirtualPropertyAnnotationInAccesor.get", ProducedBy = ProducedBy.Analyzer)] get { return name; } [RequiresAssemblyFiles ("Message")] [RequiresUnreferencedCode("Message")] |