key cant be null and cache tostring (#2942)

Co-authored-by: Amaury Levé <amaury.leve@gmail.com> Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
microsoft · May 24, 2024 · f8e167e · f8e167e
1 parent 3e1e5ae
commit f8e167e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/...tform/Microsoft.Testing.Platform/TestHostControllers/SystemEnvironmentVariableProvider.cs b/...tform/Microsoft.Testing.Platform/TestHostControllers/SystemEnvironmentVariableProvider.cs
@@ -28,7 +28,7 @@ public Task UpdateAsync(IEnvironmentVariables environmentVariables)
     {
         foreach (DictionaryEntry entry in _environment.GetEnvironmentVariables())
         {
-            environmentVariables.SetVariable(new(entry.Key!.ToString()!, entry.Value!.ToString(), false, false));
+            environmentVariables.SetVariable(new(entry.Key.ToString()!, entry.Value!.ToString(), false, false));
         }
 
         return Task.CompletedTask;

diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/ServerModeTestsBase.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/ServerModeTestsBase.cs
@@ -35,12 +35,13 @@ protected async Task<TestingPlatformClient> StartAsServerAndConnectToTheClientAs
         foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables())
         {
             // Skip all unwanted environment variables.
-            if (WellKnownEnvironmentVariables.ToSkipEnvironmentVariables.Contains(entry.Key!.ToString(), StringComparer.OrdinalIgnoreCase))
+            string? key = entry.Key.ToString();
+            if (WellKnownEnvironmentVariables.ToSkipEnvironmentVariables.Contains(key, StringComparer.OrdinalIgnoreCase))
             {
                 continue;
             }
 
-            environmentVariables[entry.Key!.ToString()!] = entry.Value!.ToString()!;
+            environmentVariables[key!] = entry.Value!.ToString()!;
         }
 
         // We expect to not fail for unhandled exception in server mode for IDE needs.
@@ -83,12 +84,13 @@ protected async Task<TestingPlatformClient> StartAsServerAndConnectAsync(TestHos
         foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables())
         {
             // Skip all unwanted environment variables.
-            if (WellKnownEnvironmentVariables.ToSkipEnvironmentVariables.Contains(entry.Key!.ToString(), StringComparer.OrdinalIgnoreCase))
+            string? key = entry.Key.ToString();
+            if (WellKnownEnvironmentVariables.ToSkipEnvironmentVariables.Contains(key, StringComparer.OrdinalIgnoreCase))
             {
                 continue;
             }
 
-            environmentVariables[entry.Key!.ToString()!] = entry.Value!.ToString()!;
+            environmentVariables[key!] = entry.Value!.ToString()!;
         }
 
         // We expect to not fail for unhandled exception in server mode for IDE needs.

diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs
@@ -63,21 +63,22 @@ public static int MaxOutstandingCommands
             foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables())
             {
                 // Skip all unwanted environment variables.
-                if (WellKnownEnvironmentVariables.ToSkipEnvironmentVariables.Contains(entry.Key!.ToString(), StringComparer.OrdinalIgnoreCase))
+                string? key = entry.Key.ToString();
+                if (WellKnownEnvironmentVariables.ToSkipEnvironmentVariables.Contains(key, StringComparer.OrdinalIgnoreCase))
                 {
                     continue;
                 }
 
                 if (disableCodeCoverage)
                 {
                     // Disable the code coverage during the build.
-                    if (CodeCoverageEnvironmentVariables.Contains(entry.Key!.ToString(), StringComparer.OrdinalIgnoreCase))
+                    if (CodeCoverageEnvironmentVariables.Contains(key, StringComparer.OrdinalIgnoreCase))
                     {
                         continue;
                     }
                 }
 
-                environmentVariables.Add(entry.Key!.ToString()!, entry.Value!.ToString()!);
+                environmentVariables.Add(key!, entry.Value!.ToString()!);
             }
 
             if (disableTelemetry)

diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHost.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHost.cs
@@ -63,12 +63,13 @@ public static int MaxOutstandingExecutions
             foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables())
             {
                 // Skip all unwanted environment variables.
-                if (WellKnownEnvironmentVariables.ToSkipEnvironmentVariables.Contains(entry.Key!.ToString(), StringComparer.OrdinalIgnoreCase))
+                string? key = entry.Key.ToString();
+                if (WellKnownEnvironmentVariables.ToSkipEnvironmentVariables.Contains(key, StringComparer.OrdinalIgnoreCase))
                 {
                     continue;
                 }
 
-                environmentVariables.Add(entry.Key!.ToString()!, entry.Value!.ToString()!);
+                environmentVariables.Add(key!, entry.Value!.ToString()!);
             }
 
             // Define DOTNET_ROOT to point to the dotnet we install for this repository, to avoid