remove some redundant assignments (#4522)

SimonCropp · web-flow · commit c686e7d52a55 · 2023-06-06T19:57:31.000Z
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs
@@ -128,7 +128,7 @@ public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultEx
             return TestExtensions.GetTestExtensionCache<TPluginInfo>();
         }
 
-        Dictionary<string, TPluginInfo>? pluginInfos = null;
+        Dictionary<string, TPluginInfo>? pluginInfos;
         SetupAssemblyResolver(null);
 
         // Some times TestPlatform.core.dll assembly fails to load in the current appdomain (from devenv.exe).
@@ -177,6 +177,7 @@ public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultEx
             // Nothing to do here, we just do not want to do an EqtTrace.Fail for this thread
             // being aborted as it is a legitimate exception to receive.
             EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: Data extension discovery is being aborted due to a thread abort.");
+            return null;
         }
 #endif
         catch (Exception e)
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs
@@ -91,9 +91,8 @@ private static void GetTestExtensionsFromFiles<TPluginInfo, TExtension>(
             }
             try
             {
-                Assembly? assembly = null;
                 var assemblyName = Path.GetFileNameWithoutExtension(file);
-                assembly = Assembly.Load(new AssemblyName(assemblyName));
+                var assembly = Assembly.Load(new AssemblyName(assemblyName));
                 if (assembly != null)
                 {
                     GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(assembly, pluginInfos, file);
diff --git a/src/Microsoft.TestPlatform.Common/Filtering/FilterExpression.cs b/src/Microsoft.TestPlatform.Common/Filtering/FilterExpression.cs
@@ -130,8 +130,7 @@ private static void ProcessOperator(Stack<FilterExpression> filterStack, Operato
             // Only the leaves have a condition value.
             if (current._condition != null)
             {
-                bool valid = false;
-                valid = current._condition.ValidForProperties(properties, propertyProvider);
+                var valid = current._condition.ValidForProperties(properties, propertyProvider);
                 // If it's not valid will add it to the function's return array.
                 return !valid ? new string[1] { current._condition.Name } : null;
             }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/ProxyTestSessionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/ProxyTestSessionManager.cs
@@ -209,7 +209,7 @@ public virtual bool StartSession(ITestSessionEventsHandler eventsHandler, IReque
     /// <inheritdoc/>
     public virtual bool StopSession(IRequestData requestData)
     {
-        var testSessionId = string.Empty;
+        string testSessionId;
         lock (_lockObject)
         {
             if (_testSessionInfo == null)
@@ -251,7 +251,7 @@ public virtual bool StopSession(IRequestData requestData)
     /// <returns>The dequeued proxy.</returns>
     public virtual ProxyOperationManager DequeueProxy(string source, string? runSettings)
     {
-        ProxyOperationManagerContainer? proxyContainer = null;
+        ProxyOperationManagerContainer? proxyContainer;
 
         lock (_proxyOperationLockObject)
         {
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/TestSessionPool.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/TestSession/TestSessionPool.cs
@@ -96,7 +96,7 @@ public virtual bool KillSession(TestSessionInfo testSessionInfo, IRequestData re
     {
         // TODO (copoiena): What happens if some request is running for the current session ?
         // Should we stop the request as well ? Probably yes.
-        IProxyTestSessionManager? proxyManager = null;
+        IProxyTestSessionManager? proxyManager;
 
         lock (_lockObject)
         {
@@ -133,7 +133,7 @@ public virtual bool KillSession(TestSessionInfo testSessionInfo, IRequestData re
     {
         ValidateArg.NotNull(requestData, nameof(requestData));
 
-        ProxyTestSessionManager? sessionManager = null;
+        ProxyTestSessionManager? sessionManager;
         lock (_lockObject)
         {
             if (!_sessionPool.ContainsKey(testSessionInfo))
@@ -181,7 +181,7 @@ public virtual bool KillSession(TestSessionInfo testSessionInfo, IRequestData re
     /// <returns>True if the operation succeeded, false otherwise.</returns>
     public virtual bool ReturnProxy(TestSessionInfo testSessionInfo, int proxyId)
     {
-        ProxyTestSessionManager? sessionManager = null;
+        ProxyTestSessionManager? sessionManager;
         lock (_lockObject)
         {
             if (!_sessionPool.ContainsKey(testSessionInfo))
diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/MiniDumpWriteDump.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/MiniDumpWriteDump.cs
@@ -28,8 +28,7 @@ public static void CollectDumpUsingMiniDumpWriteDump(Process process, string out
         using var stream = new FileStream(outputFile, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
         NativeMethods.MinidumpExceptionInformation exceptionInfo = default;
 
-        NativeMethods.MinidumpType dumpType = NativeMethods.MinidumpType.MiniDumpNormal;
-        dumpType = type switch
+        var dumpType = type switch
         {
             MiniDumpTypeOption.Full => NativeMethods.MinidumpType.MiniDumpWithFullMemory |
                                        NativeMethods.MinidumpType.MiniDumpWithDataSegs |
@@ -39,12 +38,12 @@ public static void CollectDumpUsingMiniDumpWriteDump(Process process, string out
                                        NativeMethods.MinidumpType.MiniDumpWithThreadInfo |
                                        NativeMethods.MinidumpType.MiniDumpWithTokenInformation,
             MiniDumpTypeOption.WithHeap => NativeMethods.MinidumpType.MiniDumpWithPrivateReadWriteMemory |
-                                       NativeMethods.MinidumpType.MiniDumpWithDataSegs |
-                                       NativeMethods.MinidumpType.MiniDumpWithHandleData |
-                                       NativeMethods.MinidumpType.MiniDumpWithUnloadedModules |
-                                       NativeMethods.MinidumpType.MiniDumpWithFullMemoryInfo |
-                                       NativeMethods.MinidumpType.MiniDumpWithThreadInfo |
-                                       NativeMethods.MinidumpType.MiniDumpWithTokenInformation,
+                                           NativeMethods.MinidumpType.MiniDumpWithDataSegs |
+                                           NativeMethods.MinidumpType.MiniDumpWithHandleData |
+                                           NativeMethods.MinidumpType.MiniDumpWithUnloadedModules |
+                                           NativeMethods.MinidumpType.MiniDumpWithFullMemoryInfo |
+                                           NativeMethods.MinidumpType.MiniDumpWithThreadInfo |
+                                           NativeMethods.MinidumpType.MiniDumpWithTokenInformation,
             MiniDumpTypeOption.Mini => NativeMethods.MinidumpType.MiniDumpWithThreadInfo,
             _ => NativeMethods.MinidumpType.MiniDumpNormal,
         };
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs b/src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs
@@ -309,7 +309,7 @@ private void PopulateCacheForTypeAndMethodSymbols()
         ValidateArg.NotNullOrEmpty(typeName, nameof(typeName));
 
         IDiaEnumSymbols? enumSymbols = null;
-        IDiaSymbol? typeSymbol = null;
+        IDiaSymbol? typeSymbol;
         IDiaSymbol? global = null;
 
         try
@@ -378,7 +378,7 @@ private void PopulateCacheForTypeAndMethodSymbols()
         ValidateArg.NotNullOrEmpty(methodName, nameof(methodName));
 
         IDiaEnumSymbols? enumSymbols = null;
-        IDiaSymbol? methodSymbol = null;
+        IDiaSymbol? methodSymbol;
         Dictionary<string, IDiaSymbol> methodSymbolsForType;
 
         try
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs
@@ -66,7 +66,6 @@ public object LaunchProcess(string processPath, string? arguments, string? worki
         catch (Exception)
         {
             process.Dispose();
-            process = null;
 
             //EqtTrace.Error("TestHost Object {0} failed to launch with the following exception: {1}", processPath, exception.Message);
             throw;
diff --git a/src/vstest.console/CommandLine/Executor.cs b/src/vstest.console/CommandLine/Executor.cs
@@ -276,12 +276,11 @@ private int GetArgumentProcessors(string[] args, out List<IArgumentProcessor> pr
         processors.Sort((p1, p2) => Comparer<ArgumentProcessorPriority>.Default.Compare(p1.Metadata.Value.Priority, p2.Metadata.Value.Priority));
         foreach (var processor in processors)
         {
-            IArgumentExecutor? executorInstance;
             try
             {
                 // Ensure the instance is created.  Note that the Lazy not only instantiates
                 // the argument processor, but also initializes it.
-                executorInstance = processor.Executor?.Value;
+                var executorInstance = processor.Executor?.Value;
             }
             catch (Exception ex)
             {
diff --git a/src/vstest.console/Processors/Utilities/ArgumentProcessorFactory.cs b/src/vstest.console/Processors/Utilities/ArgumentProcessorFactory.cs
@@ -266,7 +266,7 @@ public static IArgumentProcessor WrapLazyProcessorToInitializeOnInstantiation(IA
         var processorExecutor = processor.Executor;
         var lazyArgumentProcessor = new Lazy<IArgumentExecutor>(() =>
         {
-            IArgumentExecutor? instance = null;
+            IArgumentExecutor? instance;
             try
             {
                 instance = processorExecutor!.Value;
@@ -307,7 +307,7 @@ private static IArgumentProcessor WrapLazyProcessorToInitializeOnInstantiation(
         var processorExecutor = processor.Executor;
         var lazyArgumentProcessor = new Lazy<IArgumentExecutor>(() =>
         {
-            IArgumentsExecutor? instance = null;
+            IArgumentsExecutor? instance;
             try
             {
                 instance = (IArgumentsExecutor)processorExecutor!.Value;
diff --git a/test/Intent/Runner.cs b/test/Intent/Runner.cs
@@ -33,7 +33,7 @@ public static void Run(IEnumerable<string> paths, IRunLogger logger)
         var methods = types.SelectMany(type => type.GetMethods().SkipExcluded()).ToList();
         var methodsWithOnly = methods.Where(m => m.GetCustomAttribute<OnlyAttribute>() != null).ToList();
 
-        var methodsToRun = new List<MethodInfo>();
+        List<MethodInfo> methodsToRun;
         if (typesWithOnly.Count > 0 || methodsWithOnly.Count > 0)
         {
             // Some types or methods are decorated with Only. Putting Only on a type should run all methods in
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Build.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/Build.cs
@@ -103,7 +103,7 @@ private static void BuildTestAssetsCompatibility()
         // We use the same version properties for NET.Test.Sdk as for VSTestConsole, for now.
         foreach (var sdkPropertyName in vstestConsoleVersionProperties)
         {
-            string? netTestSdkVersion = null;
+            string? netTestSdkVersion;
             if (sdkPropertyName == "VSTestConsoleLatestVersion")
             {
                 netTestSdkVersion = IntegrationTestEnvironment.LatestLocallyBuiltNugetVersion;
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/TargetFrameworkTestHostDemultiplexer.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/TargetFrameworkTestHostDemultiplexer.cs
@@ -83,7 +83,7 @@ private void ExecuteContainerInMultiHost(RunnerInfo runnerInfo, int expectedHost
         Assert.AreEqual(expectedHost == -1 ? 1 : expectedHost > 10 ? 10 : expectedHost, hosts.Length);
 
         List<string> tests = new();
-        int testsRunInsideHost = 0;
+        int testsRunInsideHost;
         foreach (var file in hosts)
         {
             testsRunInsideHost = 0;

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultEx`
`128`	`128`	`return TestExtensions.GetTestExtensionCache<TPluginInfo>();`
`129`	`129`	`}`
`130`	`130`
`131`		`- Dictionary<string, TPluginInfo>? pluginInfos = null;`
	`131`	`+ Dictionary<string, TPluginInfo>? pluginInfos;`
`132`	`132`	`SetupAssemblyResolver(null);`
`133`	`133`
`134`	`134`	`// Some times TestPlatform.core.dll assembly fails to load in the current appdomain (from devenv.exe).`
`@@ -177,6 +177,7 @@ public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultEx`
`177`	`177`	`// Nothing to do here, we just do not want to do an EqtTrace.Fail for this thread`
`178`	`178`	`// being aborted as it is a legitimate exception to receive.`
`179`	`179`	`EqtTrace.Verbose("TestPluginCache.DiscoverTestExtensions: Data extension discovery is being aborted due to a thread abort.");`
	`180`	`+ return null;`
`180`	`181`	`}`
`181`	`182`	`#endif`
`182`	`183`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,8 @@ private static void GetTestExtensionsFromFiles<TPluginInfo, TExtension>(`
`91`	`91`	`}`
`92`	`92`	`try`
`93`	`93`	`{`
`94`		`- Assembly? assembly = null;`
`95`	`94`	`var assemblyName = Path.GetFileNameWithoutExtension(file);`
`96`		`- assembly = Assembly.Load(new AssemblyName(assemblyName));`
	`95`	`+ var assembly = Assembly.Load(new AssemblyName(assemblyName));`
`97`	`96`	`if (assembly != null)`
`98`	`97`	`{`
`99`	`98`	`GetTestExtensionsFromAssembly<TPluginInfo, TExtension>(assembly, pluginInfos, file);`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,7 @@ private static void ProcessOperator(Stack<FilterExpression> filterStack, Operato`
`130`	`130`	`// Only the leaves have a condition value.`
`131`	`131`	`if (current._condition != null)`
`132`	`132`	`{`
`133`		`- bool valid = false;`
`134`		`- valid = current._condition.ValidForProperties(properties, propertyProvider);`
	`133`	`+ var valid = current._condition.ValidForProperties(properties, propertyProvider);`
`135`	`134`	`// If it's not valid will add it to the function's return array.`
`136`	`135`	`return !valid ? new string[1] { current._condition.Name } : null;`
`137`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public virtual bool StartSession(ITestSessionEventsHandler eventsHandler, IReque`
`209`	`209`	`/// <inheritdoc/>`
`210`	`210`	`public virtual bool StopSession(IRequestData requestData)`
`211`	`211`	`{`
`212`		`- var testSessionId = string.Empty;`
	`212`	`+ string testSessionId;`
`213`	`213`	`lock (_lockObject)`
`214`	`214`	`{`
`215`	`215`	`if (_testSessionInfo == null)`
`@@ -251,7 +251,7 @@ public virtual bool StopSession(IRequestData requestData)`
`251`	`251`	`/// <returns>The dequeued proxy.</returns>`
`252`	`252`	`public virtual ProxyOperationManager DequeueProxy(string source, string? runSettings)`
`253`	`253`	`{`
`254`		`- ProxyOperationManagerContainer? proxyContainer = null;`
	`254`	`+ ProxyOperationManagerContainer? proxyContainer;`
`255`	`255`
`256`	`256`	`lock (_proxyOperationLockObject)`
`257`	`257`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public virtual bool KillSession(TestSessionInfo testSessionInfo, IRequestData re`
`96`	`96`	`{`
`97`	`97`	`// TODO (copoiena): What happens if some request is running for the current session ?`
`98`	`98`	`// Should we stop the request as well ? Probably yes.`
`99`		`- IProxyTestSessionManager? proxyManager = null;`
	`99`	`+ IProxyTestSessionManager? proxyManager;`
`100`	`100`
`101`	`101`	`lock (_lockObject)`
`102`	`102`	`{`
`@@ -133,7 +133,7 @@ public virtual bool KillSession(TestSessionInfo testSessionInfo, IRequestData re`
`133`	`133`	`{`
`134`	`134`	`ValidateArg.NotNull(requestData, nameof(requestData));`
`135`	`135`
`136`		`- ProxyTestSessionManager? sessionManager = null;`
	`136`	`+ ProxyTestSessionManager? sessionManager;`
`137`	`137`	`lock (_lockObject)`
`138`	`138`	`{`
`139`	`139`	`if (!_sessionPool.ContainsKey(testSessionInfo))`
`@@ -181,7 +181,7 @@ public virtual bool KillSession(TestSessionInfo testSessionInfo, IRequestData re`
`181`	`181`	`/// <returns>True if the operation succeeded, false otherwise.</returns>`
`182`	`182`	`public virtual bool ReturnProxy(TestSessionInfo testSessionInfo, int proxyId)`
`183`	`183`	`{`
`184`		`- ProxyTestSessionManager? sessionManager = null;`
	`184`	`+ ProxyTestSessionManager? sessionManager;`
`185`	`185`	`lock (_lockObject)`
`186`	`186`	`{`
`187`	`187`	`if (!_sessionPool.ContainsKey(testSessionInfo))`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ public object LaunchProcess(string processPath, string? arguments, string? worki`
`66`	`66`	`catch (Exception)`
`67`	`67`	`{`
`68`	`68`	`process.Dispose();`
`69`		`- process = null;`
`70`	`69`
`71`	`70`	`//EqtTrace.Error("TestHost Object {0} failed to launch with the following exception: {1}", processPath, exception.Message);`
`72`	`71`	`throw;`
Original file line number	Diff line number	Diff line change
`@@ -276,12 +276,11 @@ private int GetArgumentProcessors(string[] args, out List<IArgumentProcessor> pr`
`276`	`276`	`processors.Sort((p1, p2) => Comparer<ArgumentProcessorPriority>.Default.Compare(p1.Metadata.Value.Priority, p2.Metadata.Value.Priority));`
`277`	`277`	`foreach (var processor in processors)`
`278`	`278`	`{`
`279`		`- IArgumentExecutor? executorInstance;`
`280`	`279`	`try`
`281`	`280`	`{`
`282`	`281`	`// Ensure the instance is created. Note that the Lazy not only instantiates`
`283`	`282`	`// the argument processor, but also initializes it.`
`284`		`- executorInstance = processor.Executor?.Value;`
	`283`	`+ var executorInstance = processor.Executor?.Value;`
`285`	`284`	`}`
`286`	`285`	`catch (Exception ex)`
`287`	`286`	`{`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public static IArgumentProcessor WrapLazyProcessorToInitializeOnInstantiation(IA`
`266`	`266`	`var processorExecutor = processor.Executor;`
`267`	`267`	`var lazyArgumentProcessor = new Lazy<IArgumentExecutor>(() =>`
`268`	`268`	`{`
`269`		`- IArgumentExecutor? instance = null;`
	`269`	`+ IArgumentExecutor? instance;`
`270`	`270`	`try`
`271`	`271`	`{`
`272`	`272`	`instance = processorExecutor!.Value;`
`@@ -307,7 +307,7 @@ private static IArgumentProcessor WrapLazyProcessorToInitializeOnInstantiation(`
`307`	`307`	`var processorExecutor = processor.Executor;`
`308`	`308`	`var lazyArgumentProcessor = new Lazy<IArgumentExecutor>(() =>`
`309`	`309`	`{`
`310`		`- IArgumentsExecutor? instance = null;`
	`310`	`+ IArgumentsExecutor? instance;`
`311`	`311`	`try`
`312`	`312`	`{`
`313`	`313`	`instance = (IArgumentsExecutor)processorExecutor!.Value;`