fix references after merge and removing extra spaces for help samples

Author: Pooneh

src/Common/Azure.Common.Extensions/Models/AzureEnvironment.Methods.cs

@@ -328,5 +328,9 @@ public static class AzureEnvironmentConstants
         public const string AzureTrafficManagerDnsSuffix = "trafficmanager.net";
 
         public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn";
+
+        public const string AzureKeyVaultDnsSuffix = "vault.azure.net";
+
+        public const string AzureKeyVaultServiceEndpointResourceId = "https://vault.azure.net";
     }
 }

src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj

@@ -157,6 +157,10 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\Azure.Common.Extensions\Common.Extensions.csproj">
+      <Project>{b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89}</Project>
+      <Name>Common.Extensions</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
       <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
       <Name>Commands.Common</Name>

src/ResourceManager/KeyVault/Commands.KeyVault/Microsoft.Azure.Commands.KeyVault.dll-Help.xml

@@ -372,9 +372,9 @@
         </maml:introduction>
         <dev:code>
           PS C:\&gt;$KeyOperations = "decrypt", "verify"
-          PS C:\&gt; $Expires = (Get-Date).AddYears(2).ToUniversalTime()
-          PS C:\&gt; $NotBefore=(Get-Date).ToUniversalTime()
-          PS C:\&gt; Add-AzureKeyVaultKey -VaultName "Contoso" -Name "ITHsmNonDefault" -Destination "HSM" -Expires $Expires -NotBefore $NotBefore -KeyOps $KeyOperations -Disable
+PS C:\&gt; $Expires = (Get-Date).AddYears(2).ToUniversalTime()
+PS C:\&gt; $NotBefore=(Get-Date).ToUniversalTime()
+PS C:\&gt; Add-AzureKeyVaultKey -VaultName "Contoso" -Name "ITHsmNonDefault" -Destination "HSM" -Expires $Expires -NotBefore $NotBefore -KeyOps $KeyOperations -Disable
         </dev:code>
         <dev:remarks>
           <maml:para>The first command stores the values decrypt and verify in the $KeyOperations variable.</maml:para>
@@ -412,7 +412,7 @@
         </maml:introduction>
         <dev:code>
           PS C:\&gt;$Password = ConvertTo-SecureString -String "password" -AsPlainText -Force
-          PS C:\&gt; Add-AzureKeyVaultKey -VaultName "Contoso" -Name "ITPfx" -KeyFilePath "C:\Contoso\ITPfx.pfx" -KeyFilePassword $Password
+PS C:\&gt; Add-AzureKeyVaultKey -VaultName "Contoso" -Name "ITPfx" -KeyFilePath "C:\Contoso\ITPfx.pfx" -KeyFilePassword $Password
         </dev:code>
         <dev:remarks>
           <maml:para>The first command converts a string into a secure string by using the ConvertTo-SecureString cmdlet, and then stores that string in the $Password variable. For more information, type Get-Help ConvertTo-SecureString.</maml:para>
@@ -431,8 +431,8 @@
         </maml:introduction>
         <dev:code>
           PS C:\&gt;$Password = ConvertTo-SecureString -String "password" -AsPlainText -Force
-          PS C:\&gt; $Expires = (Get-Date).AddYears(2).ToUniversalTime()
-          PS C:\&gt; Add-AzureKeyVaultKey -VaultName "Contoso" -Name "ITPfxToHSM" -Destination "HSM" -KeyFilePath "C:\Contoso\ITPfx.pfx" -KeyFilePassword $Password -Expires $Expires
+PS C:\&gt; $Expires = (Get-Date).AddYears(2).ToUniversalTime()
+PS C:\&gt; Add-AzureKeyVaultKey -VaultName "Contoso" -Name "ITPfxToHSM" -Destination "HSM" -KeyFilePath "C:\Contoso\ITPfx.pfx" -KeyFilePassword $Password -Expires $Expires
         </dev:code>
         <dev:remarks>
           <maml:para>The first command converts a string into a secure string by using the ConvertTo-SecureString cmdlet, and then stores that string in the $Password variable. </maml:para>
