diff options
| author | Sven Boemer <sbomer@gmail.com> | 2022-01-15 01:47:32 +0300 |
|---|---|---|
| committer | Sven Boemer <sbomer@gmail.com> | 2022-01-15 01:47:32 +0300 |
| commit | 2ed68104b3ea87ae269d9651842305cead762946 (patch) | |
| tree | a2a72a6d00a0aa4de3fa2514991b80b1b1d9583c /test/Mono.Linker.Tests.Cases | |
| parent | 42747fb16cd90f5c7200742a34cd6f8b989fde20 (diff) | |
Fix some left-over merge conflicts
Diffstat (limited to 'test/Mono.Linker.Tests.Cases')
| -rw-r--r-- | test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs b/test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs index fb9a690de..47986d734 100644 --- a/test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs +++ b/test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresCapability.cs @@ -1247,7 +1247,7 @@ namespace Mono.Linker.Tests.Cases.RequiresCapability [ExpectedWarning ("IL2046", "ExplicitImplementationClassWithRequires.Mono.Linker.Tests.Cases.RequiresCapability.RequiresCapability.AttributeMismatch.IBaseWithoutRequires.Method()", "IBaseWithoutRequires.Method()", ProducedBy = ProducedBy.Trimmer)] [ExpectedWarning ("IL2046", "ExplicitImplementationClassWithRequires.IBaseWithoutRequires.Method()", "IBaseWithoutRequires.Method()", ProducedBy = ProducedBy.Analyzer)] [ExpectedWarning ("IL3003", "ExplicitImplementationClassWithRequires.IBaseWithoutRequires.Method()", "IBaseWithoutRequires.Method()", ProducedBy = ProducedBy.Analyzer)] - [ExpectedWarning ("IL3051", "ExplicitImplementationClassWithRequires.IBaseWithoutRequires.Method()", "IBaseWithoutRequires.Method()", ProducedBy = ProducedBy.Analyzer)] + [ExpectedWarning ("IL3051", "IBaseWithoutRequires.Method()", "ExplicitImplementationClassWithRequires.IBaseWithoutRequires.Method()", ProducedBy = ProducedBy.Analyzer)] void IBaseWithoutRequires.Method () { } |