CA1311 various fixes

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/MicrosoftNetCoreAnalyzersResources.resx

@@ -1877,7 +1877,7 @@
     <value>Specify current culture</value>
   </data>
   <data name="UseInvariantVersion" xml:space="preserve">
-    <value>User an invariant version</value>
+    <value>Use an invariant version</value>
   </data>
   <data name="FeatureUnsupportedWhenRuntimeMarshallingDisabledDescription" xml:space="preserve">
     <value>Using features that require runtime marshalling when runtime marshalling is disabled will result in runtime exceptions.</value>

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.cs.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Uživatel s neutrální verzí</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Uživatel s neutrální verzí</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.de.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Verwenden Sie eine unveränderliche Version</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Verwenden Sie eine unveränderliche Version</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.es.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Usuario de una versión invariable</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Usuario de una versión invariable</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.fr.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Utilisateur avec une version invariante</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Utilisateur avec une version invariante</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.it.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Utente di una versione invariante</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Utente di una versione invariante</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.ja.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">インバリアント バージョンを使用する</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">インバリアント バージョンを使用する</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.ko.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">사용자 불변 버전</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">사용자 불변 버전</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.pl.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Użyj niezmiennej wersji</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Użyj niezmiennej wersji</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.pt-BR.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Usar uma versão invariável</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Usar uma versão invariável</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.ru.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Использование инвариантной версии</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Использование инвариантной версии</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.tr.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">Sabit bir sürüm kullanın</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">Sabit bir sürüm kullanın</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.zh-Hans.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">用户固定版本</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">用户固定版本</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.zh-Hant.xlf

@@ -2753,8 +2753,8 @@
         <note />
       </trans-unit>
       <trans-unit id="UseInvariantVersion">
-        <source>User an invariant version</source>
-        <target state="translated">使用者固定版本</target>
+        <source>Use an invariant version</source>
+        <target state="needs-review-translation">使用者固定版本</target>
         <note />
       </trans-unit>
       <trans-unit id="UseManagedEquivalentsOfWin32ApiDescription">

src/NetAnalyzers/UnitTests/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureForToLowerAndToUpperTests.Fixer.cs

@@ -124,6 +124,42 @@ End Class
             }.RunAsync();
         }
 
+        [Fact]
+        public async Task CA1311_FixToLowerBasicAsync_SpecifyCurrentCulture_MemberAccessSyntax()
+        {
+            var source = @"
+Imports System.Globalization
+Class C
+    Sub M()
+        Dim a = ""test""
+        a.[|ToLower|]
+        a?.[|ToLower|]
+        Dim b = a.[|ToLower|]
+        Dim c = a?.[|ToLower|]
+    End Sub
+End Class
+";
+
+            var fixedSource = @"
+Imports System.Globalization
+Class C
+    Sub M()
+        Dim a = ""test""
+        a.ToLower(CultureInfo.CurrentCulture)
+        a?.ToLower(CultureInfo.CurrentCulture)
+        Dim b = a.ToLower(CultureInfo.CurrentCulture)
+        Dim c = a?.ToLower(CultureInfo.CurrentCulture)
+    End Sub
+End Class
+";
+            await new VerifyVB.Test
+            {
+                TestState = { Sources = { source } },
+                FixedState = { Sources = { fixedSource } },
+                CodeActionIndex = 0,
+                CodeActionEquivalenceKey = nameof(MicrosoftNetCoreAnalyzersResources.SpecifyCurrentCulture),
+            }.RunAsync();
+        }
 
         [Fact]
         public async Task CA1311_FixToLowerBasicAsync_UseInvariantVersion()
@@ -157,6 +193,42 @@ End Class
             }.RunAsync();
         }
 
