Refactor Current, TestExecutionDirectory, and TestAssetsDirectory for null safety based on PR feedback

v-wuzhai · v-wuzhai · commit 5e233e44bdb2 · 2024-11-20T00:18:57.000-08:00
diff --git a/test/Common/Program.cs b/test/Common/Program.cs
@@ -66,7 +66,7 @@ private static int ShowSdkInfo()
     {
         var log = new StringTestLogger();
         var command = new DotnetCommand(log, "--info");
-        var testDirectory = TestDirectory.Create(Path.Combine(TestContext.Current?.TestExecutionDirectory!, "sdkinfo"));
+        var testDirectory = TestDirectory.Create(Path.Combine(TestContext.Current.TestExecutionDirectory, "sdkinfo"));
 
         command.WorkingDirectory = testDirectory.Path;
 
diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -324,7 +324,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage
 
         if (addPackageReference)
         {
-            File.Copy(Path.Combine(TestContext.Current?.TestExecutionDirectory!, "NuGet.config"), Path.Combine(newProjectDir.FullName, "NuGet.config"));
+            File.Copy(Path.Combine(TestContext.Current.TestExecutionDirectory, "NuGet.config"), Path.Combine(newProjectDir.FullName, "NuGet.config"));
 
             (string? packagePath, string? packageVersion) = ToolsetUtils.GetContainersPackagePath();
 
@@ -495,7 +495,7 @@ public void EndToEnd_NoAPI_Console()
             .Execute()
             .Should().Pass();
 
-        File.Copy(Path.Combine(TestContext.Current?.TestExecutionDirectory!, "NuGet.config"), Path.Combine(newProjectDir.FullName, "NuGet.config"));
+        File.Copy(Path.Combine(TestContext.Current.TestExecutionDirectory, "NuGet.config"), Path.Combine(newProjectDir.FullName, "NuGet.config"));
 
         (string? packagePath, string? packageVersion) = ToolsetUtils.GetContainersPackagePath();
 
diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/FullFramework/CreateNewImageToolTaskTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/FullFramework/CreateNewImageToolTaskTests.cs
@@ -596,6 +596,6 @@ public void GenerateCommandLineCommands_LabelGeneration()
 
     private static string GetPathToContainerize()
     {
-        return Path.Combine(TestContext.Current?.TestExecutionDirectory!, "Container", "containerize");
+        return Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "containerize");
     }
 }
diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/PackageTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/PackageTests.cs
@@ -23,7 +23,7 @@ public void SanityTest_ContainerizeDependencies()
             "..\\..\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj"
         };
 
-        string projectFilePath = Path.Combine(TestContext.Current?.TestExecutionDirectory!, "Container", "ProjectFiles", "containerize.csproj");
+        string projectFilePath = Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "ProjectFiles", "containerize.csproj");
         XDocument project = XDocument.Load(projectFilePath);
         XNamespace ns = project.Root?.Name.Namespace ?? throw new InvalidOperationException("Project file is empty");
 
@@ -52,7 +52,7 @@ public void SanityTest_NET_Build_ContainersDependencies()
             "..\\..\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj"
         };
 
-        string projectFilePath = Path.Combine(TestContext.Current?.TestExecutionDirectory!, "Container", "ProjectFiles", "Microsoft.NET.Build.Containers.csproj");
+        string projectFilePath = Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "ProjectFiles", "Microsoft.NET.Build.Containers.csproj");
         XDocument project = XDocument.Load(projectFilePath);
         XNamespace ns = project.Root?.Name.Namespace ?? throw new InvalidOperationException("Project file is empty");
 
diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs
@@ -14,7 +14,7 @@ public sealed class ProjectInitializer
 
     static ProjectInitializer()
     {
-        var artifactPackagingDirectory = Path.Combine(TestContext.Current?.TestExecutionDirectory!, "Container", "packaging");
+        var artifactPackagingDirectory = Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "packaging");
         var targetsFile = Path.Combine(artifactPackagingDirectory, "Microsoft.NET.Build.Containers.targets");
         var propsFile = Path.ChangeExtension(targetsFile, ".props");
         _combinedTargetsLocation = CombineFiles(propsFile, targetsFile);
diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/TestSettings.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/TestSettings.cs
@@ -23,7 +23,7 @@ internal static string? TestArtifactsDirectory
                 {
                     if (_testArtifactsDir == null)
                     {
-                        string tmpDir = Path.Combine(TestContext.Current?.TestExecutionDirectory!, "ContainersTests", DateTime.Now.ToString("yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));
+                        string tmpDir = Path.Combine(TestContext.Current.TestExecutionDirectory, "ContainersTests", DateTime.Now.ToString("yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));
                         if (!Directory.Exists(tmpDir))
                         {
                             Directory.CreateDirectory(tmpDir);
diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/ToolsetUtils.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/ToolsetUtils.cs
@@ -22,12 +22,12 @@ internal static string GetRuntimeGraphFilePath()
     /// <returns></returns>
     internal static (string PackagePath, string PackageVersion) GetContainersPackagePath()
     {
-        string packageDir = Path.Combine(TestContext.Current?.TestExecutionDirectory!, "Container", "package");
+        string packageDir = Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "package");
 
         //until the package is stabilized, the package version matches TestContext.Current.ToolsetUnderTest.SdkVersion
         //after the package is stabilized, the package version doesn't have -prefix (-dev, -ci) anymore
         //so one of those is expected
-        string[] expectedPackageVersions = new[] { TestContext.Current?.ToolsetUnderTest?.SdkVersion, TestContext.Current?.ToolsetUnderTest?.SdkVersion?.Split('-')[0] }!;
+        string[] expectedPackageVersions = new[] { TestContext.Current.ToolsetUnderTest?.SdkVersion, TestContext.Current.ToolsetUnderTest?.SdkVersion?.Split('-')[0] }!;
 
         foreach (string expectedVersion in expectedPackageVersions)
         {
diff --git a/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs b/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs
@@ -82,7 +82,7 @@ public void TestGetPackGroups()
         public void TestGetManifestFeatureBands()
         {
             var manifestProvider = CreateManifestProvider();
-            var workloadResolver = WorkloadResolver.CreateForTests(manifestProvider, TestContext.Current?.ToolsetUnderTest?.DotNetRoot!);
+            var workloadResolver = WorkloadResolver.CreateForTests(manifestProvider, TestContext.Current.ToolsetUnderTest?.DotNetRoot!);
 
             foreach (var manifestInfo in workloadResolver.GetInstalledManifests())
             {
@@ -93,7 +93,7 @@ public void TestGetManifestFeatureBands()
 
         SdkDirectoryWorkloadManifestProvider CreateManifestProvider()
         {
-            return new(TestContext.Current?.ToolsetUnderTest?.DotNetRoot!, TestContext.Current?.ToolsetUnderTest?.SdkVersion!, userProfileDir: null, globalJsonPath: null);
+            return new(TestContext.Current.ToolsetUnderTest?.DotNetRoot!, TestContext.Current.ToolsetUnderTest?.SdkVersion!, userProfileDir: null, globalJsonPath: null);
         }
 
         public IEnumerable<WorkloadManifest> GetManifests(SdkDirectoryWorkloadManifestProvider? manifestProvider = null)
@@ -149,7 +149,7 @@ List<WorkloadPackGroup> GetPackGroups()
 
             var manifestProvider = CreateManifestProvider();
             var manifests = GetManifests(manifestProvider);
-            var workloadResolver = WorkloadResolver.CreateForTests(manifestProvider, TestContext.Current?.ToolsetUnderTest?.DotNetRoot!);
+            var workloadResolver = WorkloadResolver.CreateForTests(manifestProvider, TestContext.Current.ToolsetUnderTest?.DotNetRoot!);
 
             foreach (var manifest in manifests)
             {
diff --git a/test/Microsoft.NET.TestFramework/Attributes/CoreMSBuildAndWindowsOnlyFactAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/CoreMSBuildAndWindowsOnlyFactAttribute.cs
@@ -7,7 +7,7 @@ public class CoreMSBuildAndWindowsOnlyFactAttribute : FactAttribute
     {
         public CoreMSBuildAndWindowsOnlyFactAttribute()
         {
-            if (TestContext.Current?.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild || !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (TestContext.Current.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild || !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 Skip = "This test requires Core MSBuild and Windows to run";
             }
diff --git a/test/Microsoft.NET.TestFramework/Attributes/CoreMSBuildAndWindowsOnlyTheoryAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/CoreMSBuildAndWindowsOnlyTheoryAttribute.cs
@@ -7,7 +7,7 @@ public class CoreMSBuildAndWindowsOnlyTheoryAttribute : TheoryAttribute
     {
         public CoreMSBuildAndWindowsOnlyTheoryAttribute()
         {
-            if (TestContext.Current?.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild || !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (TestContext.Current.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild || !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 Skip = "This test requires Core MSBuild and Windows to run";
             }
diff --git a/test/Microsoft.NET.TestFramework/Attributes/CoreMSBuildOnlyFactAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/CoreMSBuildOnlyFactAttribute.cs
@@ -7,7 +7,7 @@ public class CoreMSBuildOnlyFactAttribute : FactAttribute
     {
         public CoreMSBuildOnlyFactAttribute()
         {
-            if (TestContext.Current?.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
+            if (TestContext.Current.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
             {
                 Skip = "This test requires Core MSBuild to run";
             }
diff --git a/test/Microsoft.NET.TestFramework/Attributes/CoreMSBuildOnlyTheoryAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/CoreMSBuildOnlyTheoryAttribute.cs
@@ -7,7 +7,7 @@ public class CoreMSBuildOnlyTheoryAttribute : TheoryAttribute
     {
         public CoreMSBuildOnlyTheoryAttribute()
         {
-            if (TestContext.Current?.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
+            if (TestContext.Current.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
             {
                 Skip = "This test requires Core MSBuild to run";
             }
diff --git a/test/Microsoft.NET.TestFramework/Attributes/FullMSBuildOnlyFactAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/FullMSBuildOnlyFactAttribute.cs
@@ -7,7 +7,7 @@ public class FullMSBuildOnlyFactAttribute : FactAttribute
     {
         public FullMSBuildOnlyFactAttribute()
         {
-            if (TestContext.Current?.ToolsetUnderTest != null && !TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
+            if (TestContext.Current.ToolsetUnderTest != null && !TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
             {
                 Skip = "This test requires Full MSBuild to run";
             }
diff --git a/test/Microsoft.NET.TestFramework/Attributes/FullMSBuildOnlyTheoryAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/FullMSBuildOnlyTheoryAttribute.cs
@@ -7,7 +7,7 @@ public class FullMSBuildOnlyTheoryAttribute : TheoryAttribute
     {
         public FullMSBuildOnlyTheoryAttribute()
         {
-            if (TestContext.Current?.ToolsetUnderTest != null && !TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
+            if (TestContext.Current.ToolsetUnderTest != null && !TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
             {
                 Skip = "This test requires Full MSBuild to run";
             }
diff --git a/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionTheoryAttribute.cs b/test/Microsoft.NET.TestFramework/Attributes/RequiresMSBuildVersionTheoryAttribute.cs
@@ -17,9 +17,9 @@ public RequiresMSBuildVersionTheoryAttribute(string version)
 
         public static void CheckForRequiredMSBuildVersion(FactAttribute attribute, string version)
         {
-            if (!Version.TryParse(TestContext.Current?.ToolsetUnderTest?.MSBuildVersion, out Version? msbuildVersion))
+            if (!Version.TryParse(TestContext.Current.ToolsetUnderTest?.MSBuildVersion, out Version? msbuildVersion))
             {
-                attribute.Skip = $"Failed to determine the version of MSBuild ({TestContext.Current?.ToolsetUnderTest?.MSBuildVersion}).";
+                attribute.Skip = $"Failed to determine the version of MSBuild ({TestContext.Current.ToolsetUnderTest?.MSBuildVersion}).";
                 return;
             }
             if (!Version.TryParse(version, out Version? requiredVersion))
@@ -29,7 +29,7 @@ public static void CheckForRequiredMSBuildVersion(FactAttribute attribute, strin
             }
             if (requiredVersion > msbuildVersion)
             {
-                attribute.Skip = $"This test requires MSBuild version {version} to run (using {TestContext.Current?.ToolsetUnderTest?.MSBuildVersion}).";
+                attribute.Skip = $"This test requires MSBuild version {version} to run (using {TestContext.Current.ToolsetUnderTest?.MSBuildVersion}).";
             }
         }
     }
diff --git a/test/Microsoft.NET.TestFramework/Commands/DotnetCommand.cs b/test/Microsoft.NET.TestFramework/Commands/DotnetCommand.cs
@@ -14,11 +14,11 @@ protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
         {
             var sdkCommandSpec = new SdkCommandSpec()
             {
-                FileName = TestContext.Current?.ToolsetUnderTest?.DotNetHostPath,
+                FileName = TestContext.Current.ToolsetUnderTest?.DotNetHostPath,
                 Arguments = args.ToList(),
                 WorkingDirectory = WorkingDirectory
             };
-            TestContext.Current?.AddTestEnvironmentVariables(sdkCommandSpec.Environment!);
+            TestContext.Current.AddTestEnvironmentVariables(sdkCommandSpec.Environment!);
             return sdkCommandSpec;
         }
     }
diff --git a/test/Microsoft.NET.TestFramework/Commands/GetValuesCommand.cs b/test/Microsoft.NET.TestFramework/Commands/GetValuesCommand.cs
@@ -134,7 +134,7 @@ protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
             var outputDirectory = GetValuesOutputDirectory(_targetFramework);
             outputDirectory.Create();
 
-            return TestContext.Current?.ToolsetUnderTest?.CreateCommandForTarget(TargetName, newArgs)!;
+            return TestContext.Current.ToolsetUnderTest?.CreateCommandForTarget(TargetName, newArgs)!;
         }
 
         public List<string> GetValues()
diff --git a/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs b/test/Microsoft.NET.TestFramework/Commands/MSBuildCommand.cs
@@ -152,7 +152,7 @@ protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
             var newArgs = args.ToList();
             newArgs.Insert(0, FullPathProjectFile);
 
-            return TestContext.Current?.ToolsetUnderTest?.CreateCommandForTarget(Target, newArgs)!;
+            return TestContext.Current.ToolsetUnderTest?.CreateCommandForTarget(Target, newArgs)!;
         }
     }
 }
diff --git a/test/Microsoft.NET.TestFramework/Commands/MSBuildVersionCommand.cs b/test/Microsoft.NET.TestFramework/Commands/MSBuildVersionCommand.cs
@@ -9,7 +9,7 @@ public MSBuildVersionCommand(ITestOutputHelper log) : base(log) { }
 
         protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
         {
-            if (TestContext.Current?.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
+            if (TestContext.Current.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)
             {
                 return new SdkCommandSpec()
                 {
@@ -22,7 +22,7 @@ protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
             {
                 return new SdkCommandSpec()
                 {
-                    FileName = TestContext.Current?.ToolsetUnderTest?.DotNetHostPath,
+                    FileName = TestContext.Current.ToolsetUnderTest?.DotNetHostPath,
                     Arguments = { "msbuild", "-version" },
                     WorkingDirectory = WorkingDirectory
                 };
diff --git a/test/Microsoft.NET.TestFramework/Commands/NuGetExeRestoreCommand.cs b/test/Microsoft.NET.TestFramework/Commands/NuGetExeRestoreCommand.cs
@@ -31,16 +31,16 @@ protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
             newArgs.Add(FullPathProjectFile);
 
             newArgs.Add("-PackagesDirectory");
-            newArgs.Add(PackagesDirectory ?? TestContext.Current?.NuGetCachePath ?? string.Empty);
+            newArgs.Add(PackagesDirectory ?? TestContext.Current.NuGetCachePath ?? string.Empty);
 
             newArgs.AddRange(args);
 
-            if (string.IsNullOrEmpty(TestContext.Current?.NuGetExePath))
+            if (string.IsNullOrEmpty(TestContext.Current.NuGetExePath))
             {
                 throw new InvalidOperationException("Path to nuget.exe not set");
             }
 
-            var nugetExePath = TestContext.Current?.NuGetExePath;
+            var nugetExePath = TestContext.Current.NuGetExePath;
             if (!string.IsNullOrEmpty(NuGetExeVersion))
             {
                 nugetExePath = Path.Combine(Path.GetDirectoryName(nugetExePath)!, NuGetExeVersion, "nuget.exe");
@@ -72,7 +72,7 @@ protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
                 Arguments = newArgs
             };
 
-            TestContext.Current?.AddTestEnvironmentVariables(ret.Environment!);
+            TestContext.Current.AddTestEnvironmentVariables(ret.Environment!);
 
             return ret;
         }
diff --git a/test/Microsoft.NET.TestFramework/Commands/RunExeCommand.cs b/test/Microsoft.NET.TestFramework/Commands/RunExeCommand.cs
@@ -26,7 +26,7 @@ protected override SdkCommandSpec CreateCommand(IEnumerable<string> args)
                 Arguments = args.ToList(),
                 WorkingDirectory = WorkingDirectory,
             };
-            TestContext.Current?.AddTestEnvironmentVariables(sdkCommandSpec.Environment!);
+            TestContext.Current.AddTestEnvironmentVariables(sdkCommandSpec.Environment!);
             return sdkCommandSpec;
         }
     }
diff --git a/test/Microsoft.NET.TestFramework/SdkTest.cs b/test/Microsoft.NET.TestFramework/SdkTest.cs
@@ -7,7 +7,7 @@ public abstract class SdkTest
     {
         protected TestAssetsManager _testAssetsManager;
 
-        protected bool? UsingFullFrameworkMSBuild => TestContext.Current?.ToolsetUnderTest?.ShouldUseFullFrameworkMSBuild;
+        protected bool? UsingFullFrameworkMSBuild => TestContext.Current.ToolsetUnderTest?.ShouldUseFullFrameworkMSBuild;
 
         protected ITestOutputHelper Log { get; }
 
diff --git a/test/Microsoft.NET.TestFramework/TestAssetsManager.cs b/test/Microsoft.NET.TestFramework/TestAssetsManager.cs
@@ -16,7 +16,7 @@ public class TestAssetsManager
 
         public TestAssetsManager(ITestOutputHelper log)
         {
-            var testAssetsDirectory = TestContext.Current?.TestAssetsDirectory!;
+            var testAssetsDirectory = TestContext.Current.TestAssetsDirectory;
             Log = log;
 
             if (!Directory.Exists(testAssetsDirectory))
@@ -42,7 +42,7 @@ public TestAsset CopyTestAsset(
             testDestinationDirectory ??= GetTestDestinationDirectoryPath(testProjectName, callingMethod + "_" + fileName, identifier, allowCopyIfPresent);
             TestDestinationDirectories.Add(testDestinationDirectory);
 
-            var testAsset = new TestAsset(testProjectDirectory, testDestinationDirectory, TestContext.Current?.SdkVersion, Log);
+            var testAsset = new TestAsset(testProjectDirectory, testDestinationDirectory, TestContext.Current.SdkVersion, Log);
             return testAsset;
         }
 
@@ -125,7 +125,7 @@ private TestAsset CreateTestProjectsInDirectory(
             string testDestinationDirectory,
             string targetExtension = ".csproj")
         {
-            var testAsset = new TestAsset(testDestinationDirectory, TestContext.Current?.SdkVersion, Log);
+            var testAsset = new TestAsset(testDestinationDirectory, TestContext.Current.SdkVersion, Log);
 
             Stack<TestProject> projectStack = new(testProjects);
             HashSet<TestProject> createdProjects = new();
@@ -151,7 +151,7 @@ private TestAsset CreateTestProjectsInDirectory(
         public TestDirectory CreateTestDirectory([CallerMemberName] string? testName = null, string? identifier = null)
         {
             string dir = GetTestDestinationDirectoryPath(testName, testName, identifier ?? string.Empty);
-            return new TestDirectory(dir, TestContext.Current?.SdkVersion);
+            return new TestDirectory(dir, TestContext.Current.SdkVersion);
         }
 
         public string GetAndValidateTestProjectDirectory(string testProjectName, string testAssetSubdirectory = "")
@@ -176,7 +176,7 @@ public static string GetTestDestinationDirectoryPath(
             string? identifier,
             bool allowCopyIfPresent = false)
         {
-            string? baseDirectory = TestContext.Current?.TestExecutionDirectory;
+            string? baseDirectory = TestContext.Current.TestExecutionDirectory;
             var directoryName = new StringBuilder(callingMethodAndFileName).Append(identifier);
 
             if (testProjectName != callingMethodAndFileName)
diff --git a/test/Microsoft.NET.TestFramework/TestContext.cs b/test/Microsoft.NET.TestFramework/TestContext.cs
diff --git a/test/Microsoft.NET.TestFramework/TestDirectory.cs b/test/Microsoft.NET.TestFramework/TestDirectory.cs
diff --git a/test/Microsoft.NET.TestFramework/ToolsetInfo.cs b/test/Microsoft.NET.TestFramework/ToolsetInfo.cs
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/BaseTest.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/BaseTest.cs
diff --git a/test/dotnet-new.Tests/BaseIntegrationTest.cs b/test/dotnet-new.Tests/BaseIntegrationTest.cs
diff --git a/test/dotnet-new.Tests/CommonTemplatesTests.cs b/test/dotnet-new.Tests/CommonTemplatesTests.cs
diff --git a/test/dotnet-new.Tests/DotnetClassTemplateTests.cs b/test/dotnet-new.Tests/DotnetClassTemplateTests.cs
diff --git a/test/dotnet-new.Tests/TemplateEngineSamplesTest.cs b/test/dotnet-new.Tests/TemplateEngineSamplesTest.cs
diff --git a/test/dotnet-new.Tests/Utilities.cs b/test/dotnet-new.Tests/Utilities.cs
diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs
diff --git a/test/dotnet.Tests/dotnet-new/SdkInfoProviderTests.cs b/test/dotnet.Tests/dotnet-new/SdkInfoProviderTests.cs

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private static int ShowSdkInfo()`
`66`	`66`	`{`
`67`	`67`	`var log = new StringTestLogger();`
`68`	`68`	`var command = new DotnetCommand(log, "--info");`
`69`		`- var testDirectory = TestDirectory.Create(Path.Combine(TestContext.Current?.TestExecutionDirectory!, "sdkinfo"));`
	`69`	`+ var testDirectory = TestDirectory.Create(Path.Combine(TestContext.Current.TestExecutionDirectory, "sdkinfo"));`
`70`	`70`
`71`	`71`	`command.WorkingDirectory = testDirectory.Path;`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -596,6 +596,6 @@ public void GenerateCommandLineCommands_LabelGeneration()`
`596`	`596`
`597`	`597`	`private static string GetPathToContainerize()`
`598`	`598`	`{`
`599`		`- return Path.Combine(TestContext.Current?.TestExecutionDirectory!, "Container", "containerize");`
	`599`	`+ return Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "containerize");`
`600`	`600`	`}`
`601`	`601`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public sealed class ProjectInitializer`
`14`	`14`
`15`	`15`	`static ProjectInitializer()`
`16`	`16`	`{`
`17`		`- var artifactPackagingDirectory = Path.Combine(TestContext.Current?.TestExecutionDirectory!, "Container", "packaging");`
	`17`	`+ var artifactPackagingDirectory = Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "packaging");`
`18`	`18`	`var targetsFile = Path.Combine(artifactPackagingDirectory, "Microsoft.NET.Build.Containers.targets");`
`19`	`19`	`var propsFile = Path.ChangeExtension(targetsFile, ".props");`
`20`	`20`	`_combinedTargetsLocation = CombineFiles(propsFile, targetsFile);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ internal static string? TestArtifactsDirectory`
`23`	`23`	`{`
`24`	`24`	`if (_testArtifactsDir == null)`
`25`	`25`	`{`
`26`		`- string tmpDir = Path.Combine(TestContext.Current?.TestExecutionDirectory!, "ContainersTests", DateTime.Now.ToString("yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));`
	`26`	`+ string tmpDir = Path.Combine(TestContext.Current.TestExecutionDirectory, "ContainersTests", DateTime.Now.ToString("yyyyMMddHHmmssfff", CultureInfo.InvariantCulture));`
`27`	`27`	`if (!Directory.Exists(tmpDir))`
`28`	`28`	`{`
`29`	`29`	`Directory.CreateDirectory(tmpDir);`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ internal static string GetRuntimeGraphFilePath()`
`22`	`22`	`/// <returns></returns>`
`23`	`23`	`internal static (string PackagePath, string PackageVersion) GetContainersPackagePath()`
`24`	`24`	`{`
`25`		`- string packageDir = Path.Combine(TestContext.Current?.TestExecutionDirectory!, "Container", "package");`
	`25`	`+ string packageDir = Path.Combine(TestContext.Current.TestExecutionDirectory, "Container", "package");`
`26`	`26`
`27`	`27`	`//until the package is stabilized, the package version matches TestContext.Current.ToolsetUnderTest.SdkVersion`
`28`	`28`	`//after the package is stabilized, the package version doesn't have -prefix (-dev, -ci) anymore`
`29`	`29`	`//so one of those is expected`
`30`		`- string[] expectedPackageVersions = new[] { TestContext.Current?.ToolsetUnderTest?.SdkVersion, TestContext.Current?.ToolsetUnderTest?.SdkVersion?.Split('-')[0] }!;`
	`30`	`+ string[] expectedPackageVersions = new[] { TestContext.Current.ToolsetUnderTest?.SdkVersion, TestContext.Current.ToolsetUnderTest?.SdkVersion?.Split('-')[0] }!;`
`31`	`31`
`32`	`32`	`foreach (string expectedVersion in expectedPackageVersions)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public void TestGetPackGroups()`
`82`	`82`	`public void TestGetManifestFeatureBands()`
`83`	`83`	`{`
`84`	`84`	`var manifestProvider = CreateManifestProvider();`
`85`		`- var workloadResolver = WorkloadResolver.CreateForTests(manifestProvider, TestContext.Current?.ToolsetUnderTest?.DotNetRoot!);`
	`85`	`+ var workloadResolver = WorkloadResolver.CreateForTests(manifestProvider, TestContext.Current.ToolsetUnderTest?.DotNetRoot!);`
`86`	`86`
`87`	`87`	`foreach (var manifestInfo in workloadResolver.GetInstalledManifests())`
`88`	`88`	`{`
`@@ -93,7 +93,7 @@ public void TestGetManifestFeatureBands()`
`93`	`93`
`94`	`94`	`SdkDirectoryWorkloadManifestProvider CreateManifestProvider()`
`95`	`95`	`{`
`96`		`- return new(TestContext.Current?.ToolsetUnderTest?.DotNetRoot!, TestContext.Current?.ToolsetUnderTest?.SdkVersion!, userProfileDir: null, globalJsonPath: null);`
	`96`	`+ return new(TestContext.Current.ToolsetUnderTest?.DotNetRoot!, TestContext.Current.ToolsetUnderTest?.SdkVersion!, userProfileDir: null, globalJsonPath: null);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public IEnumerable<WorkloadManifest> GetManifests(SdkDirectoryWorkloadManifestProvider? manifestProvider = null)`
`@@ -149,7 +149,7 @@ List<WorkloadPackGroup> GetPackGroups()`
`149`	`149`
`150`	`150`	`var manifestProvider = CreateManifestProvider();`
`151`	`151`	`var manifests = GetManifests(manifestProvider);`
`152`		`- var workloadResolver = WorkloadResolver.CreateForTests(manifestProvider, TestContext.Current?.ToolsetUnderTest?.DotNetRoot!);`
	`152`	`+ var workloadResolver = WorkloadResolver.CreateForTests(manifestProvider, TestContext.Current.ToolsetUnderTest?.DotNetRoot!);`
`153`	`153`
`154`	`154`	`foreach (var manifest in manifests)`
`155`	`155`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class CoreMSBuildAndWindowsOnlyFactAttribute : FactAttribute`
`7`	`7`	`{`
`8`	`8`	`public CoreMSBuildAndWindowsOnlyFactAttribute()`
`9`	`9`	`{`
`10`		`- if (TestContext.Current?.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild \|\| !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
	`10`	`+ if (TestContext.Current.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild \|\| !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`11`	`11`	`{`
`12`	`12`	`Skip = "This test requires Core MSBuild and Windows to run";`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class CoreMSBuildAndWindowsOnlyTheoryAttribute : TheoryAttribute`
`7`	`7`	`{`
`8`	`8`	`public CoreMSBuildAndWindowsOnlyTheoryAttribute()`
`9`	`9`	`{`
`10`		`- if (TestContext.Current?.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild \|\| !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
	`10`	`+ if (TestContext.Current.ToolsetUnderTest != null && TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild \|\| !RuntimeInformation.IsOSPlatform(OSPlatform.Windows))`
`11`	`11`	`{`
`12`	`12`	`Skip = "This test requires Core MSBuild and Windows to run";`
`13`	`13`	`}`