Merge branch 'main' into users/devaid/AddingWinArm64NvidiaSmi

Author: deep1712

.github/workflows/pull-request-linux.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 9.0.100
+        dotnet-version: 9.0.x
 
     - name: Add permission to run shell
       run: chmod -R +x *.sh

.pipelines/azure-pipelines-linux.yml

@@ -47,7 +47,7 @@ stages:
       continueOnError: false
       inputs:
         packageType: 'sdk'
-        version: '9.x'
+        version: '9.0.x'
         useGlobalJson: false
         performMultiLevelLookup: true
         workingDirectory: '$(Build.SourcesDirectory)'

VERSION

@@ -1 +1 @@
-2.0.30
+2.1.1

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "9.0.100",
+      "version": "9.0.301",
       "rollForward": "feature"
     }
   }

src/VirtualClient/VirtualClient.Actions.FunctionalTests/WorkloadAssert.cs

@@ -73,34 +73,31 @@ public static void CommandsExecuted(DependencyFixture fixture, params string[] c
         /// </summary>
         public static void SSHCommandsExecuted(DependencyFixture fixture, params string[] commands)
         {
-            List<ISshCommandProxy> sshCommands = new List<ISshCommandProxy>();
-            List<ISshCommandProxy> sshCommandsConfirmed = new List<ISshCommandProxy>();
-            foreach (InMemorySshClient sshClient in fixture.SshClientManager.SshClients)
+            List<string> sshCommands = new List<string>();
+
+            foreach (InMemorySshClient sshClient in fixture.SshClientFactory.SshClients)
             {
-                sshCommands.AddRange(sshClient.SshCommands);
+                sshCommands.AddRange(sshClient.CommandsExecuted);
             }
 
             foreach (string command in commands)
             {
-                ISshCommandProxy matchingProcess = null;
+                string matchingCommand = null;
+
                 try
                 {
                     // Try to match regex
-                    matchingProcess = sshCommands.FirstOrDefault(
-                        sshCommand => Regex.IsMatch($"{sshCommand.CommandText}".Trim(), command, RegexOptions.IgnoreCase)
-                        && !sshCommandsConfirmed.Any(otherProc => object.ReferenceEquals(sshCommand, otherProc)));
+                    matchingCommand = sshCommands.FirstOrDefault(
+                        cmd => Regex.IsMatch($"{cmd}".Trim(), command, RegexOptions.IgnoreCase));
                 }
                 catch
                 {
                 }
 
                 // Or command exact match
-                matchingProcess = matchingProcess ?? sshCommands.FirstOrDefault(
-                    sshCommand => $"{sshCommand.CommandText}".Trim() == command
-                    && !sshCommandsConfirmed.Any(otherProc => object.ReferenceEquals(sshCommand, otherProc)));
+                matchingCommand = matchingCommand ?? sshCommands.FirstOrDefault(cmd => $"{cmd}".Trim() == command);
 
-                Assert.IsNotNull(matchingProcess, $"The command '{command}' was not executed.");
-                sshCommandsConfirmed.Add(matchingProcess);
+                Assert.IsNotNull(matchingCommand, $"The command '{command}' was not executed.");
             }
         }