+        [Fact]
+        public async Task CA1311_FixToLowerBasicAsync_UseInvariantVersion_MemberAccessSyntax()
+        {
+            const string source = @"
+Class C
+    Sub M()
+        Dim a = ""test""
+        a.[|ToLower|]
+        a?.[|ToLower|]
+        Dim b = a.[|ToLower|]
+        Dim c = a?.[|ToLower|]
+    End Sub
+End Class
+";
+
+            const string fixedSource = @"
+Class C
+    Sub M()
+        Dim a = ""test""
+        a.ToLowerInvariant
+        a?.ToLowerInvariant
+        Dim b = a.ToLowerInvariant
+        Dim c = a?.ToLowerInvariant
+    End Sub
+End Class
+";
+
+            await new VerifyVB.Test
+            {
+                TestState = { Sources = { source } },
+                FixedState = { Sources = { fixedSource } },
+                CodeActionIndex = 1,
+                CodeActionEquivalenceKey = nameof(MicrosoftNetCoreAnalyzersResources.UseInvariantVersion),
+            }.RunAsync();
+        }
+
         [Fact]
         public async Task CA1311_FixToUpperCSharpAsync_SpecifyCurrentCulture()
         {
@@ -268,6 +340,42 @@ End Class
             }.RunAsync();
         }
 
+        [Fact]
+        public async Task CA1311_FixToUpperBasicAsync_SpecifyCurrentCulture_MemberAccessSyntax()
+        {
+            var source = @"
+Imports System.Globalization
+Class C
+    Sub M()
+        Dim a = ""test""
+        a.[|ToUpper|]
+        a?.[|ToUpper|]
+        Dim b = a.[|ToUpper|]
+        Dim c = a?.[|ToUpper|]
+    End Sub
+End Class
+";
+
+            var fixedSource = @"
+Imports System.Globalization
+Class C
+    Sub M()
+        Dim a = ""test""
+        a.ToUpper(CultureInfo.CurrentCulture)
+        a?.ToUpper(CultureInfo.CurrentCulture)
+        Dim b = a.ToUpper(CultureInfo.CurrentCulture)
+        Dim c = a?.ToUpper(CultureInfo.CurrentCulture)
+    End Sub
+End Class
+";
+            await new VerifyVB.Test
+            {
+                TestState = { Sources = { source } },
+                FixedState = { Sources = { fixedSource } },
+                CodeActionIndex = 0,
+                CodeActionEquivalenceKey = nameof(MicrosoftNetCoreAnalyzersResources.SpecifyCurrentCulture),
+            }.RunAsync();
+        }
 
         [Fact]
         public async Task CA1311_FixToUpperBasicAsync_UseInvariantVersion()
@@ -290,6 +398,42 @@ Sub M()
         a?.ToUpperInvariant()
     End Sub
 End Class
