Merge pull request #6192 from yaakov-h/yaakov/ca2101-bestfitmapping

Fix CA2101 triggering when BestFitMapping=false
dotnet · Oct 2, 2022 · 7916ed7 · 7916ed7
2 parents e63ca39 + 049eddb
commit 7916ed7
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/...etAnalyzers/Core/Microsoft.NetCore.Analyzers/InteropServices/PInvokeDiagnosticAnalyzer.cs b/...etAnalyzers/Core/Microsoft.NetCore.Analyzers/InteropServices/PInvokeDiagnosticAnalyzer.cs
@@ -121,7 +121,7 @@ public void AnalyzeSymbol(SymbolAnalysisContext context)
                 }
 
                 // CA2101 - Specify marshalling for PInvoke string arguments
-                if (dllImportData.BestFitMapping != false ||
+                if (dllImportData.BestFitMapping != false &&
                     context.Options.GetMSBuildPropertyValue(MSBuildPropertyOptionNames.InvariantGlobalization, context.Compilation) is not "true")
                 {
                     bool appliedCA2101ToMethod = false;

diff --git a/...s/UnitTests/Microsoft.NetCore.Analyzers/InteropServices/PInvokeDiagnosticAnalyzerTests.cs b/...s/UnitTests/Microsoft.NetCore.Analyzers/InteropServices/PInvokeDiagnosticAnalyzerTests.cs
@@ -640,6 +640,43 @@ End Class
                 BasicResult2101(22, 30));
         }
 
+        [Fact]
+        public async Task CA2101WithoutBestFitMappingCSharpTestAsync()
+        {
+            await VerifyCS.VerifyAnalyzerAsync(@"
+using System.Runtime.InteropServices;
+using System.Text;
+
+class C
+{
+
+    [DllImport(""user32.dll"", BestFitMapping = false)]
+    private static extern void Method1(string s);
+
+    [DllImport(""user32.dll"", CharSet = CharSet.Ansi, BestFitMapping = false)]
+    private static extern void Method2(string s);
+
+    [DllImport(""user32.dll"", BestFitMapping = false)]
+    private static extern void Method3(StringBuilder s);
+
+    [DllImport(""user32.dll"", CharSet = CharSet.Ansi, BestFitMapping = false)]
+    private static extern void Method4(StringBuilder s);
+
+    [DllImport(""user32.dll"", BestFitMapping = false)]
+    private static extern string Method5();
+
+    [DllImport(""user32.dll"", BestFitMapping = false)]
+    private static extern StringBuilder Method6();
+
+    [DllImport(""user32.dll"", CharSet = CharSet.Ansi, BestFitMapping = false)]
+    private static extern string Method7();
+
+    [DllImport(""user32.dll"", CharSet = CharSet.Ansi, BestFitMapping = false)]
+    private static extern StringBuilder Method8();
+}
+");
+        }
+
         #endregion
     }
 }