Got several more test source files working. The ItRollsForward tests I added as the supporting code was there. But they don't pass, so I'll remove them next commit. Put the utilities classes in the Utilities namespace.

MiYanni · MiYanni · commit d243d398662b · 2024-07-15T14:09:26.000-07:00
diff --git a/test/EndToEnd.Tests/GivenFrameworkDependentApps.cs b/test/EndToEnd.Tests/GivenFrameworkDependentApps.cs
@@ -1,15 +1,13 @@
 ﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using EndToEnd.Tests.Utilities;
 using NuGet.ProjectModel;
 using NuGet.Versioning;
-using RestoreCommand = Microsoft.DotNet.Tools.Test.Utilities.RestoreCommand;
-using TestBase = Microsoft.DotNet.Tools.Test.Utilities.TestBase;
-using static Microsoft.DotNet.Tools.Test.Utilities.TestCommandExtensions;
 
-namespace EndToEnd
+namespace EndToEnd.Tests
 {
-    public class GivenFrameworkDependentApps : TestBase
+    public class GivenFrameworkDependentApps(ITestOutputHelper log) : SdkTest(log)
     {
         [Theory]
         [ClassData(typeof(SupportedNetCoreAppVersions))]
@@ -42,42 +40,37 @@ public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVe
         internal void ItDoesNotRollForwardToTheLatestVersion(string packageName, string minorVersion)
         {
             // https://github.com/NuGet/Home/issues/8571
-            #if LINUX_PORTABLE
+#if LINUX_PORTABLE
                 return;
-            #else
-                var testProjectCreator = new TestProjectCreator()
-                {
-                    PackageName = packageName,
-                    MinorVersion = minorVersion,
-                };
-
-                var _testInstance = testProjectCreator.Create();
-
-                string projectDirectory = _testInstance.Root.FullName;
+#else
+            var testProjectCreator = new TestProjectCreator()
+            {
+                PackageName = packageName,
+                MinorVersion = minorVersion,
+            };
 
-                string projectPath = Path.Combine(projectDirectory, "TestAppSimple.csproj");
+            var _testInstance = testProjectCreator.Create(_testAssetsManager);
 
-                //  Get the resolved version of .NET Core
-                new RestoreCommand()
-                        .WithWorkingDirectory(projectDirectory)
-                        .Execute().Should().Pass();
+            //  Get the resolved version of .NET Core
+            new RestoreCommand(_testInstance)
+                    .Execute().Should().Pass();
 
-                string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
-                var assetsFile = new LockFileFormat().Read(assetsFilePath);
+            string assetsFilePath = Path.Combine(_testInstance.TestRoot, "obj", "project.assets.json");
+            var assetsFile = new LockFileFormat().Read(assetsFilePath);
 
-                var versionInAssertsJson = GetPackageVersion(assetsFile, packageName);
-                versionInAssertsJson.Should().NotBeNull();
+            var versionInAssertsJson = GetPackageVersion(assetsFile, packageName);
+            versionInAssertsJson.Should().NotBeNull();
 
-                if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0)
-                {
-                    // if the bundled version is, for example, a prerelease of
-                    // .NET Core 2.1.1, that we don't roll forward to that prerelease
-                    // version for framework-dependent deployments.
-                    return;
-                }
+            if (versionInAssertsJson.IsPrerelease && versionInAssertsJson.Patch == 0)
+            {
+                // if the bundled version is, for example, a prerelease of
+                // .NET Core 2.1.1, that we don't roll forward to that prerelease
+                // version for framework-dependent deployments.
+                return;
+            }
 
-                versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion));
-            #endif
+            versionInAssertsJson.ToNormalizedString().Should().BeEquivalentTo(GetExpectedVersion(packageName, minorVersion));
+#endif
         }
 
         private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageName) => lockFile?.Targets?.SingleOrDefault(t => t.RuntimeIdentifier == null)
diff --git a/test/EndToEnd.Tests/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd.Tests/GivenSelfContainedAppsRollForward.cs
@@ -1,18 +1,44 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.DotNet.TestFramework;
+//using Microsoft.DotNet.TestFramework;
+using EndToEnd.Tests.Utilities;
 using NuGet.ProjectModel;
 using NuGet.Versioning;
-using RestoreCommand = Microsoft.DotNet.Tools.Test.Utilities.RestoreCommand;
-using NewCommandShim = Microsoft.DotNet.Tools.Test.Utilities.NewCommandShim;
-using TestBase = Microsoft.DotNet.Tools.Test.Utilities.TestBase;
-using static Microsoft.DotNet.Tools.Test.Utilities.TestCommandExtensions;
+//using RestoreCommand = Microsoft.DotNet.Tools.Test.Utilities.RestoreCommand;
+//using NewCommandShim = Microsoft.DotNet.Tools.Test.Utilities.NewCommandShim;
+//using TestBase = Microsoft.DotNet.Tools.Test.Utilities.TestBase;
+//using static Microsoft.DotNet.Tools.Test.Utilities.TestCommandExtensions;
 
-namespace EndToEnd
+namespace EndToEnd.Tests
 {
-    public partial class GivenSelfContainedAppsRollForward : TestBase
+    public partial class GivenSelfContainedAppsRollForward(ITestOutputHelper log) : SdkTest(log)
     {
+        public const string NETCorePackageName = "Microsoft.NETCore.App";
+        public const string AspNetCoreAppPackageName = "Microsoft.AspNetCore.App";
+        public const string AspNetCoreAllPackageName = "Microsoft.AspNetCore.All";
+
+        [Theory]
+        [ClassData(typeof(SupportedNetCoreAppVersions))]
+        public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion)
+        {
+            ItRollsForwardToTheLatestVersion(NETCorePackageName, minorVersion);
+        }
+
+        [Theory]
+        [ClassData(typeof(SupportedAspNetCoreVersions))]
+        public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion)
+        {
+            ItRollsForwardToTheLatestVersion(AspNetCoreAppPackageName, minorVersion);
+        }
+
+        [Theory]
+        [ClassData(typeof(SupportedAspNetCoreVersions))]
+        public void ItRollsForwardToTheLatestAspNetCoreAllVersion(string minorVersion)
+        {
+            ItRollsForwardToTheLatestVersion(AspNetCoreAllPackageName, minorVersion);
+        }
+
         internal void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion)
         {
             var testProjectCreator = new TestProjectCreator()
@@ -23,16 +49,13 @@ internal void ItRollsForwardToTheLatestVersion(string packageName, string minorV
                 RuntimeIdentifier = RuntimeInformation.RuntimeIdentifier
             };
 
-            var testInstance = testProjectCreator.Create();
-
-            string projectDirectory = testInstance.Root.FullName;
+            var testInstance = testProjectCreator.Create(_testAssetsManager);
 
             //  Get the version rolled forward to
-            new RestoreCommand()
-                    .WithWorkingDirectory(projectDirectory)
-                    .Execute().Should().Pass();
+            new RestoreCommand(testInstance)
+                .Execute().Should().Pass();
 
-            string assetsFilePath = Path.Combine(projectDirectory, "obj", "project.assets.json");
+            string assetsFilePath = Path.Combine(testInstance.TestRoot, "obj", "project.assets.json");
             var assetsFile = new LockFileFormat().Read(assetsFilePath);
 
             var rolledForwardVersion = GetPackageVersion(assetsFile, packageName);
@@ -49,14 +72,13 @@ internal void ItRollsForwardToTheLatestVersion(string packageName, string minorV
 
             testProjectCreator.Identifier = "floating";
 
-            var floatingProjectInstance = testProjectCreator.Create();
+            var floatingProjectInstance = testProjectCreator.Create(_testAssetsManager);
 
-            var floatingProjectPath = Path.Combine(floatingProjectInstance.Root.FullName, "TestAppSimple.csproj");
+            var floatingProjectPath = Path.Combine(floatingProjectInstance.TestRoot, "TestAppSimple.csproj");
 
             var floatingProject = XDocument.Load(floatingProjectPath);
             var ns = floatingProject.Root.Name.Namespace;
 
-
             if (packageName == TestProjectCreator.NETCorePackageName)
             {
                 //  Float the RuntimeFrameworkVersion to get the latest version of the runtime available from feeds
@@ -73,11 +95,10 @@ internal void ItRollsForwardToTheLatestVersion(string packageName, string minorV
 
             floatingProject.Save(floatingProjectPath);
 
-            new RestoreCommand()
-                    .WithWorkingDirectory(floatingProjectInstance.Root.FullName)
-                    .Execute().Should().Pass();
+            new RestoreCommand(floatingProjectInstance)
+                .Execute().Should().Pass();
 
-            string floatingAssetsFilePath = Path.Combine(floatingProjectInstance.Root.FullName, "obj", "project.assets.json");
+            string floatingAssetsFilePath = Path.Combine(floatingProjectInstance.TestRoot, "obj", "project.assets.json");
 
             var floatedAssetsFile = new LockFileFormat().Read(floatingAssetsFilePath);
 
@@ -98,12 +119,13 @@ private static NuGetVersion GetPackageVersion(LockFile lockFile, string packageN
         public void WeCoverLatestNetCoreAppRollForward()
         {
             //  Run "dotnet new console", get TargetFramework property, and make sure it's covered in SupportedNetCoreAppVersions
-            var directory = TestAssets.CreateTestDirectory();
-            string projectDirectory = directory.FullName;
+            var directory = _testAssetsManager.CreateTestDirectory();
+            string projectDirectory = directory.Path;
 
-            new NewCommandShim()
+            new DotnetNewCommand(Log, "web", "--no-restore")
+                .WithVirtualHive()
                 .WithWorkingDirectory(projectDirectory)
-                .Execute("console --no-restore").Should().Pass();
+                .Execute().Should().Pass();
 
             string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj");
 
@@ -122,14 +144,15 @@ public void WeCoverLatestNetCoreAppRollForward()
         [Fact]
         public void WeCoverLatestAspNetCoreAppRollForward()
         {
-            var directory = TestAssets.CreateTestDirectory();
-            string projectDirectory = directory.FullName;
+            var directory = _testAssetsManager.CreateTestDirectory();
+            string projectDirectory = directory.Path;
 
             //  Run "dotnet new web", get TargetFramework property, and make sure it's covered in SupportedAspNetCoreAppVersions
 
-            new NewCommandShim()
+            new DotnetNewCommand(Log, "web", "--no-restore")
+                .WithVirtualHive()
                 .WithWorkingDirectory(projectDirectory)
-                .Execute("web --no-restore").Should().Pass();
+                .Execute().Should().Pass();
 
             string projectPath = Path.Combine(projectDirectory, Path.GetFileName(projectDirectory) + ".csproj");
 
@@ -142,7 +165,7 @@ public void WeCoverLatestAspNetCoreAppRollForward()
 
             TargetFrameworkHelper.GetNetAppTargetFrameworks(SupportedAspNetCoreVersions.Versions)
                 .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreVersions)} should include the default version " +
-                "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\"");           
+                "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\"");
         }
     }
 }
diff --git a/test/EndToEnd.Tests/GivenUsingDefaultRuntimeFrameworkVersions.cs b/test/EndToEnd.Tests/GivenUsingDefaultRuntimeFrameworkVersions.cs
@@ -1,14 +1,12 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using EndToEnd.Tests.Utilities;
 using NuGet.Versioning;
-using RestoreCommand = Microsoft.DotNet.Tools.Test.Utilities.RestoreCommand;
-using TestBase = Microsoft.DotNet.Tools.Test.Utilities.TestBase;
-using static Microsoft.DotNet.Tools.Test.Utilities.TestCommandExtensions;
 
-namespace EndToEnd
+namespace EndToEnd.Tests
 {
-    public partial class GivenUsingDefaultRuntimeFrameworkVersions : TestBase
+    public partial class GivenUsingDefaultRuntimeFrameworkVersions(ITestOutputHelper log) : SdkTest(log)
     {
         private static readonly IEnumerable<string> frameworks = new string[] {"Microsoft.NETCore.App", "Microsoft.WindowsDesktop.App",
             "Microsoft.WindowsDesktop.App.WPF", "Microsoft.WindowsDesktop.App.WindowsForms", "Microsoft.AspNetCore.App" };
@@ -24,9 +22,9 @@ public void DefaultRuntimeVersionsAreUpToDate()
                 PackageName = "DefaultRuntimeVersionsAreUpToDate",
                 MinorVersion = "3.0"
             };
-            var testProject = testProjectCreator.Create();
+            var testProject = testProjectCreator.Create(_testAssetsManager);
 
-            var projectFile = new DirectoryInfo(testProject.Root.FullName).GetFiles("*.csproj").First().FullName;
+            var projectFile = new DirectoryInfo(testProject.TestRoot).GetFiles("*.csproj").First().FullName;
             var project = XDocument.Load(projectFile);
             string writeResolvedVersionsTarget = @$"
     <Target Name=`WriteResolvedVersions` AfterTargets=`PrepareForBuild;ProcessFrameworkReferences`>
@@ -51,11 +49,10 @@ public void DefaultRuntimeVersionsAreUpToDate()
                 project.Save(file);
             }
 
-            new RestoreCommand()
-                    .WithWorkingDirectory(testProject.Root.FullName)
-                    .Execute().Should().Pass();
+            new RestoreCommand(testProject)
+                .Execute().Should().Pass();
 
-            var binDirectory = new DirectoryInfo(testProject.Root.FullName).Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault();
+            var binDirectory = new DirectoryInfo(testProject.TestRoot).Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault();
             binDirectory.Should().HaveFilesMatching(outputFile, SearchOption.TopDirectoryOnly);
             var resolvedVersionsFile = File.ReadAllLines(Path.Combine(binDirectory.FullName, outputFile));
             foreach (var framework in frameworks)
diff --git a/test/EndToEnd.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs
@@ -1,6 +1,8 @@
 ﻿// Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using EndToEnd.Tests.Utilities;
+
 namespace EndToEnd.Tests
 {
     public class GivenWeWantToRequireWindowsForDesktopApps(ITestOutputHelper log) : SdkTest(log)
diff --git a/test/EndToEnd.Tests/Utilities/SupportedNetCoreAppVersions.cs b/test/EndToEnd.Tests/Utilities/SupportedNetCoreAppVersions.cs
@@ -3,7 +3,7 @@
 
 using System.Collections;
 
-namespace EndToEnd.Tests
+namespace EndToEnd.Tests.Utilities
 {
     public static class TargetFrameworkHelper
     {
diff --git a/test/EndToEnd.Tests/Utilities/TestProjectCreator.cs b/test/EndToEnd.Tests/Utilities/TestProjectCreator.cs
@@ -3,7 +3,7 @@
 
 using System.Runtime.CompilerServices;
 
-namespace EndToEnd.Tests
+namespace EndToEnd.Tests.Utilities
 {
     class TestProjectCreator
     {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`// Copyright (c) .NET Foundation and contributors. All rights reserved.`
`2`	`2`	`// Licensed under the MIT license. See LICENSE file in the project root for full license information.`
`3`	`3`
	`4`	`+using EndToEnd.Tests.Utilities;`
	`5`	`+`
`4`	`6`	`namespace EndToEnd.Tests`
`5`	`7`	`{`
`6`	`8`	`public class GivenWeWantToRequireWindowsForDesktopApps(ITestOutputHelper log) : SdkTest(log)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using System.Collections;`
`5`	`5`
`6`		`-namespace EndToEnd.Tests`
	`6`	`+namespace EndToEnd.Tests.Utilities`
`7`	`7`	`{`
`8`	`8`	`public static class TargetFrameworkHelper`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using System.Runtime.CompilerServices;`
`5`	`5`
`6`		`-namespace EndToEnd.Tests`
	`6`	`+namespace EndToEnd.Tests.Utilities`
`7`	`7`	`{`
`8`	`8`	`class TestProjectCreator`
`9`	`9`	`{`