+";
+
+            await new VerifyVB.Test
+            {
+                TestState = { Sources = { source } },
+                FixedState = { Sources = { fixedSource } },
+                CodeActionIndex = 1,
+                CodeActionEquivalenceKey = nameof(MicrosoftNetCoreAnalyzersResources.UseInvariantVersion),
+            }.RunAsync();
+        }
+
+        [Fact]
+        public async Task CA1311_FixToUpperBasicAsync_UseInvariantVersion_MemberAccessSyntax()
+        {
+            const string source = @"
+Class C
+    Sub M()
+        Dim a = ""test""
+        a.[|ToUpper|]
+        a?.[|ToUpper|]
+        Dim b = a.[|ToUpper|]
+        Dim c = a?.[|ToUpper|]
+    End Sub
+End Class
+";
+
+            const string fixedSource = @"
+Class C
+    Sub M()
+        Dim a = ""test""
+        a.ToUpperInvariant
+        a?.ToUpperInvariant
+        Dim b = a.ToUpperInvariant
+        Dim c = a?.ToUpperInvariant
+    End Sub
+End Class
 ";
 
             await new VerifyVB.Test

src/NetAnalyzers/VisualBasic/Microsoft.NetCore.Analyzers/Runtime/BasicSpecifyCultureForToLowerAndToUpper.Fixer.vb

@@ -21,25 +21,41 @@ Namespace Microsoft.NetCore.VisualBasic.Analyzers.Runtime
         End Function
 
         Protected Overrides Async Function SpecifyCurrentCultureAsync(document As Document, generator As SyntaxGenerator, root As SyntaxNode, node As SyntaxNode, cancellationToken As CancellationToken) As Task(Of Document)
-            If node.IsKind(SyntaxKind.IdentifierName) Then
-                Dim invocation = node.Parent?.FirstAncestorOrSelf(Of InvocationExpressionSyntax)
-                If invocation IsNot Nothing Then
-                    Dim model = Await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(False)
-                    Dim symbolInfo = model.GetSymbolInfo(node, cancellationToken).Symbol
-                    Dim methodSymbol = TryCast(symbolInfo, IMethodSymbol)
-
-                    If methodSymbol IsNot Nothing And methodSymbol.Parameters.Length = 0 Then
-                        Dim newArg = generator.Argument(CreateCurrentCultureMemberAccess(generator, model)).WithAdditionalAnnotations(Formatter.Annotation)
-                        Dim newInvocation = invocation.AddArgumentListArguments(DirectCast(newArg, ArgumentSyntax)).WithAdditionalAnnotations(Formatter.Annotation)
-                        Dim newRoot = root.ReplaceNode(invocation, newInvocation)
-                        Return document.WithSyntaxRoot(newRoot)
-                    End If
+            If ShouldFix(node) Then
+                Dim memberAccess = DirectCast(node.Parent, MemberAccessExpressionSyntax)
+
+                If memberAccess.Parent Is Nothing Or Not memberAccess.Parent.IsKind(SyntaxKind.InvocationExpression) Then
+                    Return Await SpecifyCurrentCultureWhenTheresNoArgumentListAsync(document, generator, root, memberAccess, memberAccess, cancellationToken)
+                End If
+
+                Dim invocation = DirectCast(memberAccess.Parent, InvocationExpressionSyntax)
+                If invocation.ArgumentList Is Nothing Then
+                    Return Await SpecifyCurrentCultureWhenTheresNoArgumentListAsync(document, generator, root, memberAccess, invocation, cancellationToken)
+                End If
+
+                Dim model = Await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(False)
+                Dim symbolInfo = model.GetSymbolInfo(node, cancellationToken).Symbol
+                Dim methodSymbol = TryCast(symbolInfo, IMethodSymbol)
+
+                If methodSymbol IsNot Nothing And methodSymbol.Parameters.Length = 0 Then
+                    Dim newArg = generator.Argument(CreateCurrentCultureMemberAccess(generator, model)).WithAdditionalAnnotations(Formatter.Annotation)
+                    Dim newInvocation = invocation.AddArgumentListArguments(DirectCast(newArg, ArgumentSyntax)).WithAdditionalAnnotations(Formatter.Annotation)
+                    Dim newRoot = root.ReplaceNode(invocation, newInvocation)
+                    Return document.WithSyntaxRoot(newRoot)
                 End If
             End If
 
             Return document
         End Function
 
+        Private Async Function SpecifyCurrentCultureWhenTheresNoArgumentListAsync(document As Document, generator As SyntaxGenerator, root As SyntaxNode, memberAccess As MemberAccessExpressionSyntax, nodeToReplace As SyntaxNode, cancellationToken As CancellationToken) As Task(Of Document)
+            Dim model = Await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(False)
+            Dim newArg = generator.Argument(CreateCurrentCultureMemberAccess(generator, model)).WithAdditionalAnnotations(Formatter.Annotation)
+            Dim invocation = generator.InvocationExpression(memberAccess.WithoutTrailingTrivia(), newArg).WithAdditionalAnnotations(Formatter.Annotation)
+            Dim newRoot = root.ReplaceNode(nodeToReplace, invocation)
+            Return document.WithSyntaxRoot(newRoot)
+        End Function
+
         Protected Overrides Function UseInvariantVersionAsync(document As Document, generator As SyntaxGenerator, root As SyntaxNode, node As SyntaxNode) As Task(Of Document)
             If ShouldFix(node) Then
                 Dim memberAccess = DirectCast(node.Parent, MemberAccessExpressionSyntax)