[Az.Ssh] Bug fixes before release (#19747)

* Add quotes around path on keygen

* Remove print statement use for debugging

* fix 2 issues

Co-authored-by: Yunchi Wang <[email protected]>
Co-authored-by: [email protected] <[email protected]>

Author: 3 people

src/Accounts/AuthenticationAssemblyLoadContext/AzAssemblyLoadContextInitializer.cs

@@ -36,6 +36,7 @@ static AzAssemblyLoadContextInitializer()
                 {"Microsoft.Bcl.AsyncInterfaces", new Version("1.1.1.0")},
                 {"Microsoft.Identity.Client", new Version("4.46.2.0") },
                 {"Microsoft.Identity.Client.Extensions.Msal", new Version("2.23.0.0") },
+                {"Microsoft.IdentityModel.Abstractions", new Version("6.22.1.0") },
                 {"System.Memory.Data", new Version("1.0.2.0")},
                 {"System.Text.Json", new Version("4.0.1.2")},
             };

src/Ssh/Ssh.Helpers/Ssh.Helpers.csproj

@@ -8,8 +8,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Microsoft.Azure.PowerShell.Ssh.Helpers</AssemblyName>
-    <RootNamespace>Microsoft.Azure.PowerShell.Ssh.Helpers</RootNamespace>
+    <AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Ssh.Helpers</AssemblyName>
+    <RootNamespace>Microsoft.Azure.PowerShell.Cmdlets.Ssh.Helpers</RootNamespace>
     <NoWarn>$(NoWarn);CS0108;CS1573</NoWarn>
   </PropertyGroup>
 

src/Ssh/Ssh/Az.Ssh.psd1

@@ -54,7 +54,7 @@ DotNetFrameworkVersion = '4.7.2'
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.9.1'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = 'Microsoft.Azure.PowerShell.Ssh.Helpers.dll'
+RequiredAssemblies = 'Microsoft.Azure.PowerShell.Cmdlets.Ssh.Helpers.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/Ssh/Ssh/Common/SshBaseCmdlet.cs

@@ -303,7 +303,7 @@ protected internal void ValidateParameters()
             if (CertificateFile != null)
             {
                 if (LocalUser == null)
-                    WriteWarning("To authenticate with a cartificate you must provide a LocalUser. The certificate will be ignored.");
+                    WriteWarning("To authenticate with a certificate you must provide a LocalUser. The certificate will be ignored.");
                 else
                     CertificateFile = GetResolvedPath(CertificateFile, nameof(CertificateFile));
             }
@@ -447,7 +447,6 @@ protected internal string GetClientSideProxy()
             if (!File.Exists(proxyPath))
             {
                 string proxyDir = Path.GetDirectoryName(proxyPath);
-                Console.WriteLine(proxyDir);
 
                 if (!Directory.Exists(proxyDir))
                 {
@@ -629,7 +628,7 @@ private List<string> GetSSHCertPrincipals(string certFile)
         private string[] GetSSHCertInfo(string certFile)
         {
             string sshKeygenPath = GetSSHClientPath("ssh-keygen");
-            string args = "-L -f " + certFile;
+            string args = $"-L -f \"{certFile}\"";
             WriteDebug("Runnung ssh-keygen command: " + sshKeygenPath + " " + args);
             Process keygen = new Process();
             keygen.StartInfo.FileName = sshKeygenPath;
@@ -694,7 +693,7 @@ private bool CheckOrCreatePublicAndPrivateKeyFile(string credentialFolder=null)
 
         private void CreateSSHKeyfile(string privateKeyFile)
         {
-            string args = "-f " + privateKeyFile + " -t rsa -q -N \"\"";
+            string args = $"-f \"{privateKeyFile}\" -t rsa -q -N \"\"";
             Process keygen = Process.Start(GetSSHClientPath("ssh-keygen"), args);
             keygen.WaitForExit();
         }

src/Ssh/Ssh/Properties/AssemblyInfo.cs

@@ -14,7 +14,6 @@
 
 using System;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Microsoft Azure Powershell - SSH")]