Azure · markcowl · Jan 9, 2015 · Nov 17, 2014 · Nov 17, 2014 · Nov 17, 2014
diff --git a/AzurePowershell.Test.targets b/AzurePowershell.Test.targets
@@ -21,6 +21,7 @@
     <SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
     <HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
     <StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
+    <KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
     <TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain"</TestFilter>
     <ScenarioTestFilter>All</ScenarioTestFilter>
     <OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
@@ -137,6 +138,13 @@
     <Xunit.Runner.MSBuild.xunit Assemblies="$(SqlTestDebug)" Html="$(TestOutputDirectory)\SqlTests.xunit.dll.html" Verbose="false"
       ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
   </Target>  
+
+  <!-- Run the KeyVault tests -->
+  <Target Name="KeyVaultTests">
+    <Message Importance="high" Text="Running KeyVault tests" />
+    <Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
+      ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
+  </Target>
 
   <!-- Run the scenario tests with Mocks -->
   <Target Name="MockedScenarioTests">

diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,17 @@
+2015.01.08 version 0.8.13
+* Key Vault Service - new cmdlets in AzureResourceManager mode:
+  * Keys:
+    * Add-AzureKeyVaultKey
+    * Get-AzureKeyVaultKey
+    * Set-AzureKeyVaultKey
+    * Backup-AzureKeyVaultKey
+    * Restore-AzureKeyVaultKey
+    * Remove-AzureKeyVaultKey
+  * Secrets:
+    * Get-AzureKeyVaultSecret
+    * Set-AzureKeyVaultSecret
+    * Remove-AzureKeyVaultSecret
+
 2014.12.12 version 0.8.12
 * StreamAnalytics
   * New cmdlets in AzureResourceManager mode

diff --git a/build.proj b/build.proj
@@ -195,7 +195,7 @@
   <!-- Run checkin tests for each pull request -->
   <Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
     <Message Importance="high" Text="Running check in tests..." />
-    <CallTarget Targets="SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager"/>
+    <CallTarget Targets="KeyVaultTests; SqlTests; CommonTests; TestManagement; TestHDInsight; TestManagedCache; TestServiceManagement; TestServiceManagementExtensions; TestSqlDatabase; TestStorage; TestResourceManager; MockedScenarioTests; TestDSCExtension_x64; TestBatch; TestDataFactoryManager; TestRecoveryServices; TestStreamAnalyticsManager"/>
   </Target>
 
   <!-- Run Full switch with scenario tests -->

diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define productName="Microsoft Azure PowerShell - December 2014" ?>
+  <?define productName="Microsoft Azure PowerShell - January 2015" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.8.12" ?>
+  <?define version="0.8.13" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>
 

diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi
diff --git a/src/AzurePowershell.sln b/src/AzurePowershell.sln
@@ -143,6 +143,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network", "Service
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network.Test", "ServiceManagement\Network\Commands.Network.Test\Commands.Network.Test.csproj", "{FDB897BD-FCB4-44A1-8D66-AC99F22EC737}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.KeyVault", "ResourceManager\KeyVault\Commands.KeyVault\Commands.KeyVault.csproj", "{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.KeyVault.Test", "ResourceManager\KeyVault\Commands.KeyVault.Test\Commands.KeyVault.Test.csproj", "{080B0477-7E52-4455-90AB-23BD13D1B1CE}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices", "ServiceManagement\RecoveryServices\Commands.RecoveryServices\Commands.RecoveryServices.csproj", "{98B10548-DF97-4FB1-8D82-2A12945D4F21}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.Test", "ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\Commands.RecoveryServices.Test.csproj", "{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}"
@@ -151,6 +155,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Test", "ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\Commands.StreamAnalytics.Test.csproj", "{7E6683BE-ECFF-4709-89EB-1325E9E70512}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Extensions", "Common\Azure.Common.Extensions\Common.Extensions.csproj", "{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -345,6 +351,10 @@ Global
 		{FDB897BD-FCB4-44A1-8D66-AC99F22EC737}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FDB897BD-FCB4-44A1-8D66-AC99F22EC737}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDB897BD-FCB4-44A1-8D66-AC99F22EC737}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Release|Any CPU.Build.0 = Release|Any CPU
 		{98B10548-DF97-4FB1-8D82-2A12945D4F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{98B10548-DF97-4FB1-8D82-2A12945D4F21}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98B10548-DF97-4FB1-8D82-2A12945D4F21}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -353,6 +363,10 @@ Global
 		{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{080B0477-7E52-4455-90AB-23BD13D1B1CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F49A314A-A235-47D3-A654-1EC19ACA366C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F49A314A-A235-47D3-A654-1EC19ACA366C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F49A314A-A235-47D3-A654-1EC19ACA366C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -361,6 +375,10 @@ Global
 		{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -390,6 +408,7 @@ Global
 		{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{FDB897BD-FCB4-44A1-8D66-AC99F22EC737} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{A415F75B-EB6A-49A6-934E-5BA71B83D6EB} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 EndGlobal
diff --git a/...hentication/AadAuthenticationException.cs → ...hentication/AadAuthenticationException.cs b/...hentication/AadAuthenticationException.cs → ...hentication/AadAuthenticationException.cs
@@ -14,7 +14,7 @@
 
 using System;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// Base class representing an exception that occurs when

diff --git a/...n/Authentication/AccessTokenCredential.cs → ...s/Authentication/AccessTokenCredential.cs b/...n/Authentication/AccessTokenCredential.cs → ...s/Authentication/AccessTokenCredential.cs
@@ -12,13 +12,14 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.WindowsAzure;
 using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     public class AccessTokenCredential : SubscriptionCloudCredentials
     {

diff --git a/...ommon/Authentication/AdalConfiguration.cs → ...sions/Authentication/AdalConfiguration.cs b/...ommon/Authentication/AdalConfiguration.cs → ...sions/Authentication/AdalConfiguration.cs
@@ -15,7 +15,7 @@
 using System;
 using System.Linq;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// Class storing the configuration information needed

diff --git a/...ommon/Authentication/AdalTokenProvider.cs → ...sions/Authentication/AdalTokenProvider.cs b/...ommon/Authentication/AdalTokenProvider.cs → ...sions/Authentication/AdalTokenProvider.cs
@@ -12,13 +12,13 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Common.Extensions.Models;
+using Microsoft.Azure.Common.Extensions.Properties;
 using System;
 using System.Security;
 using System.Windows.Forms;
-using Microsoft.WindowsAzure.Commands.Common.Models;
-using Microsoft.WindowsAzure.Commands.Common.Properties;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// A token provider that uses ADAL to retrieve

diff --git a/...mon/Authentication/ConsoleParentWindow.cs → ...ons/Authentication/ConsoleParentWindow.cs b/...mon/Authentication/ConsoleParentWindow.cs → ...ons/Authentication/ConsoleParentWindow.cs
@@ -16,7 +16,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// An implementation of <see cref="IWin32Window"/> that gives the

diff --git a/...mmands.Common/Authentication/CredStore.cs → ...on.Extensions/Authentication/CredStore.cs b/...mmands.Common/Authentication/CredStore.cs → ...on.Extensions/Authentication/CredStore.cs
@@ -16,7 +16,7 @@
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// Class wrapping PInvoke signatures for Windows Credential store

diff --git a/...nds.Common/Authentication/IAccessToken.cs → ...Extensions/Authentication/IAccessToken.cs b/...nds.Common/Authentication/IAccessToken.cs → ...Extensions/Authentication/IAccessToken.cs
@@ -14,7 +14,7 @@
 
 using System;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     public interface IAccessToken
     {

diff --git a/...s.Common/Authentication/ITokenProvider.cs → ...tensions/Authentication/ITokenProvider.cs b/...s.Common/Authentication/ITokenProvider.cs → ...tensions/Authentication/ITokenProvider.cs
@@ -12,10 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Common.Extensions.Models;
 using System.Security;
-using Microsoft.WindowsAzure.Commands.Common.Models;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// This interface represents objects that can be used

diff --git a/...mmands.Common/Authentication/LoginType.cs → ...on.Extensions/Authentication/LoginType.cs b/...mmands.Common/Authentication/LoginType.cs → ...on.Extensions/Authentication/LoginType.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     public enum LoginType
     {

diff --git a/...Authentication/ProtectedFileTokenCache.cs → ...Authentication/ProtectedFileTokenCache.cs b/...Authentication/ProtectedFileTokenCache.cs → ...Authentication/ProtectedFileTokenCache.cs
@@ -12,21 +12,20 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using System;
 using System.IO;
 using System.Security.Cryptography;
-using Microsoft.IdentityModel.Clients.ActiveDirectory;
-using Microsoft.WindowsAzure.Commands.Common;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// An implementation of the Adal token cache that stores the cache items
     /// in the DPAPI-protected file.
     /// </summary>
     public class ProtectedFileTokenCache : TokenCache
     {
-        private static readonly string CacheFileName = Path.Combine(AzurePowerShell.ProfileDirectory, "TokenCache.dat");
+        private static readonly string CacheFileName = Path.Combine(AzureSession.ProfileDirectory, AzureSession.TokenCacheFile);
 
         private static readonly object fileLock = new object();
 

diff --git a/...uthentication/ServicePrincipalKeyStore.cs → ...uthentication/ServicePrincipalKeyStore.cs b/...uthentication/ServicePrincipalKeyStore.cs → ...uthentication/ServicePrincipalKeyStore.cs
@@ -15,10 +15,9 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
-using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication;
 using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
 
-namespace Microsoft.WindowsAzure.Commands.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// Helper class to store service principal keys and retrieve them
@@ -27,7 +26,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Authentication
     public static class ServicePrincipalKeyStore
     {
         private const string keyStoreUserName = "PowerShellServicePrincipalKey";
-        private const string targetNamePrefix = "AzurePowershell:target=";
+        private const string targetNamePrefix = "AzureSession:target=";
 
         public static void SaveKey(string appId, string tenantId, SecureString serviceKey)
         {

diff --git a/...tication/ServicePrincipalTokenProvider.cs → ...tication/ServicePrincipalTokenProvider.cs b/...tication/ServicePrincipalTokenProvider.cs → ...tication/ServicePrincipalTokenProvider.cs
@@ -12,15 +12,14 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Common.Extensions.Models;
+using Microsoft.Azure.Common.Extensions.Properties;
+using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using System;
 using System.Collections.Generic;
 using System.Security;
-using Microsoft.IdentityModel.Clients.ActiveDirectory;
-using Microsoft.WindowsAzure.Commands.Common.Authentication;
-using Microsoft.WindowsAzure.Commands.Common.Models;
-using Microsoft.WindowsAzure.Commands.Common.Properties;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     internal class ServicePrincipalTokenProvider : ITokenProvider
     {

diff --git a/...mands.Common/Authentication/ShowDialog.cs → ...n.Extensions/Authentication/ShowDialog.cs b/...mands.Common/Authentication/ShowDialog.cs → ...n.Extensions/Authentication/ShowDialog.cs
@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     public enum ShowDialog
     {

diff --git a/...ommon/Authentication/UserTokenProvider.cs → ...sions/Authentication/UserTokenProvider.cs b/...ommon/Authentication/UserTokenProvider.cs → ...sions/Authentication/UserTokenProvider.cs
@@ -12,16 +12,16 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Common.Extensions.Models;
+using Microsoft.Azure.Common.Extensions.Properties;
+using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Threading;
 using System.Windows.Forms;
-using Microsoft.IdentityModel.Clients.ActiveDirectory;
-using Microsoft.WindowsAzure.Commands.Common.Models;
-using Microsoft.WindowsAzure.Commands.Common.Properties;
 
-namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication
+namespace Microsoft.Azure.Common.Extensions.Authentication
 {
     /// <summary>
     /// A token provider that uses ADAL to retrieve

diff --git a/src/Common/Commands.Common/AzureSession.cs → ...n/Azure.Common.Extensions/AzureSession.cs b/src/Common/Commands.Common/AzureSession.cs → ...n/Azure.Common.Extensions/AzureSession.cs
@@ -12,28 +12,32 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Common.Extensions.Factories;
+using Microsoft.Azure.Common.Extensions.Models;
+using Microsoft.Azure.Common.Extensions.Properties;
 using System;
-using System.Collections.Generic;
-using Microsoft.WindowsAzure.Commands.Common.Common;
-using Microsoft.WindowsAzure.Commands.Common.Factories;
-using Microsoft.WindowsAzure.Commands.Common.Models;
-using Microsoft.WindowsAzure.Commands.Common.Properties;
-using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication;
-
-namespace Microsoft.WindowsAzure.Commands.Common
+using System.IO;
+
+namespace Microsoft.Azure.Common.Extensions
 {
     public static class AzureSession
     {
         static AzureSession()
         {
-            ClientFactory = new AzurePowerShellClientFactory();
+            ClientFactory = new ClientFactory();
             AuthenticationFactory = new AuthenticationFactory();
             CurrentContext = new AzureContext();
             CurrentContext.Environment = AzureEnvironment.PublicEnvironments[EnvironmentName.AzureCloud];
+            AzureSession.OldProfileFile = "WindowsAzureProfile.xml";
+            AzureSession.OldProfileFileBackup = "WindowsAzureProfile.xml.bak";
+            AzureSession.ProfileDirectory = Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                Resources.AzureDirectoryName); ;
+            AzureSession.ProfileFile = "AzureProfile.json";
+            AzureSession.TokenCacheFile = "TokenCache.dat";
         }
 
-        public static AzureContext CurrentContext {get; private set; }
+        public static AzureContext CurrentContext { get; private set; }
 
         public static void SetCurrentContext(AzureSubscription subscription, AzureEnvironment environment, AzureAccount account)
         {
@@ -89,5 +93,15 @@ public static void SetCurrentContext(AzureSubscription subscription, AzureEnviro
         public static IClientFactory ClientFactory { get; set; }
 
         public static IAuthenticationFactory AuthenticationFactory { get; set; }
+
+        public static string ProfileDirectory { get; set; }
+
+        public static string TokenCacheFile { get; set; }
+
+        public static string ProfileFile { get; set; }
+
+        public static string OldProfileFileBackup { get; set; }
+
+        public static string OldProfileFile { get; set; }
     }
 }