Add tests for --skip-manifest-update, switch to robocopy for VM directory copy

Author: dsplaisted

src/Tests/dotnet-MsiInstallation.Tests/Framework/VirtualMachine.cs

@@ -360,7 +360,9 @@ VMActionResult Run(SerializedVMAction action)
             {
                 var targetSharePath = VMPathToSharePath(action.TargetPath);
 
-                CopyDirectory(action.SourcePath, targetSharePath);
+                var result = new RunExeCommand(Log, "robocopy", action.SourcePath, targetSharePath, "/mir")
+                    .Execute()
+                    .ExitCode.Should().BeLessThan(8);   //  Robocopy error exit codes are 8 or higher
 
                 return VMActionResult.Success();
             }
@@ -471,24 +473,6 @@ void ProcessDirectory(DirectoryInfo dir, string relativeTo)
             return sb.ToString();
         }
 
-        static void CopyDirectory(string sourcePath, string destPath)
-        {
-            if (!Directory.Exists(destPath))
-            {
-                Directory.CreateDirectory(destPath);
-            }
-
-            foreach (var dir in Directory.GetDirectories(sourcePath))
-            {
-                CopyDirectory(dir, Path.Combine(destPath, Path.GetFileName(dir)));
-            }
-
-            foreach (var file in Directory.GetFiles(sourcePath))
-            {
-                new FileInfo(file).CopyTo(Path.Combine(destPath, Path.GetFileName(file)), true);
-            }
-        }
-
         string VMPathToSharePath(string vmPath)
         {
             var dirInfo = new DirectoryInfo(vmPath);

src/Tests/dotnet-MsiInstallation.Tests/WorkloadSetTests.cs

@@ -3,16 +3,20 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.DotNet.MsiInstallerTests.Framework;
 using Microsoft.NET.Sdk.WorkloadManifestReader;
+using Microsoft.TemplateEngine.Abstractions.Mount;
 
 namespace Microsoft.DotNet.MsiInstallerTests
 {
     public class WorkloadSetTests : VMTestBase
     {
+        readonly string SdkTestingDirectory = @"C:\SdkTesting";
+
         public WorkloadSetTests(ITestOutputHelper log) : base(log)
         {
         }
@@ -218,49 +222,76 @@ public void UpdateToWorkloadSetVersionWithManifestsNotAvailable()
             GetWorkloadVersion().Should().Be(workloadVersionBeforeUpdate);
         }
 
-        [Fact]
-        public void UpdateWorkloadSetViaGlobalJson()
+        void SetupWorkloadSetInGlobalJson(out WorkloadSet originalRollback)
         {
             InstallSdk();
 
             var versionToUpdateTo = "8.0.300-preview.0.24217.2";
-            var directory = "C:\\SdkTesting";
 
             string originalVersion = GetWorkloadVersion();
 
-            var rollback = GetRollback(directory);
+            originalRollback = GetRollback(SdkTestingDirectory);
 
             VM.WriteFile("C:\\SdkTesting\\global.json", @$"{{""sdk"":{{""workloadVersion"":""{versionToUpdateTo}""}}}}").Execute().Should().Pass();
 
-            GetWorkloadVersion(directory).Should().Be(versionToUpdateTo);
+            GetWorkloadVersion(SdkTestingDirectory).Should().Be(versionToUpdateTo);
 
             // The version should have changed but not yet the manifests. Since we expect both, getting the rollback should fail.
             var result = VM.CreateRunCommand("dotnet", "workload", "update", "--print-rollback")
-               .WithWorkingDirectory(directory)
+               .WithWorkingDirectory(SdkTestingDirectory)
                .WithIsReadOnly(true)
                .Execute();
 
             result.Should().Fail();
             result.StdErr.Should().Contain("FileNotFoundException");
             result.StdErr.Should().Contain(versionToUpdateTo);
 
-            AddNuGetSource(@"C:\SdkTesting\workloadsets", directory);
+            AddNuGetSource(@"C:\SdkTesting\workloadsets", SdkTestingDirectory);
+            
+        }
 
-            VM.CreateRunCommand("dotnet", "workload", "update").WithWorkingDirectory(directory).Execute().Should().Pass();
+        [Fact]
+        public void UpdateWorkloadSetViaGlobalJson()
+        {
+            SetupWorkloadSetInGlobalJson(out var originalRollback);
 
-            GetRollback(directory).Should().NotBe(rollback);
+            VM.CreateRunCommand("dotnet", "workload", "update").WithWorkingDirectory(SdkTestingDirectory).Execute().Should().Pass();
+            GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback);
         }
 
-        string GetWorkloadVersion(string workingDirectory = null)
+        [Fact]
+        public void InstallWorkloadSetViaGlobalJson()
         {
-            var result = VM.CreateRunCommand("dotnet", "workload", "--version")
-                .WithWorkingDirectory(workingDirectory)
-                .WithIsReadOnly(true)
-                .Execute();
+            SetupWorkloadSetInGlobalJson(out var originalRollback);
 
-            result.Should().Pass();
+            VM.CreateRunCommand("dotnet", "workload", "install", "aspire")
+                .WithWorkingDirectory(SdkTestingDirectory)
+                .Execute().Should().Pass();
 
-            return result.StdOut;
+            GetRollback(SdkTestingDirectory).Should().NotBe(originalRollback);
+        }
+
+        [Fact]
+        public void InstallWithGlobalJsonAndSkipManifestUpdate()
+        {
+            SetupWorkloadSetInGlobalJson(out var originalRollback);
+
+            VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--skip-manifest-update")
+                .WithWorkingDirectory(SdkTestingDirectory)
+                .Execute().Should().Fail()
+                .And.HaveStdErrContaining("--skip-manifest-update")
+                .And.HaveStdErrContaining(Path.Combine(SdkTestingDirectory, "global.json"));
+        }
+
+        [Fact]
+        public void InstallWithVersionAndSkipManifestUpdate()
+        {
+            InstallSdk();
+
+            VM.CreateRunCommand("dotnet", "workload", "install", "aspire", "--skip-manifest-update", "--version", "8.0.300-preview.0.24178.1")
+                .Execute().Should().Fail()
+                .And.HaveStdErrContaining("--skip-manifest-update")
+                .And.HaveStdErrContaining("--sdk-version");
         }
 
         [Fact]
@@ -305,6 +336,17 @@ public void TurnOffWorkloadSetUpdateMode()
             throw new NotImplementedException();
         }
 
+        string GetWorkloadVersion(string workingDirectory = null)
+        {
+            var result = VM.CreateRunCommand("dotnet", "workload", "--version")
+                .WithWorkingDirectory(workingDirectory)
+                .WithIsReadOnly(true)
+                .Execute();
+
+            result.Should().Pass();
+
+            return result.StdOut;
+        }
         string GetUpdateMode()
         {
             var result = VM.CreateRunCommand("dotnet", "workload", "config", "--update-mode")