Bump StyleCop analyzers version

eng/Versions.props

@@ -23,6 +23,6 @@
     <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
     <RoslynPublicApiAnalyzersVersion>3.3.4</RoslynPublicApiAnalyzersVersion>
     <StrongNamerVersion>0.2.5</StrongNamerVersion>
-    <StyleCopAnalyzersVersion>1.2.0-beta.435</StyleCopAnalyzersVersion>
+    <StyleCopAnalyzersVersion>1.2.0-beta.507</StyleCopAnalyzersVersion>
   </PropertyGroup>
 </Project>

samples/FxExtensibility/AssertEx.cs

@@ -4,6 +4,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace MSTest.Extensibility.Samples;
+
 public static class AssertEx
 {
     private static AssertIs s_assertIs;

src/Adapter/MSTest.TestAdapter/Discovery/UnitTestDiscoverer.cs

@@ -11,6 +11,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
+
 internal class UnitTestDiscoverer
 {
     private readonly AssemblyEnumeratorWrapper _assemblyEnumeratorWrapper;

src/Adapter/MSTest.TestAdapter/Execution/TestAssemblySettingsProvider.cs

@@ -8,6 +8,7 @@
 using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
+
 internal class TestAssemblySettingsProvider : MarshalByRefObject
 {
     /// <summary>

src/Adapter/MSTest.TestAdapter/Execution/UnitTestRunner.cs

@@ -156,7 +156,7 @@ internal UnitTestResult[] RunSingleTest(TestMethod testMethod, IDictionary<strin
         catch (TypeInspectionException ex)
         {
             // Catch any exception thrown while inspecting the test method and return failure.
-            return new UnitTestResult[] { new UnitTestResult(ObjectModel.UnitTestOutcome.Failed, ex.Message) };
+            return new UnitTestResult[] { new(ObjectModel.UnitTestOutcome.Failed, ex.Message) };
         }
     }
 
@@ -236,7 +236,7 @@ private bool IsTestMethodRunnable(
             {
                 notRunnableResult = new UnitTestResult[]
                 {
-                    new UnitTestResult(
+                    new(
                         ObjectModel.UnitTestOutcome.NotFound,
                         string.Format(CultureInfo.CurrentCulture, Resource.TestNotFound, testMethod.Name)),
                 };
@@ -250,7 +250,7 @@ private bool IsTestMethodRunnable(
             {
                 notRunnableResult = new UnitTestResult[]
                 {
-                    new UnitTestResult(ObjectModel.UnitTestOutcome.NotRunnable, testMethodInfo.NotRunnableReason),
+                    new(ObjectModel.UnitTestOutcome.NotRunnable, testMethodInfo.NotRunnableReason),
                 };
                 return false;
             }

src/Adapter/MSTest.TestAdapter/Extensions/MethodInfoExtensions.cs

@@ -11,6 +11,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
+
 internal static class MethodInfoExtensions
 {
     /// <summary>

src/Adapter/MSTest.TestAdapter/Extensions/TestContextExtensions.cs

@@ -4,6 +4,7 @@
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
+
 internal static class TestContextExtensions
 {
     /// <summary>

src/Adapter/MSTest.TestAdapter/Extensions/TestResultExtensions.cs

@@ -6,6 +6,7 @@
 using UTF = Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
+
 public static class TestResultExtensions
 {
     /// <summary>

src/Adapter/MSTest.TestAdapter/Extensions/UnitTestOutcomeExtensions.cs

@@ -6,6 +6,7 @@
 using UTF = Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
+
 public static class UnitTestOutcomeExtensions
 {
     /// <summary>

src/Adapter/MSTest.TestAdapter/Helpers/DataSerializationHelper.cs

@@ -8,6 +8,7 @@
 using System.Text;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
+
 internal static class DataSerializationHelper
 {
     private static readonly ConcurrentDictionary<string, DataContractJsonSerializer> SerializerCache = new();

src/Adapter/MSTest.TestAdapter/Helpers/DictionaryHelper.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
+
 internal static class DictionaryHelper
 {
     public static IDictionary<TKey, TValue> ConcatWithOverwrites<TKey, TValue>(

src/Adapter/MSTest.TestAdapter/Helpers/IEnvironment.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
+
 internal interface IEnvironment
 {
     string MachineName { get; }

src/Adapter/MSTest.TestAdapter/Helpers/ReflectHelper.cs

@@ -15,6 +15,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
+
 internal class ReflectHelper : MarshalByRefObject
 {
     private static readonly Lazy<ReflectHelper> InstanceValue = new(() => new ReflectHelper());
@@ -614,10 +615,9 @@ internal virtual IEnumerable<Trait> GetTestPropertiesAsTraits(MemberInfo testPro
     {
         // If the information is cached, then use it otherwise populate the cache using
         // the reflection APIs.
-        Dictionary<string, object>? attributes;
         lock (_attributeCache)
         {
-            if (_attributeCache.TryGetValue(memberInfo, out attributes))
+            if (_attributeCache.TryGetValue(memberInfo, out Dictionary<string, object>? attributes))
             {
                 return attributes;
             }

src/Adapter/MSTest.TestAdapter/Helpers/TestRunParameters.cs

@@ -9,6 +9,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
+
 internal static class TestRunParameters
 {
     internal static Dictionary<string, object> FromXml(XmlReader reader)

src/Adapter/MSTest.TestAdapter/Helpers/UnitTestOutcomeHelper.cs

@@ -5,6 +5,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
+
 internal static class UnitTestOutcomeHelper
 {
     /// <summary>

src/Adapter/MSTest.TestAdapter/ObjectModel/AdapterSettingsException.cs

@@ -4,6 +4,7 @@
 using System;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
+
 internal class AdapterSettingsException : Exception
 {
     internal AdapterSettingsException(string? message)

src/Adapter/MSTest.TestAdapter/ObjectModel/StackTraceInformation.cs

@@ -6,6 +6,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
+
 [Serializable]
 internal class StackTraceInformation
 {

src/Adapter/MSTest.TestAdapter/ObjectModel/TestAssemblySettings.cs

@@ -6,6 +6,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
+
 [Serializable]
 internal class TestAssemblySettings
 {

src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestResult.cs

@@ -13,6 +13,7 @@
 using TestResult = Microsoft.VisualStudio.TestPlatform.ObjectModel.TestResult;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
+
 [Serializable]
 [DebuggerDisplay("{DisplayName} ({Outcome})")]
 public class UnitTestResult

src/Adapter/MSTest.TestAdapter/RunConfigurationSettings.cs

@@ -10,6 +10,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
+
 public class RunConfigurationSettings
 {
     /// <summary>

src/Adapter/MSTest.TestAdapter/TestMethodFilter.cs

@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
+
 internal class TestMethodFilter
 {
     /// <summary>

src/Adapter/MSTestAdapter.PlatformServices/Constants.cs

@@ -6,6 +6,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
+
 internal class Constants
 {
 #if NETFRAMEWORK

src/Adapter/MSTestAdapter.PlatformServices/Services/DiaSessionOperations.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
+
 internal static class DiaSessionOperations
 {
     private static MethodInfo? s_methodGetNavigationData;

src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs

@@ -14,6 +14,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
+
 public class MSTestAdapterSettings
 {
     private bool _isAssemblyResolutionSet;

src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtility.cs

@@ -17,6 +17,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
+
 internal class DeploymentUtility : DeploymentUtilityBase
 {
     public DeploymentUtility()

src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtilityBase.cs

@@ -19,6 +19,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
+
 internal abstract class DeploymentUtilityBase
 {
     protected const string TestAssemblyConfigFileExtension = ".config";

src/Adapter/MSTestAdapter.PlatformServices/Utilities/FileUtility.cs

@@ -14,6 +14,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
+
 internal class FileUtility
 {
     private readonly AssemblyUtility _assemblyUtility;

src/Adapter/MSTestAdapter.PlatformServices/Utilities/IAssemblyUtility.cs

@@ -6,6 +6,7 @@
 using System.Reflection;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
+
 internal interface IAssemblyUtility
 {
     /// <summary>

src/Adapter/MSTestAdapter.PlatformServices/Utilities/VSInstallationUtilities.cs

@@ -11,6 +11,7 @@
 using static System.String;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
+
 public static class VSInstallationUtilities
 {
     /// <summary>

src/Adapter/MSTestAdapter.PlatformServices/Utilities/Validate.cs

@@ -6,6 +6,7 @@
 using System;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
+
 internal class Validate
 {
     /// <summary>

src/Adapter/MSTestAdapter.PlatformServices/Utilities/XmlUtilities.cs

@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
+
 internal class XmlUtilities
 {
     private const string XmlNamespace = "urn:schemas-microsoft-com:asm.v1";

src/TestFramework/TestFramework.Extensions/Attributes/WinUI_UITestMethodAttribute.cs

@@ -84,7 +84,7 @@ public override TestResult[] Execute(ITestMethod testMethod)
             }
             catch (Exception e)
             {
-                return new TestResult[] { new TestResult { TestFailureException = e } };
+                return new TestResult[] { new() { TestFailureException = e } };
             }
         }
         else

src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataAttribute.cs

@@ -93,23 +93,15 @@ public IEnumerable<object[]> GetData(MethodInfo methodInfo)
         switch (_dynamicDataSourceType)
         {
             case DynamicDataSourceType.Property:
-                var property = _dynamicDataDeclaringType.GetTypeInfo().GetDeclaredProperty(_dynamicDataSourceName);
-                if (property == null)
-                {
-                    throw new ArgumentNullException(string.Format("{0} {1}", DynamicDataSourceType.Property, _dynamicDataSourceName));
-                }
-
+                var property = _dynamicDataDeclaringType.GetTypeInfo().GetDeclaredProperty(_dynamicDataSourceName)
+                    ?? throw new ArgumentNullException(string.Format("{0} {1}", DynamicDataSourceType.Property, _dynamicDataSourceName));
                 obj = property.GetValue(null, null);
 
                 break;
 
             case DynamicDataSourceType.Method:
-                var method = _dynamicDataDeclaringType.GetTypeInfo().GetDeclaredMethod(_dynamicDataSourceName);
-                if (method == null)
-                {
-                    throw new ArgumentNullException(string.Format("{0} {1}", DynamicDataSourceType.Method, _dynamicDataSourceName));
-                }
-
+                var method = _dynamicDataDeclaringType.GetTypeInfo().GetDeclaredMethod(_dynamicDataSourceName)
+                    ?? throw new ArgumentNullException(string.Format("{0} {1}", DynamicDataSourceType.Method, _dynamicDataSourceName));
                 obj = method.Invoke(null, null);
 
                 break;
@@ -152,12 +144,8 @@ public IEnumerable<object[]> GetData(MethodInfo methodInfo)
             var dynamicDisplayNameDeclaringType = DynamicDataDisplayNameDeclaringType ?? methodInfo.DeclaringType;
             DebugEx.Assert(dynamicDisplayNameDeclaringType is not null, "Declaring type of test data cannot be null.");
 
-            var method = dynamicDisplayNameDeclaringType.GetTypeInfo().GetDeclaredMethod(DynamicDataDisplayName);
-            if (method == null)
-            {
-                throw new ArgumentNullException(string.Format("{0} {1}", DynamicDataSourceType.Method, DynamicDataDisplayName));
-            }
-
+            var method = dynamicDisplayNameDeclaringType.GetTypeInfo().GetDeclaredMethod(DynamicDataDisplayName)
+                ?? throw new ArgumentNullException(string.Format("{0} {1}", DynamicDataSourceType.Method, DynamicDataDisplayName));
             var parameters = method.GetParameters();
             if (parameters.Length != 2 ||
                 parameters[0].ParameterType != typeof(MethodInfo) ||

test/IntegrationTests/MSTest.IntegrationTests/DiscoverInternalsTests.cs

@@ -7,6 +7,7 @@
 using Microsoft.MSTestV2.CLIAutomation;
 
 namespace MSTest.IntegrationTests;
+
 public class DiscoverInternalsTests : CLITestBase
 {
     private const string TestAsset = "DiscoverInternalsProject";

test/IntegrationTests/MSTest.IntegrationTests/Extensions/VerifyE2E.cs

@@ -10,6 +10,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 namespace MSTest.IntegrationTests;
+
 public static class VerifyE2E
 {
     public static void ContainsTestsDiscovered(IEnumerable<TestCase> actualTests, IEnumerable<string> expectedTests)

test/IntegrationTests/MSTest.IntegrationTests/FSharpTestProjectTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.MSTestV2.CLIAutomation;
 
 namespace MSTest.IntegrationTests;
+
 public class FSharpTestProjectTests : CLITestBase
 {
     private const string TestAssetName = "FSharpTestProject";

test/IntegrationTests/MSTest.IntegrationTests/NoNamespaceTests.cs

@@ -9,6 +9,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 namespace MSTest.IntegrationTests;
+
 public class NoNamespaceTests : CLITestBase
 {
     private const string TestAssetName = "HierarchyProject";

test/IntegrationTests/MSTest.IntegrationTests/OutputTests.cs

@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
 namespace MSTest.IntegrationTests;
+
 public class OutputTests : CLITestBase
 {
     private const string TestAssetName = "OutputTestProject";

test/IntegrationTests/MSTest.IntegrationTests/Parameterized tests/DataExtensibilityTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.MSTestV2.CLIAutomation;
 
 namespace MSTest.IntegrationTests;
+
 public class DataExtensibilityTests : CLITestBase
 {
     private const string TestAssetName = "FxExtensibilityTestProject";

test/IntegrationTests/MSTest.IntegrationTests/Parameterized tests/DataRowTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.MSTestV2.CLIAutomation;
 
 namespace MSTest.IntegrationTests;
+
 public class DataRowTests : CLITestBase
 {
     private const string TestAssetName = "DataRowTestProject";

test/IntegrationTests/MSTest.IntegrationTests/Parameterized tests/DataSourceTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.MSTestV2.CLIAutomation;
 
 namespace MSTest.IntegrationTests;
+
 public class DataSourceTests : CLITestBase
 {
     private const string TestAssetName = "DataSourceTestProject";