@@ -1401,7 +1401,7 @@
         </maml:introduction>
         <dev:code>
           PS C:\&gt;$Expires= (Get-Date).AddYears(2).ToUniversalTime()
-          PS C:\&gt; Set-AzureKeyVaultKey -VaultName "Contoso" -Name "ITSoftware" -Expires $Expires -Enable $True
+PS C:\&gt; Set-AzureKeyVaultKey -VaultName "Contoso" -Name "ITSoftware" -Expires $Expires -Enable $True
         </dev:code>
         <dev:remarks>
           <maml:para>The first command creates a DateTime object by using the Get-Date cmdlet. That object specifies a time two years in the future. The command stores that date in the $Expires variable. For more information, type Get-Help Get-Date.</maml:para>
@@ -1551,7 +1551,7 @@
         </maml:introduction>
         <dev:code>
           PS C:\&gt;$Secret = ConvertTo-SecureString -String "password" -AsPlainText -Force
-          PS C:\&gt; Set-AzureKeyVaultSecret -VaultName "Contoso" -Name "ITSecret" -SecretValue $Secret
+PS C:\&gt; Set-AzureKeyVaultSecret -VaultName "Contoso" -Name "ITSecret" -SecretValue $Secret
         </dev:code>
         <dev:remarks>
           <maml:para>The first command converts a string into a secure string by using the ConvertTo-SecureString cmdlet, and then stores that string in the $Secret variable. For more information, type Get-Help ConvertTo-SecureString.</maml:para>

src/ResourceManager/KeyVault/Commands.KeyVault/Models/DataServiceCredential.cs

@@ -12,13 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.KeyVault.Properties;
+using Microsoft.Azure.Common.Extensions;
+using Microsoft.Azure.Common.Extensions.Authentication;
+using Microsoft.Azure.Common.Extensions.Models;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.WindowsAzure.Commands.Common;
-using Microsoft.WindowsAzure.Commands.Common.Models;
-using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication;
-using Microsoft.Azure.Commands.KeyVault.Properties;
 
 namespace Microsoft.Azure.Commands.KeyVault.Models
 {

src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultCmdletBase.cs

@@ -12,12 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
-using System.Net;
-using System.Net.Http;
+using Microsoft.Azure.Common.Extensions;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Microsoft.WindowsAzure.Commands.Common;
+using System;
 using System.IO;
+using System.Net.Http;
 
 namespace Microsoft.Azure.Commands.KeyVault.Models
 {

src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultDataServiceClient.cs

@@ -12,19 +12,18 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
-using System.Net.Http;
-using System.Security;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.WindowsAzure;
-using Microsoft.WindowsAzure.Common.Internals;
-using Microsoft.WindowsAzure.Commands.Common;
-using Microsoft.WindowsAzure.Commands.Common.Models;
 using Microsoft.Azure.Commands.KeyVault.Properties;
-using Client = Microsoft.Azure.Commands.KeyVault.Client;
 using Microsoft.Azure.Commands.KeyVault.WebKey;
+using Microsoft.Azure.Common.Extensions;
+using Microsoft.Azure.Common.Extensions.Models;
+using Microsoft.WindowsAzure;
+using Microsoft.WindowsAzure.Common.Internals;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Security;
 
 namespace Microsoft.Azure.Commands.KeyVault.Models
 {

src/ResourceManager/KeyVault/Commands.KeyVault/Models/VaultUriHelper.cs

@@ -13,10 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Linq;
-using Microsoft.WindowsAzure.Commands.Common.Models;
 using Microsoft.Azure.Commands.KeyVault.Properties;
 
 namespace Microsoft.Azure.Commands.KeyVault.Models