Fix new issues

StringUtils.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.TestPlatform;
+
+internal static class StringUtils
+{
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrEmpty([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrEmpty(value);
+
+    [SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
+    public static bool IsNullOrWhiteSpace([NotNullWhen(returnValue: false)] this string? value)
+        => string.IsNullOrWhiteSpace(value);
+}

test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs

@@ -61,7 +61,7 @@ public class AcceptanceTestBase : IntegrationTestBase
     public const string LATEST_TO_LEGACY = "Latest;LatestPreview;LatestStable;RecentStable;MostDownloaded;PreviousStable;LegacyStable";
     public const string LATESTPREVIEW_TO_LEGACY = "LatestPreview;LatestStable;RecentStable;MostDownloaded;PreviousStable;LegacyStable";
     public const string LATEST = "Latest";
-    public const string LATESTSTABLE= "LatestStable";
+    public const string LATESTSTABLE = "LatestStable";
     internal const string MSTEST = "MSTest";
 
     public static string And(string left, string right)

test/Microsoft.TestPlatform.TestUtilities/BannedSymbols.txt

@@ -1,3 +1,5 @@
 M:System.IO.Path.GetTempPath(); Use 'IntegrationTestBase.GetTempPath()' instead
 M:System.Environment.SetEnvironmentVariable(System.String,System.String); Use one of the overload accepting a dictionary of environment variables instead
-M:System.Environment.SetEnvironmentVariable(System.String,System.String,System.EnvironmentVariableTarget); Use one of the overload accepting a dictionary of environment variables instead
+M:System.Environment.SetEnvironmentVariable(System.String,System.String,System.EnvironmentVariableTarget); Use one of the overload accepting a dictionary of environment variables instead
+M:System.String.IsNullOrEmpty(System.String); Use 'StringUtils.IsNullOrEmpty' instead
+M:System.String.IsNullOrWhiteSpace(System.String); Use 'StringUtils.IsNullOrWhiteSpace' instead

test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs

@@ -88,7 +88,7 @@ public void TempDirectoryCleanup()
         //
         // Locally delete the directory only when the test succeeded, so we can look
         // at results and logs of failed tests.
-        if (IsCI || TestContext.CurrentTestOutcome == UnitTestOutcome.Passed)
+        if (IsCI || TestContext?.CurrentTestOutcome == UnitTestOutcome.Passed)
         {
             TempDirectory.Dispose();
         }
@@ -104,7 +104,7 @@ public void TempDirectoryCleanup()
     /// <param name="inIsolation"></param>
     /// <returns>Command line arguments string.</returns>
     public static string PrepareArguments(string[] testAssemblies, string testAdapterPath, string runSettings,
-        string framework, string inIsolation = "", string? resultsDirectory = null)
+        string framework, string? inIsolation = "", string? resultsDirectory = null)
     {
         var arguments = "";
         foreach (var path in testAssemblies)
@@ -124,27 +124,27 @@ public void TempDirectoryCleanup()
 
         arguments = arguments.Trim();
 
-        if (!string.IsNullOrWhiteSpace(testAdapterPath))
+        if (!testAdapterPath.IsNullOrWhiteSpace())
         {
             // Append adapter path
             arguments = string.Concat(arguments, " /testadapterpath:", testAdapterPath.AddDoubleQuote());
         }
 
-        if (!string.IsNullOrWhiteSpace(runSettings))
+        if (!runSettings.IsNullOrWhiteSpace())
         {
             // Append run settings
             arguments = string.Concat(arguments, " /settings:", runSettings.AddDoubleQuote());
         }
 
-        if (!string.IsNullOrWhiteSpace(framework))
+        if (!framework.IsNullOrWhiteSpace())
         {
             // Append run settings
             arguments = string.Concat(arguments, " /framework:", framework.AddDoubleQuote());
         }
 
         arguments = string.Concat(arguments, " /logger:", "console;verbosity=normal".AddDoubleQuote());
 
-        if (!string.IsNullOrWhiteSpace(inIsolation))
+        if (!inIsolation.IsNullOrWhiteSpace())
         {
             if (inIsolation != "/InIsolation")
             {
@@ -154,7 +154,7 @@ public void TempDirectoryCleanup()
             arguments = string.Concat(arguments, " ", inIsolation);
         }
 
-        if (!string.IsNullOrWhiteSpace(resultsDirectory))
+        if (!resultsDirectory.IsNullOrWhiteSpace())
         {
             // Append results directory
             arguments = string.Concat(arguments, " /ResultsDirectory:", resultsDirectory.AddDoubleQuote());
@@ -173,7 +173,7 @@ public void TempDirectoryCleanup()
     /// <param name="inIsolation"></param>
     /// <returns>Command line arguments string.</returns>
     public static string PrepareArguments(string testAssembly, string testAdapterPath, string runSettings,
-        string framework, string inIsolation = "", string? resultsDirectory = null)
+        string framework, string? inIsolation = "", string? resultsDirectory = null)
         => PrepareArguments(new string[] { testAssembly }, testAdapterPath, runSettings, framework, inIsolation, resultsDirectory);
 
 
@@ -192,7 +192,7 @@ public void InvokeVsTest(string arguments, Dictionary<string, string>? environme
     /// Invokes our local copy of dotnet that is patched with artifacts from the build with specified arguments.
     /// </summary>
     /// <param name="arguments">Arguments provided to <c>vstest.console</c>.exe</param>
-    public void InvokeDotnetTest(string arguments, Dictionary<string, string> environmentVariables = null)
+    public void InvokeDotnetTest(string arguments, Dictionary<string, string>? environmentVariables = null)
     {
         var debugEnvironmentVariables = AddDebugEnvironmentVariables(environmentVariables);
 
@@ -228,7 +228,7 @@ public void InvokeDotnetTest(string arguments, Dictionary<string, string> enviro
         InvokeVsTest(arguments, environmentVariables);
     }
 
-    private Dictionary<string, string> AddDebugEnvironmentVariables(Dictionary<string, string> environmentVariables)
+    private Dictionary<string, string> AddDebugEnvironmentVariables(Dictionary<string, string>? environmentVariables)
     {
         environmentVariables ??= new Dictionary<string, string>();
 
@@ -295,7 +295,7 @@ public void ExecuteNotSupportedRunnerFrameworkTests(string runnerFramework, stri
     public void ValidateSummaryStatus(int passed, int failed, int skipped)
     {
         // TODO: Switch on the actual version of vstest console when we have that set on test environment.
-        if (_testEnvironment.VSTestConsoleInfo != null && _testEnvironment.VSTestConsoleInfo.Path.Contains($"{Path.DirectorySeparatorChar}15."))
+        if (_testEnvironment.VSTestConsoleInfo?.Path?.Contains($"{Path.DirectorySeparatorChar}15.") == true)
         {
             ValidateSummaryStatusv15(passed, failed, skipped);
             return;
@@ -612,14 +612,9 @@ public virtual string GetConsoleRunnerPath()
 
         if (IsDesktopRunner())
         {
-            if (!string.IsNullOrWhiteSpace(_testEnvironment.VSTestConsoleInfo?.Path))
-            {
-                consoleRunnerPath = _testEnvironment.VSTestConsoleInfo.Path;
-            }
-            else
-            {
-                consoleRunnerPath = Path.Combine(_testEnvironment.PublishDirectory, "vstest.console.exe");
-            }
+            consoleRunnerPath = StringUtils.IsNullOrWhiteSpace(_testEnvironment.VSTestConsoleInfo?.Path)
+                ? Path.Combine(_testEnvironment.PublishDirectory, "vstest.console.exe")
+                : _testEnvironment.VSTestConsoleInfo.Path;
         }
         else if (IsNetCoreRunner())
         {
@@ -699,10 +694,10 @@ public IVsTestConsoleWrapper GetVsTestConsoleWrapper(TraceLevel traceLevel = Tra
         // variables, unless we explicitly say to clean them. https://github.com/microsoft/vstest/pull/3433
         // Remove this code later, and just pass the variables you want to add.
         var debugEnvironmentVariables = AddDebugEnvironmentVariables(new Dictionary<string, string>());
-        Dictionary<string, string> environmentVariables = new();
+        Dictionary<string, string?> environmentVariables = new();
         if (debugEnvironmentVariables.Count > 0)
         {
-            Environment.GetEnvironmentVariables().OfType<DictionaryEntry>().ToList().ForEach(e => environmentVariables.Add(e.Key.ToString(), e.Value.ToString()));
+            Environment.GetEnvironmentVariables().OfType<DictionaryEntry>().ToList().ForEach(e => environmentVariables.Add(e.Key.ToString()!, e.Value?.ToString()));
             foreach (var pair in debugEnvironmentVariables)
             {
                 environmentVariables[pair.Key] = pair.Value;
@@ -760,7 +755,8 @@ protected void ExecuteVsTestConsole(string args, out string stdOut, out string s
     /// <param name="stdOut"></param>
     /// <param name="stdError"></param>
     /// <param name="exitCode"></param>
-    private void ExecutePatchedDotnet(string command, string args, out string stdOut, out string stdError, out int exitCode, Dictionary<string, string> environmentVariables = null)
+    private void ExecutePatchedDotnet(string command, string args, out string stdOut, out string stdError, out int exitCode,
+        Dictionary<string, string>? environmentVariables = null)
     {
         if (environmentVariables is null)
         {
@@ -777,7 +773,7 @@ private void ExecutePatchedDotnet(string command, string args, out string stdOut
     protected static void ExecuteApplication(string path, string args, out string stdOut, out string stdError, out int exitCode,
         Dictionary<string, string>? environmentVariables = null, string? workingDirectory = null)
     {
-        if (string.IsNullOrWhiteSpace(path))
+        if (path.IsNullOrWhiteSpace())
         {
             throw new ArgumentException("Executable path must not be null or whitespace.", nameof(path));
         }

test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs

@@ -28,13 +28,13 @@ public class IntegrationTestEnvironment
     public IntegrationTestEnvironment()
     {
         // If the variables are not set, valid defaults are assumed.
-        if (string.IsNullOrEmpty(TargetFramework))
+        if (TargetFramework.IsNullOrEmpty())
         {
             // Run integration tests for net451 by default.
             TargetFramework = "net451";
         }
 
-        if (string.IsNullOrEmpty(TestPlatformRootDirectory))
+        if (TestPlatformRootDirectory.IsNullOrEmpty())
         {
             // Running in VS/IDE. Use artifacts directory as root.
             // Get root directory from test assembly output directory
@@ -118,7 +118,7 @@ public string PublishDirectory
         {
             if (RunnerFramework == IntegrationTestBase.DesktopRunnerFramework)
             {
-                if (string.IsNullOrEmpty(_targetRuntime))
+                if (_targetRuntime.IsNullOrEmpty())
                 {
                     _targetRuntime = "win7-x64";
                 }
@@ -165,8 +165,8 @@ public string PublishDirectory
 
     // A known AzureDevOps env variable meaning we are running in CI.
     public static bool IsCI { get; } = Environment.GetEnvironmentVariable("TF_BUILD") == "True";
-    public DebugInfo DebugInfo { get; set; }
-    public VSTestConsoleInfo VSTestConsoleInfo { get; set; }
+    public DebugInfo? DebugInfo { get; set; }
+    public VSTestConsoleInfo? VSTestConsoleInfo { get; set; }
     public List<DllInfo> DllInfos { get; set; } = new();
 
     /// <summary>
@@ -258,7 +258,7 @@ public string GetNugetPackage(string packageSuffix)
             props.Read();   // Read thru the PropertyGroup node
             while (!props.EOF)
             {
-                if (props.IsStartElement() && !string.IsNullOrEmpty(props.Name))
+                if (props.IsStartElement() && !props.Name.IsNullOrEmpty())
                 {
                     if (!dependencyProps.ContainsKey(props.Name))
                     {

test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj

@@ -16,6 +16,10 @@
   <ItemGroup>
     <AdditionalFiles Include="BannedSymbols.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\NullableAttributes.cs" Link="NullableAttributes.cs" />
+    <Compile Include="..\..\StringUtils.cs" Link="StringUtils.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />