Apply code review feedback

Author: dsplaisted

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

@@ -1,16 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Installer.Windows;
 using Microsoft.Management.Infrastructure;
 using Microsoft.Management.Infrastructure.Serialization;
-using static Microsoft.ApplicationInsights.MetricDimensionNames.TelemetryContext;
 
 namespace Microsoft.DotNet.MsiInstallerTests
 {
@@ -101,16 +95,6 @@ public CommandResult RunCommandOnVM(string[] args, string workingDirectory = nul
         private IEnumerable<CimInstance> GetSnapshotInstances()
         {
             var snapshots = _session.QueryInstances(virtNamespace, "WQL", $"SELECT * FROM Msvm_VirtualSystemSettingData WHERE VirtualSystemIdentifier='{VMInstance.CimInstanceProperties["Name"].Value}' And IsSaved='True'").ToList();
-            //Log.WriteLine("Snapshot count: " + snapshots.Count);
-            //foreach (var snapshot in snapshots)
-            //{
-            //    Log.WriteLine(snapshot.CimInstanceProperties["ElementName"].Value.ToString());
-            //    //Log.WriteLine(snapshot.ToString());
-            //    //foreach (var prop in snapshot.CimInstanceProperties)
-            //    //{
-            //    //    Log.WriteLine($"\t{prop.Name}: {prop.Value}");
-            //    //}
-            //}
 
             return snapshots;
         }
@@ -126,20 +110,12 @@ public async Task RenameSnapshotAsync(string snapshotId, string newName)
 
             var managementService = _session.QueryInstances(@"root\virtualization\v2", "WQL", "SELECT * FROM Msvm_VirtualSystemManagementService").Single();
             var modifyVmMethod = managementService.CimClass.CimClassMethods.Single(m => m.Name == "ModifySystemSettings");
-            //foreach (var param in modifyVmMethod.Parameters)
-            //{
-            //    Log.WriteLine($"{param.Name}: {param.CimType}");
-            //}
 
             var snapshot = snapshots.Single(s => s.CimInstanceProperties["ConfigurationID"].Value.ToString() == snapshotId);
 
             snapshot.CimInstanceProperties["ElementName"].Value = newName;
 
             Log.WriteLine("Renaming snapshot " + snapshotId + " to " + newName);
-            //foreach (var prop in snapshot.CimInstanceProperties)
-            //{
-            //    Log.WriteLine($"\t{prop.Name}: {prop.Value}");
-            //}
 
             CimSerializer serializer = CimSerializer.Create();
             var snapshotString = Encoding.Unicode.GetString(serializer.Serialize(snapshot, InstanceSerializationOptions.None));
@@ -279,10 +255,6 @@ private async Task WaitForJobSuccess(CimMethodResult result)
                 if (jobState != JobState.Completed && jobState != JobState.CompletedWithWarnings)
                 {
                     Log.WriteLine("Job failed: " + jobState);
-                    //foreach (var prop in job.CimInstanceProperties)
-                    //{
-                    //    Log.WriteLine($"\t{prop.Name}: {prop.Value}");
-                    //}
 
                     string exceptionText = "Job failed: " + jobState;
 

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

@@ -1,12 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Microsoft.DotNet.MsiInstallerTests
 {
     internal class VMStateTree
@@ -18,18 +12,18 @@ internal class VMStateTree
 
         public Dictionary<SerializedVMAction, VMActionResult> ReadOnlyActions { get; set; } = new();
 
-        public SerializeableVMStateTree ToSerializeable()
+        public SerializableVMStateTree ToSerializeable()
         {
-            return new SerializeableVMStateTree()
+            return new SerializableVMStateTree()
             {
                 SnapshotId = SnapshotId,
                 SnapshotName = SnapshotName,
-                Actions = Actions.Select(a => new SerializeableVMStateTree.Entry() {
+                Actions = Actions.Select(a => new SerializableVMStateTree.Entry() {
                     Action = a.Key,
                     ActionResult = a.Value.actionResult,
                     ResultingState = a.Value.resultingState.ToSerializeable()
                 }).ToList(),
-                ReadOnlyActions = ReadOnlyActions.Select(a => new SerializeableVMStateTree.ReadOnlyEntry()
+                ReadOnlyActions = ReadOnlyActions.Select(a => new SerializableVMStateTree.ReadOnlyEntry()
                 {
                     Action = a.Key,
                     ActionResult = a.Value
@@ -39,7 +33,7 @@ public SerializeableVMStateTree ToSerializeable()
         }
     }
 
-    internal class  SerializeableVMStateTree
+    internal class SerializableVMStateTree
     {
         public string SnapshotId { get; set; }
         public string SnapshotName { get; set; }
@@ -53,7 +47,7 @@ public class Entry
         {
             public SerializedVMAction Action { get; set; }
             public VMActionResult ActionResult { get; set; }
-            public SerializeableVMStateTree ResultingState { get; set; }
+            public SerializableVMStateTree ResultingState { get; set; }
         }
 
         public class ReadOnlyEntry

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

@@ -1,16 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-using Microsoft.Build.Execution;
-using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.DotNet.MsiInstallerTests
 {
@@ -77,7 +69,7 @@ public VirtualMachine(ITestOutputHelper log)
             if (File.Exists(_stateFile))
             {
                 string json = File.ReadAllText(_stateFile);
-                _rootState = JsonSerializer.Deserialize<SerializeableVMStateTree>(json, GetSerializerOptions()).ToVMStateTree();
+                _rootState = JsonSerializer.Deserialize<SerializableVMStateTree>(json, GetSerializerOptions()).ToVMStateTree();
             }
             else
             {
@@ -440,7 +432,6 @@ string VMPathToSharePath(string vmPath)
             return $@"\\{VMControl.VMMachineName}\{driveLetter}$\{pathUnderDrive}";
         }
 
-        //  Copilot wrote the entire body of this method
         string SharePathToVMPath(string sharePath)
         {
             if (!sharePath.StartsWith($@"\\{VMControl.VMMachineName}\"))