diff --git a/src/AzurePowershell.sln b/src/AzurePowershell.sln index d69164d019de..3f7fd0758a94 100644 --- a/src/AzurePowershell.sln +++ b/src/AzurePowershell.sln @@ -151,6 +151,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 @@ -361,6 +363,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 diff --git a/src/Common/Commands.Common/Authentication/AadAuthenticationException.cs b/src/Common/Azure.Common.Extensions/Authentication/AadAuthenticationException.cs similarity index 97% rename from src/Common/Commands.Common/Authentication/AadAuthenticationException.cs rename to src/Common/Azure.Common.Extensions/Authentication/AadAuthenticationException.cs index dbfaf1abb52f..fa0d2484f439 100644 --- a/src/Common/Commands.Common/Authentication/AadAuthenticationException.cs +++ b/src/Common/Azure.Common.Extensions/Authentication/AadAuthenticationException.cs @@ -14,7 +14,7 @@ using System; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication +namespace Microsoft.Azure.Common.Extensions.Authentication { /// /// Base class representing an exception that occurs when diff --git a/src/Common/Commands.Common/Authentication/AccessTokenCredential.cs b/src/Common/Azure.Common.Extensions/Authentication/AccessTokenCredential.cs similarity index 95% rename from src/Common/Commands.Common/Authentication/AccessTokenCredential.cs rename to src/Common/Azure.Common.Extensions/Authentication/AccessTokenCredential.cs index 9addc44ee361..270178958487 100644 --- a/src/Common/Commands.Common/Authentication/AccessTokenCredential.cs +++ b/src/Common/Azure.Common.Extensions/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/src/Common/Commands.Common/Authentication/AdalConfiguration.cs b/src/Common/Azure.Common.Extensions/Authentication/AdalConfiguration.cs similarity index 97% rename from src/Common/Commands.Common/Authentication/AdalConfiguration.cs rename to src/Common/Azure.Common.Extensions/Authentication/AdalConfiguration.cs index 80fc09992933..9ee7fd8909f8 100644 --- a/src/Common/Commands.Common/Authentication/AdalConfiguration.cs +++ b/src/Common/Azure.Common.Extensions/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 { /// /// Class storing the configuration information needed diff --git a/src/Common/Commands.Common/Authentication/AdalTokenProvider.cs b/src/Common/Azure.Common.Extensions/Authentication/AdalTokenProvider.cs similarity index 92% rename from src/Common/Commands.Common/Authentication/AdalTokenProvider.cs rename to src/Common/Azure.Common.Extensions/Authentication/AdalTokenProvider.cs index 0d52ba5ada44..f0e67eecc122 100644 --- a/src/Common/Commands.Common/Authentication/AdalTokenProvider.cs +++ b/src/Common/Azure.Common.Extensions/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 { /// /// A token provider that uses ADAL to retrieve diff --git a/src/Common/Commands.Common/Authentication/ConsoleParentWindow.cs b/src/Common/Azure.Common.Extensions/Authentication/ConsoleParentWindow.cs similarity index 94% rename from src/Common/Commands.Common/Authentication/ConsoleParentWindow.cs rename to src/Common/Azure.Common.Extensions/Authentication/ConsoleParentWindow.cs index d6e227b84b8c..7d33c8569062 100644 --- a/src/Common/Commands.Common/Authentication/ConsoleParentWindow.cs +++ b/src/Common/Azure.Common.Extensions/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 { /// /// An implementation of that gives the diff --git a/src/Common/Commands.Common/Authentication/CredStore.cs b/src/Common/Azure.Common.Extensions/Authentication/CredStore.cs similarity index 98% rename from src/Common/Commands.Common/Authentication/CredStore.cs rename to src/Common/Azure.Common.Extensions/Authentication/CredStore.cs index c5806e67f11f..598019f64f9a 100644 --- a/src/Common/Commands.Common/Authentication/CredStore.cs +++ b/src/Common/Azure.Common.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 { /// /// Class wrapping PInvoke signatures for Windows Credential store diff --git a/src/Common/Commands.Common/Authentication/IAccessToken.cs b/src/Common/Azure.Common.Extensions/Authentication/IAccessToken.cs similarity index 93% rename from src/Common/Commands.Common/Authentication/IAccessToken.cs rename to src/Common/Azure.Common.Extensions/Authentication/IAccessToken.cs index 8db903887322..7952623bbec7 100644 --- a/src/Common/Commands.Common/Authentication/IAccessToken.cs +++ b/src/Common/Azure.Common.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/src/Common/Commands.Common/Authentication/ITokenProvider.cs b/src/Common/Azure.Common.Extensions/Authentication/ITokenProvider.cs similarity index 93% rename from src/Common/Commands.Common/Authentication/ITokenProvider.cs rename to src/Common/Azure.Common.Extensions/Authentication/ITokenProvider.cs index 71ea49ec791e..ea2ab77ce749 100644 --- a/src/Common/Commands.Common/Authentication/ITokenProvider.cs +++ b/src/Common/Azure.Common.Extensions/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 { /// /// This interface represents objects that can be used diff --git a/src/Common/Commands.Common/Authentication/LoginType.cs b/src/Common/Azure.Common.Extensions/Authentication/LoginType.cs similarity index 93% rename from src/Common/Commands.Common/Authentication/LoginType.cs rename to src/Common/Azure.Common.Extensions/Authentication/LoginType.cs index f812412acf0f..e8b3a3ebed17 100644 --- a/src/Common/Commands.Common/Authentication/LoginType.cs +++ b/src/Common/Azure.Common.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/src/Common/Commands.Common/Authentication/ProtectedFileTokenCache.cs b/src/Common/Azure.Common.Extensions/Authentication/ProtectedFileTokenCache.cs similarity index 96% rename from src/Common/Commands.Common/Authentication/ProtectedFileTokenCache.cs rename to src/Common/Azure.Common.Extensions/Authentication/ProtectedFileTokenCache.cs index f313eed7b143..2ff115cc3501 100644 --- a/src/Common/Commands.Common/Authentication/ProtectedFileTokenCache.cs +++ b/src/Common/Azure.Common.Extensions/Authentication/ProtectedFileTokenCache.cs @@ -12,13 +12,12 @@ // 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 { /// /// An implementation of the Adal token cache that stores the cache items @@ -26,7 +25,7 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication /// 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/src/Common/Commands.Common/Authentication/ServicePrincipalKeyStore.cs b/src/Common/Azure.Common.Extensions/Authentication/ServicePrincipalKeyStore.cs similarity index 95% rename from src/Common/Commands.Common/Authentication/ServicePrincipalKeyStore.cs rename to src/Common/Azure.Common.Extensions/Authentication/ServicePrincipalKeyStore.cs index 5d21da36a76d..afba969a1ad5 100644 --- a/src/Common/Commands.Common/Authentication/ServicePrincipalKeyStore.cs +++ b/src/Common/Azure.Common.Extensions/Authentication/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 { /// /// 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/src/Common/Commands.Common/Authentication/ServicePrincipalTokenProvider.cs b/src/Common/Azure.Common.Extensions/Authentication/ServicePrincipalTokenProvider.cs similarity index 95% rename from src/Common/Commands.Common/Authentication/ServicePrincipalTokenProvider.cs rename to src/Common/Azure.Common.Extensions/Authentication/ServicePrincipalTokenProvider.cs index ccd5b57f20aa..cd959c9a5bde 100644 --- a/src/Common/Commands.Common/Authentication/ServicePrincipalTokenProvider.cs +++ b/src/Common/Azure.Common.Extensions/Authentication/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/src/Common/Commands.Common/Authentication/ShowDialog.cs b/src/Common/Azure.Common.Extensions/Authentication/ShowDialog.cs similarity index 91% rename from src/Common/Commands.Common/Authentication/ShowDialog.cs rename to src/Common/Azure.Common.Extensions/Authentication/ShowDialog.cs index a3669e7c8835..280aa3d804da 100644 --- a/src/Common/Commands.Common/Authentication/ShowDialog.cs +++ b/src/Common/Azure.Common.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/src/Common/Commands.Common/Authentication/UserTokenProvider.cs b/src/Common/Azure.Common.Extensions/Authentication/UserTokenProvider.cs similarity index 98% rename from src/Common/Commands.Common/Authentication/UserTokenProvider.cs rename to src/Common/Azure.Common.Extensions/Authentication/UserTokenProvider.cs index d94ffe98da93..08615e9e96b5 100644 --- a/src/Common/Commands.Common/Authentication/UserTokenProvider.cs +++ b/src/Common/Azure.Common.Extensions/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 { /// /// A token provider that uses ADAL to retrieve diff --git a/src/Common/Commands.Common/AzureSession.cs b/src/Common/Azure.Common.Extensions/AzureSession.cs similarity index 73% rename from src/Common/Commands.Common/AzureSession.cs rename to src/Common/Azure.Common.Extensions/AzureSession.cs index 3c92b0eed95d..fa1bb66de832 100644 --- a/src/Common/Commands.Common/AzureSession.cs +++ b/src/Common/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; } } } diff --git a/src/Common/Azure.Common.Extensions/Common.Extensions.csproj b/src/Common/Azure.Common.Extensions/Common.Extensions.csproj new file mode 100644 index 000000000000..65358fb47311 --- /dev/null +++ b/src/Common/Azure.Common.Extensions/Common.Extensions.csproj @@ -0,0 +1,203 @@ + + + + + Debug + AnyCPU + {B95C489C-8CB7-4DCF-8D5F-B9AEBDBBAF89} + Library + Properties + Microsoft.Azure.Common.Extensions + Microsoft.Azure.Common.Extensions + v4.5 + 512 + + ..\..\ + true + /assemblyCompareMode:StrongNameIgnoringVersion + + + true + full + false + bin\Debug + DEBUG;TRACE + prompt + 4 + true + true + false + true + + + bin\Release + TRACE;SIGN + true + pdbonly + AnyCPU + bin\Release\Management.Utilities.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\Rule Sets + ;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\FxCop\Rules + true + MSSharedLibKey.snk + true + true + false + true + + + + False + ..\..\packages\Microsoft.Azure.Management.Resources.2.7.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll + + + ..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll + + + ..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll + + + ..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll + + + False + ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll + + + False + ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll + + + False + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + + + False + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + + + False + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + + + ..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.dll + + + ..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll + + + ..\..\packages\Microsoft.WindowsAzure.Management.2.1.0\lib\net40\Microsoft.WindowsAzure.Management.dll + + + ..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True + + + + + + + False + ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll + + + False + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll + + + False + ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll + + + + + + + + + ..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + Resources.resx + + + + + + + + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + + + + Designer + + + + + + + + + + \ No newline at end of file diff --git a/src/Common/Commands.Common/Common/AzureModule.cs b/src/Common/Azure.Common.Extensions/Common/AzureModule.cs similarity index 93% rename from src/Common/Commands.Common/Common/AzureModule.cs rename to src/Common/Azure.Common.Extensions/Common/AzureModule.cs index 3a4fa4bb960e..a6da65469b58 100644 --- a/src/Common/Commands.Common/Common/AzureModule.cs +++ b/src/Common/Azure.Common.Extensions/Common/AzureModule.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.Azure.Common.Extensions { public enum AzureModule { diff --git a/src/Common/Commands.Common/Common/ProfileClient.cs b/src/Common/Azure.Common.Extensions/Common/ProfileClient.cs similarity index 98% rename from src/Common/Commands.Common/Common/ProfileClient.cs rename to src/Common/Azure.Common.Extensions/Common/ProfileClient.cs index 217b84df6592..968017faa1ae 100644 --- a/src/Common/Commands.Common/Common/ProfileClient.cs +++ b/src/Common/Azure.Common.Extensions/Common/ProfileClient.cs @@ -12,21 +12,21 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Authentication; +using Microsoft.Azure.Common.Extensions.Factories; +using Microsoft.Azure.Common.Extensions.Interfaces; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions.Properties; +using Microsoft.Azure.Subscriptions; +using Microsoft.WindowsAzure; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Security; using System.Security.Cryptography.X509Certificates; -using Microsoft.Azure.Subscriptions; -using Microsoft.WindowsAzure.Commands.Common.Factories; -using Microsoft.WindowsAzure.Commands.Common.Interfaces; -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 + +namespace Microsoft.Azure.Common.Extensions { /// /// Convenience client for azure profile and subscriptions. @@ -59,13 +59,13 @@ private void WriteWarningMessage(string message) private static void UpgradeProfile() { - string oldProfileFilePath = System.IO.Path.Combine(AzurePowerShell.ProfileDirectory, AzurePowerShell.OldProfileFile); - string oldProfileFilePathBackup = System.IO.Path.Combine(AzurePowerShell.ProfileDirectory, AzurePowerShell.OldProfileFileBackup); - string newProfileFilePath = System.IO.Path.Combine(AzurePowerShell.ProfileDirectory, AzurePowerShell.ProfileFile); + string oldProfileFilePath = System.IO.Path.Combine(AzureSession.ProfileDirectory, AzureSession.OldProfileFile); + string oldProfileFilePathBackup = System.IO.Path.Combine(AzureSession.ProfileDirectory, AzureSession.OldProfileFileBackup); + string newProfileFilePath = System.IO.Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile); if (DataStore.FileExists(oldProfileFilePath)) { - string oldProfilePath = System.IO.Path.Combine(AzurePowerShell.ProfileDirectory, - AzurePowerShell.OldProfileFile); + string oldProfilePath = System.IO.Path.Combine(AzureSession.ProfileDirectory, + AzureSession.OldProfileFile); try { @@ -137,7 +137,7 @@ static ProfileClient() } public ProfileClient() - : this(System.IO.Path.Combine(AzurePowerShell.ProfileDirectory, AzurePowerShell.ProfileFile)) + : this(System.IO.Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile)) { } diff --git a/src/Common/Commands.Common/Common/ProfileData.cs b/src/Common/Azure.Common.Extensions/Common/ProfileData.cs similarity index 98% rename from src/Common/Commands.Common/Common/ProfileData.cs rename to src/Common/Azure.Common.Extensions/Common/ProfileData.cs index 2ce005aefbaa..049994759314 100644 --- a/src/Common/Commands.Common/Common/ProfileData.cs +++ b/src/Common/Azure.Common.Extensions/Common/ProfileData.cs @@ -12,14 +12,14 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Models; using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using System.Text; -using Microsoft.WindowsAzure.Commands.Common.Models; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.Azure.Common.Extensions { /// /// This class provides the representation of diff --git a/src/Common/Commands.Common/Common/PublishSettingsImporter.cs b/src/Common/Azure.Common.Extensions/Common/PublishSettingsImporter.cs similarity index 94% rename from src/Common/Commands.Common/Common/PublishSettingsImporter.cs rename to src/Common/Azure.Common.Extensions/Common/PublishSettingsImporter.cs index 22d6825b56ea..2cad598b3159 100644 --- a/src/Common/Commands.Common/Common/PublishSettingsImporter.cs +++ b/src/Common/Azure.Common.Extensions/Common/PublishSettingsImporter.cs @@ -12,17 +12,16 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions.XmlSchema; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Security.Cryptography.X509Certificates; using System.Xml.Serialization; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema; -using Microsoft.WindowsAzure.Commands.Common; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.Azure.Common.Extensions { /// /// Class that handles loading publishsettings files diff --git a/src/Common/Commands.Common/Common/RequiredResourceLookup.cs b/src/Common/Azure.Common.Extensions/Common/RequiredResourceLookup.cs similarity index 97% rename from src/Common/Commands.Common/Common/RequiredResourceLookup.cs rename to src/Common/Azure.Common.Extensions/Common/RequiredResourceLookup.cs index cef962cafef4..21cf5093a03f 100644 --- a/src/Common/Commands.Common/Common/RequiredResourceLookup.cs +++ b/src/Common/Azure.Common.Extensions/Common/RequiredResourceLookup.cs @@ -12,10 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.Collections.Generic; using Microsoft.WindowsAzure.Common; +using System.Collections.Generic; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.Azure.Common.Extensions { /// /// This class handles mapping management client types diff --git a/src/Common/Commands.Common/Common/Validate.cs b/src/Common/Azure.Common.Extensions/Common/Validate.cs similarity index 98% rename from src/Common/Commands.Common/Common/Validate.cs rename to src/Common/Azure.Common.Extensions/Common/Validate.cs index 0d3c74ae25c4..ec24bdea9120 100644 --- a/src/Common/Commands.Common/Common/Validate.cs +++ b/src/Common/Azure.Common.Extensions/Common/Validate.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Properties; using System; using System.Diagnostics.CodeAnalysis; using System.IO; @@ -19,9 +20,8 @@ using System.Net; using System.Net.Sockets; using System.Runtime.InteropServices; -using Microsoft.WindowsAzure.Commands.Common.Properties; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.Azure.Common.Extensions { public static class Validate { diff --git a/src/Common/Commands.Common/Factories/AuthenticationFactory.cs b/src/Common/Azure.Common.Extensions/Factories/AuthenticationFactory.cs similarity index 93% rename from src/Common/Commands.Common/Factories/AuthenticationFactory.cs rename to src/Common/Azure.Common.Extensions/Factories/AuthenticationFactory.cs index a897f4fe3b7e..f280a0d4e4a1 100644 --- a/src/Common/Commands.Common/Factories/AuthenticationFactory.cs +++ b/src/Common/Azure.Common.Extensions/Factories/AuthenticationFactory.cs @@ -12,14 +12,15 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Authentication; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions.Properties; +using Microsoft.WindowsAzure; using System; using System.Linq; using System.Security; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Common.Properties; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; -namespace Microsoft.WindowsAzure.Commands.Common.Factories +namespace Microsoft.Azure.Common.Extensions.Factories { public class AuthenticationFactory : IAuthenticationFactory { diff --git a/src/Common/Commands.Common/Factories/ClientFactory.cs b/src/Common/Azure.Common.Extensions/Factories/ClientFactory.cs similarity index 80% rename from src/Common/Commands.Common/Factories/ClientFactory.cs rename to src/Common/Azure.Common.Extensions/Factories/ClientFactory.cs index f5aca60d816d..2211cc141c13 100644 --- a/src/Common/Commands.Common/Factories/ClientFactory.cs +++ b/src/Common/Azure.Common.Extensions/Factories/ClientFactory.cs @@ -12,21 +12,30 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions.Properties; +using Microsoft.WindowsAzure; +using Microsoft.WindowsAzure.Common; using System; using System.Collections.Generic; using System.Net; using System.Net.Http; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Common.Properties; -using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.WindowsAzure.Common; +using System.Net.Http.Headers; -namespace Microsoft.WindowsAzure.Commands.Common.Factories +namespace Microsoft.Azure.Common.Extensions.Factories { public class ClientFactory : IClientFactory { private static readonly char[] uriPathSeparator = { '/' }; + private Dictionary actions; + + public ClientFactory() + { + actions = new Dictionary(); + UserAgents = new List(); + } + public virtual TClient CreateClient(AzureContext context, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient { if (context == null) @@ -35,7 +44,14 @@ public virtual TClient CreateClient(AzureContext context, AzureEnvironm } SubscriptionCloudCredentials creds = AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(context); - return CreateCustomClient(creds, context.Environment.GetEndpointAsUri(endpoint)); + TClient client = CreateCustomClient(creds, context.Environment.GetEndpointAsUri(endpoint)); + + foreach (IClientAction action in actions.Values) + { + action.Apply(client, context, endpoint); + } + + return client; } /// @@ -79,8 +95,12 @@ public virtual TClient CreateCustomClient(params object[] parameters) w } TClient client = (TClient)constructor.Invoke(parameters); - client.UserAgent.Add(ApiConstants.UserAgentValue); - + + foreach (ProductInfoHeaderValue userAgent in UserAgents) + { + client.UserAgent.Add(userAgent); + } + return client; } @@ -136,5 +156,21 @@ public static HttpClientHandler CreateHttpClientHandler(string endpoint, ICreden // Our handler is ready return clientHandler; } + + public void AddAction(IClientAction action) + { + action.ClientFactory = this; + actions[action.GetType()] = action; + } + + public void RemoveAction(Type actionType) + { + if (actions.ContainsKey(actionType)) + { + actions.Remove(actionType); + } + } + + public List UserAgents { get; set; } } } diff --git a/src/Common/Commands.Common/Interfaces/IAuthenticationFactory.cs b/src/Common/Azure.Common.Extensions/Interfaces/IAuthenticationFactory.cs similarity index 89% rename from src/Common/Commands.Common/Interfaces/IAuthenticationFactory.cs rename to src/Common/Azure.Common.Extensions/Interfaces/IAuthenticationFactory.cs index 9e052857a09d..6f9b40579783 100644 --- a/src/Common/Commands.Common/Interfaces/IAuthenticationFactory.cs +++ b/src/Common/Azure.Common.Extensions/Interfaces/IAuthenticationFactory.cs @@ -12,11 +12,12 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Authentication; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.WindowsAzure; using System.Security; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; -namespace Microsoft.WindowsAzure.Commands.Common +namespace Microsoft.Azure.Common.Extensions { public interface IAuthenticationFactory { diff --git a/src/Common/Commands.Common/Interfaces/IClientFactory.cs b/src/Common/Azure.Common.Extensions/Interfaces/IClientFactory.cs similarity index 82% rename from src/Common/Commands.Common/Interfaces/IClientFactory.cs rename to src/Common/Azure.Common.Extensions/Interfaces/IClientFactory.cs index 00aad993a9a9..87ad3c5810e6 100644 --- a/src/Common/Commands.Common/Interfaces/IClientFactory.cs +++ b/src/Common/Azure.Common.Extensions/Interfaces/IClientFactory.cs @@ -12,13 +12,15 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.Net; -using System.Net.Http; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Common; using System; +using System.Collections.Generic; +using System.Net; +using System.Net.Http; +using System.Net.Http.Headers; -namespace Microsoft.WindowsAzure.Commands.Common +namespace Microsoft.Azure.Common.Extensions { public interface IClientFactory { @@ -31,5 +33,11 @@ public interface IClientFactory HttpClient CreateHttpClient(string endpoint, ICredentials credentials); HttpClient CreateHttpClient(string endpoint, HttpMessageHandler effectiveHandler); + + void AddAction(IClientAction action); + + void RemoveAction(Type actionType); + + List UserAgents { get; set; } } } diff --git a/src/Common/Commands.Common/Interfaces/IDataStore.cs b/src/Common/Azure.Common.Extensions/Interfaces/IDataStore.cs similarity index 97% rename from src/Common/Commands.Common/Interfaces/IDataStore.cs rename to src/Common/Azure.Common.Extensions/Interfaces/IDataStore.cs index 0e1133b55d89..7d38fea53699 100644 --- a/src/Common/Commands.Common/Interfaces/IDataStore.cs +++ b/src/Common/Azure.Common.Extensions/Interfaces/IDataStore.cs @@ -16,7 +16,7 @@ using System.Security.Cryptography.X509Certificates; using System.Text; -namespace Microsoft.WindowsAzure.Commands.Common.Interfaces +namespace Microsoft.Azure.Common.Extensions.Interfaces { public interface IDataStore { diff --git a/src/Common/Commands.Common/Interfaces/IProfileSerializer.cs b/src/Common/Azure.Common.Extensions/Interfaces/IProfileSerializer.cs similarity index 89% rename from src/Common/Commands.Common/Interfaces/IProfileSerializer.cs rename to src/Common/Azure.Common.Extensions/Interfaces/IProfileSerializer.cs index e9e296e95e6a..f48d90657495 100644 --- a/src/Common/Commands.Common/Interfaces/IProfileSerializer.cs +++ b/src/Common/Azure.Common.Extensions/Interfaces/IProfileSerializer.cs @@ -12,10 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Models; using System.Collections.Generic; -using Microsoft.WindowsAzure.Commands.Common.Models; -namespace Microsoft.WindowsAzure.Commands.Common.Interfaces +namespace Microsoft.Azure.Common.Extensions.Interfaces { public interface IProfileSerializer { diff --git a/src/Common/Azure.Common.Extensions/MSSharedLibKey.snk b/src/Common/Azure.Common.Extensions/MSSharedLibKey.snk new file mode 100644 index 000000000000..695f1b38774e Binary files /dev/null and b/src/Common/Azure.Common.Extensions/MSSharedLibKey.snk differ diff --git a/src/Common/Commands.Common/Models/AzureAccount.Methods.cs b/src/Common/Azure.Common.Extensions/Models/AzureAccount.Methods.cs similarity index 97% rename from src/Common/Commands.Common/Models/AzureAccount.Methods.cs rename to src/Common/Azure.Common.Extensions/Models/AzureAccount.Methods.cs index 42601b42c788..a5a3a4a61cb3 100644 --- a/src/Common/Commands.Common/Models/AzureAccount.Methods.cs +++ b/src/Common/Azure.Common.Extensions/Models/AzureAccount.Methods.cs @@ -12,13 +12,13 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Common.Utilities; +using Microsoft.Azure.Common.Extensions.Utilities; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public partial class AzureAccount { diff --git a/src/Common/Commands.Common/Models/AzureAccount.cs b/src/Common/Azure.Common.Extensions/Models/AzureAccount.cs similarity index 96% rename from src/Common/Commands.Common/Models/AzureAccount.cs rename to src/Common/Azure.Common.Extensions/Models/AzureAccount.cs index 74f8db7fe841..3c6c819dc169 100644 --- a/src/Common/Commands.Common/Models/AzureAccount.cs +++ b/src/Common/Azure.Common.Extensions/Models/AzureAccount.cs @@ -14,7 +14,7 @@ using System.Collections.Generic; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public partial class AzureAccount { diff --git a/src/Common/Commands.Common/Models/AzureContext.cs b/src/Common/Azure.Common.Extensions/Models/AzureContext.cs similarity index 94% rename from src/Common/Commands.Common/Models/AzureContext.cs rename to src/Common/Azure.Common.Extensions/Models/AzureContext.cs index 06a21ba3ff41..5c01b60312b3 100644 --- a/src/Common/Commands.Common/Models/AzureContext.cs +++ b/src/Common/Azure.Common.Extensions/Models/AzureContext.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public class AzureContext { diff --git a/src/Common/Commands.Common/Models/AzureEnvironment.Methods.cs b/src/Common/Azure.Common.Extensions/Models/AzureEnvironment.Methods.cs similarity index 85% rename from src/Common/Commands.Common/Models/AzureEnvironment.Methods.cs rename to src/Common/Azure.Common.Extensions/Models/AzureEnvironment.Methods.cs index a4d3d0fee987..ac0aafbb806f 100644 --- a/src/Common/Commands.Common/Models/AzureEnvironment.Methods.cs +++ b/src/Common/Azure.Common.Extensions/Models/AzureEnvironment.Methods.cs @@ -12,13 +12,12 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Properties; +using Microsoft.Azure.Common.Extensions.Utilities; using System; using System.Collections.Generic; -using Microsoft.WindowsAzure.Commands.Common.Properties; -using Microsoft.WindowsAzure.Commands.Common.Utilities; -using Microsoft.WindowsAzure.Commands.Utilities.Common; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public partial class AzureEnvironment { @@ -280,4 +279,48 @@ public enum Endpoint TrafficManagerDnsSuffix, } } + + public static class EnvironmentName + { + public const string AzureCloud = "AzureCloud"; + + public const string AzureChinaCloud = "AzureChinaCloud"; + } + + public static class AzureEnvironmentConstants + { + public const string AzureServiceEndpoint = "https://management.core.windows.net/"; + + public const string ChinaServiceEndpoint = "https://management.core.chinacloudapi.cn/"; + + public const string AzureResourceManagerEndpoint = "https://management.azure.com/"; + + public const string GalleryEndpoint = "https://gallery.azure.com/"; + + public const string AzurePublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301775"; + + public const string ChinaPublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301776"; + + public const string AzureManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=254433"; + + public const string ChinaManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=301902"; + + public const string AzureStorageEndpointSuffix = "core.windows.net"; + + public const string ChinaStorageEndpointSuffix = "core.chinacloudapi.cn"; + + public const string AzureSqlDatabaseDnsSuffix = ".database.windows.net"; + + public const string ChinaSqlDatabaseDnsSuffix = ".database.chinacloudapi.cn"; + + public const string AzureActiveDirectoryEndpoint = "https://login.windows.net/"; + + public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/"; + + public const string AzureGraphEndpoint = "https://graph.windows.net/"; + + public const string AzureTrafficManagerDnsSuffix = "trafficmanager.net"; + + public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn"; + } } diff --git a/src/Common/Commands.Common/Models/AzureEnvironment.cs b/src/Common/Azure.Common.Extensions/Models/AzureEnvironment.cs similarity index 95% rename from src/Common/Commands.Common/Models/AzureEnvironment.cs rename to src/Common/Azure.Common.Extensions/Models/AzureEnvironment.cs index 085bad1fe55c..53d81ea10856 100644 --- a/src/Common/Commands.Common/Models/AzureEnvironment.cs +++ b/src/Common/Azure.Common.Extensions/Models/AzureEnvironment.cs @@ -14,7 +14,7 @@ using System.Collections.Generic; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public partial class AzureEnvironment { diff --git a/src/Common/Commands.Common/Models/AzureProfile.cs b/src/Common/Azure.Common.Extensions/Models/AzureProfile.cs similarity index 91% rename from src/Common/Commands.Common/Models/AzureProfile.cs rename to src/Common/Azure.Common.Extensions/Models/AzureProfile.cs index f7f8c77c80fd..519dde9279fc 100644 --- a/src/Common/Commands.Common/Models/AzureProfile.cs +++ b/src/Common/Azure.Common.Extensions/Models/AzureProfile.cs @@ -12,22 +12,20 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Interfaces; +using Microsoft.WindowsAzure.Common.Internals; using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Security.Cryptography.X509Certificates; -using Microsoft.WindowsAzure.Commands.Common.Interfaces; -using Microsoft.WindowsAzure.Common.Internals; -using System.Diagnostics; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public sealed class AzureProfile { private IDataStore store; private string profilePath; - private string tokenCacheFile = Path.Combine(AzurePowerShell.ProfileDirectory, AzurePowerShell.TokenCacheFile); + private string tokenCacheFile = Path.Combine(AzureSession.ProfileDirectory, AzureSession.TokenCacheFile); public AzureProfile() { @@ -51,9 +49,9 @@ private void Load() Accounts = new Dictionary(StringComparer.InvariantCultureIgnoreCase); ProfileLoadErrors = new List(); - if (!store.DirectoryExists(AzurePowerShell.ProfileDirectory)) + if (!store.DirectoryExists(AzureSession.ProfileDirectory)) { - store.CreateDirectory(AzurePowerShell.ProfileDirectory); + store.CreateDirectory(AzureSession.ProfileDirectory); } if (store.FileExists(profilePath)) diff --git a/src/Common/Commands.Common/Models/AzureSubscription.Methods.cs b/src/Common/Azure.Common.Extensions/Models/AzureSubscription.Methods.cs similarity index 94% rename from src/Common/Commands.Common/Models/AzureSubscription.Methods.cs rename to src/Common/Azure.Common.Extensions/Models/AzureSubscription.Methods.cs index 18025d898ad7..030f50f89f4b 100644 --- a/src/Common/Commands.Common/Models/AzureSubscription.Methods.cs +++ b/src/Common/Azure.Common.Extensions/Models/AzureSubscription.Methods.cs @@ -12,10 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Utilities; using System.Collections.Generic; -using Microsoft.WindowsAzure.Commands.Common.Utilities; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public partial class AzureSubscription { diff --git a/src/Common/Commands.Common/Models/AzureSubscription.cs b/src/Common/Azure.Common.Extensions/Models/AzureSubscription.cs similarity index 97% rename from src/Common/Commands.Common/Models/AzureSubscription.cs rename to src/Common/Azure.Common.Extensions/Models/AzureSubscription.cs index 252100c4906a..b5d6cb6b73d6 100644 --- a/src/Common/Commands.Common/Models/AzureSubscription.cs +++ b/src/Common/Azure.Common.Extensions/Models/AzureSubscription.cs @@ -15,7 +15,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public partial class AzureSubscription { diff --git a/src/Common/Commands.Common/Models/DiskDataStore.cs b/src/Common/Azure.Common.Extensions/Models/DiskDataStore.cs similarity index 96% rename from src/Common/Commands.Common/Models/DiskDataStore.cs rename to src/Common/Azure.Common.Extensions/Models/DiskDataStore.cs index 8cc5e29b9e00..c42bb358538b 100644 --- a/src/Common/Commands.Common/Models/DiskDataStore.cs +++ b/src/Common/Azure.Common.Extensions/Models/DiskDataStore.cs @@ -12,15 +12,14 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Interfaces; +using Microsoft.Azure.Common.Extensions.Properties; using System; using System.IO; using System.Security.Cryptography.X509Certificates; using System.Text; -using Microsoft.WindowsAzure.Commands.Common.Interfaces; -using Microsoft.WindowsAzure.Commands.Common.Properties; -using Microsoft.WindowsAzure.Commands.Utilities.Common; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public class DiskDataStore : IDataStore { diff --git a/src/Common/Azure.Common.Extensions/Models/IClientAction.cs b/src/Common/Azure.Common.Extensions/Models/IClientAction.cs new file mode 100644 index 000000000000..e05ff570b7b0 --- /dev/null +++ b/src/Common/Azure.Common.Extensions/Models/IClientAction.cs @@ -0,0 +1,25 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +using Microsoft.WindowsAzure.Common; + +namespace Microsoft.Azure.Common.Extensions.Models +{ + public interface IClientAction + { + IClientFactory ClientFactory { get; set; } + + void Apply(TClient client, AzureContext context, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient; + } +} diff --git a/src/Common/Commands.Common/Models/JsonProfileSerializer.cs b/src/Common/Azure.Common.Extensions/Models/JsonProfileSerializer.cs similarity index 96% rename from src/Common/Commands.Common/Models/JsonProfileSerializer.cs rename to src/Common/Azure.Common.Extensions/Models/JsonProfileSerializer.cs index ea0a6a272f59..29ddb1c1400c 100644 --- a/src/Common/Commands.Common/Models/JsonProfileSerializer.cs +++ b/src/Common/Azure.Common.Extensions/Models/JsonProfileSerializer.cs @@ -12,14 +12,14 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Interfaces; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; -using Microsoft.WindowsAzure.Commands.Common.Interfaces; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public class JsonProfileSerializer : IProfileSerializer { diff --git a/src/Common/Commands.Common/Common/AzurePowerShellClientFactory.cs b/src/Common/Azure.Common.Extensions/Models/RPRegistrationAction.cs similarity index 70% rename from src/Common/Commands.Common/Common/AzurePowerShellClientFactory.cs rename to src/Common/Azure.Common.Extensions/Models/RPRegistrationAction.cs index 4f0c95b568d9..1d8cc5ce350a 100644 --- a/src/Common/Commands.Common/Common/AzurePowerShellClientFactory.cs +++ b/src/Common/Azure.Common.Extensions/Models/RPRegistrationAction.cs @@ -13,38 +13,18 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Management.Resources; -using Microsoft.WindowsAzure.Commands.Common.Factories; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Common; -using System.Net; -using System.Linq; -using System.Collections.Generic; using Microsoft.WindowsAzure.Management; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Net; -namespace Microsoft.WindowsAzure.Commands.Common.Common +namespace Microsoft.Azure.Common.Extensions.Models { - public class AzurePowerShellClientFactory : ClientFactory + public class RPRegistrationAction : IClientAction { - public override TClient CreateClient(AzureContext context, AzureEnvironment.Endpoint endpoint) - { - TClient client = base.CreateClient(context, endpoint); - - if (!TestMockSupport.RunningMocked) - { - if (endpoint == AzureEnvironment.Endpoint.ServiceManagement) - { - RegisterServiceManagementProviders(context); - } - else if (endpoint == AzureEnvironment.Endpoint.ResourceManager) - { - RegisterResourceManagerProviders(context); - } - } - - return client; - } - /// /// Registers resource providers for Sparta. /// @@ -59,7 +39,7 @@ private void RegisterResourceManagerProviders(AzureContext context) where T : if (unregisteredProviders.Count > 0) { - using (var client = CreateCustomClient(creds, context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager))) + using (var client = ClientFactory.CreateCustomClient(creds, context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager))) { foreach (string provider in unregisteredProviders) { @@ -119,24 +99,40 @@ private void RegisterServiceManagementProviders(AzureContext context) where T } } - private void UpdateSubscriptionRegisteredProviders(AzureSubscription subscription, List providers) + private void UpdateSubscriptionRegisteredProviders(AzureSubscription subscription, List providers) + { + if (providers != null && providers.Count > 0) + { + subscription.SetOrAppendProperty(AzureSubscription.Property.RegisteredResourceProviders, + providers.ToArray()); + try + { + ProfileClient profileClient = new ProfileClient(); + profileClient.AddOrSetSubscription(subscription); + profileClient.Profile.Save(); + } + catch (KeyNotFoundException) + { + // if using a subscription data file, do not write registration to disk + // long term solution is using -Profile parameter + } + } + } + + public void Apply(TClient client, AzureContext context, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient { -     if (providers != null && providers.Count > 0) -     { -         subscription.SetOrAppendProperty(AzureSubscription.Property.RegisteredResourceProviders, -             providers.ToArray()); -         try -         { -             ProfileClient profileClient = new ProfileClient(); -             profileClient.AddOrSetSubscription(subscription); -             profileClient.Profile.Save(); -         } -         catch (KeyNotFoundException) -         { -             // if using a subscription data file, do not write registration to disk -             // long term solution is using -Profile parameter -         } -     } + Debug.Assert(ClientFactory != null); + + if (endpoint == AzureEnvironment.Endpoint.ServiceManagement) + { + RegisterServiceManagementProviders(context); + } + else if (endpoint == AzureEnvironment.Endpoint.ResourceManager) + { + RegisterResourceManagerProviders(context); + } } + + public IClientFactory ClientFactory { get; set; } } } diff --git a/src/Common/Commands.Common/Models/XmlProfileSerializer.cs b/src/Common/Azure.Common.Extensions/Models/XmlProfileSerializer.cs similarity index 95% rename from src/Common/Commands.Common/Models/XmlProfileSerializer.cs rename to src/Common/Azure.Common.Extensions/Models/XmlProfileSerializer.cs index eed2616eacd9..f7290949bbfd 100644 --- a/src/Common/Commands.Common/Models/XmlProfileSerializer.cs +++ b/src/Common/Azure.Common.Extensions/Models/XmlProfileSerializer.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Interfaces; using System; using System.Collections.Generic; using System.Diagnostics; @@ -19,11 +20,8 @@ using System.Linq; using System.Runtime.Serialization; using System.Text; -using System.Xml; -using Microsoft.WindowsAzure.Commands.Common.Interfaces; -using Microsoft.WindowsAzure.Commands.Utilities.Common; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public class XmlProfileSerializer : IProfileSerializer { diff --git a/src/Common/Azure.Common.Extensions/Properties/AssemblyInfo.cs b/src/Common/Azure.Common.Extensions/Properties/AssemblyInfo.cs new file mode 100644 index 000000000000..3883f62d91bf --- /dev/null +++ b/src/Common/Azure.Common.Extensions/Properties/AssemblyInfo.cs @@ -0,0 +1,28 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +using System; +using System.Reflection; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("Azure Common Extensions")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Microsoft Azure Libraries")] +[assembly: AssemblyCopyright("Copyright © Microsoft")] + +[assembly: ComVisible(false)] +[assembly: CLSCompliant(false)] +[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")] +[assembly: AssemblyVersion("0.1.0")] +[assembly: AssemblyFileVersion("0.1.0")] \ No newline at end of file diff --git a/src/Common/Azure.Common.Extensions/Properties/Resources.Designer.cs b/src/Common/Azure.Common.Extensions/Properties/Resources.Designer.cs new file mode 100644 index 000000000000..4254763922a4 --- /dev/null +++ b/src/Common/Azure.Common.Extensions/Properties/Resources.Designer.cs @@ -0,0 +1,4272 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.34014 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Microsoft.Azure.Common.Extensions.Properties +{ + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Azure.Common.Extensions.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to The remote server returned an error: (401) Unauthorized.. + /// + public static string AccessDeniedExceptionMessage { + get { + return ResourceManager.GetString("AccessDeniedExceptionMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Account id doesn't match one in subscription.. + /// + public static string AccountIdDoesntMatchSubscription { + get { + return ResourceManager.GetString("AccountIdDoesntMatchSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Account "{0}" has been added.. + /// + public static string AddAccountAdded { + get { + return ResourceManager.GetString("AddAccountAdded", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to To switch to a different subscription, please use Select-AzureSubscription.. + /// + public static string AddAccountChangeSubscription { + get { + return ResourceManager.GetString("AddAccountChangeSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Skipping external tenant {0}, because you are using a guest or a foreign principal object identity. In order to access this tenant, please run Add-AzureAccount without "-Credential".. + /// + public static string AddAccountNonInteractiveGuestOrFpo { + get { + return ResourceManager.GetString("AddAccountNonInteractiveGuestOrFpo", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Subscription "{0}" is selected as the default subscription.. + /// + public static string AddAccountShowDefaultSubscription { + get { + return ResourceManager.GetString("AddAccountShowDefaultSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to To view all the subscriptions, please use Get-AzureSubscription.. + /// + public static string AddAccountViewSubscriptions { + get { + return ResourceManager.GetString("AddAccountViewSubscriptions", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add-On {0} is created successfully.. + /// + public static string AddOnCreatedMessage { + get { + return ResourceManager.GetString("AddOnCreatedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add-on name {0} is already used.. + /// + public static string AddOnNameAlreadyUsed { + get { + return ResourceManager.GetString("AddOnNameAlreadyUsed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add-On {0} not found.. + /// + public static string AddOnNotFound { + get { + return ResourceManager.GetString("AddOnNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add-on {0} is removed successfully.. + /// + public static string AddOnRemovedMessage { + get { + return ResourceManager.GetString("AddOnRemovedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add-On {0} is updated successfully.. + /// + public static string AddOnUpdatedMessage { + get { + return ResourceManager.GetString("AddOnUpdatedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role has been created at {0}\{1}.. + /// + public static string AddRoleMessageCreate { + get { + return ResourceManager.GetString("AddRoleMessageCreate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for Node.js by running ‘npm install azure’.. + /// + public static string AddRoleMessageCreateNode { + get { + return ResourceManager.GetString("AddRoleMessageCreateNode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for PHP by running "pear Azure/Azure".. + /// + public static string AddRoleMessageCreatePHP { + get { + return ResourceManager.GetString("AddRoleMessageCreatePHP", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for Python by running "pip Azure".. + /// + public static string AddRoleMessageCreatePython { + get { + return ResourceManager.GetString("AddRoleMessageCreatePython", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to set role permissions. Please give the 'Network Service' user 'Read & execute' and 'Modify' permissions to the role folder, or run PowerShell as an Administrator. + /// + public static string AddRoleMessageInsufficientPermissions { + get { + return ResourceManager.GetString("AddRoleMessageInsufficientPermissions", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A role name '{0}' already exists. + /// + public static string AddRoleMessageRoleExists { + get { + return ResourceManager.GetString("AddRoleMessageRoleExists", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Profile {0} already has an endpoint with name {1}. + /// + public static string AddTrafficManagerEndpointFailed { + get { + return ResourceManager.GetString("AddTrafficManagerEndpointFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Windows Azure Powershell\. + /// + public static string AzureDirectory { + get { + return ResourceManager.GetString("AzureDirectory", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Windows Azure Powershell. + /// + public static string AzureDirectoryName { + get { + return ResourceManager.GetString("AzureDirectoryName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Emulator. + /// + public static string AzureEmulatorDirectory { + get { + return ResourceManager.GetString("AzureEmulatorDirectory", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Azure Emulator is not installed and is required. + /// + public static string AzureEmulatorNotInstalledMessage { + get { + return ResourceManager.GetString("AzureEmulatorNotInstalledMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Azure Emulator\emulator. + /// + public static string AzureEmulatorPathPortion { + get { + return ResourceManager.GetString("AzureEmulatorPathPortion", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SOFTWARE\Microsoft\Windows Azure Emulator. + /// + public static string AzureEmulatorRegistryKey { + get { + return ResourceManager.GetString("AzureEmulatorRegistryKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Azure service management error + ///{0}. + /// + public static string AzureException_WrapExistingError_DetailedErrorFormat { + get { + return ResourceManager.GetString("AzureException_WrapExistingError_DetailedErrorFormat", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to https://manage.Azure.com. + /// + public static string AzurePortalUrl { + get { + return ResourceManager.GetString("AzurePortalUrl", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AZURE_PORTAL_URL. + /// + public static string AzurePortalUrlEnv { + get { + return ResourceManager.GetString("AzurePortalUrlEnv", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Azure SDK\{0}\. + /// + public static string AzureSdkDirectory { + get { + return ResourceManager.GetString("AzureSdkDirectory", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to InstallPath. + /// + public static string AzureSdkInstallPathRegistryKeyValue { + get { + return ResourceManager.GetString("AzureSdkInstallPathRegistryKeyValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SOFTWARE\Microsoft\Microsoft SDKs\ServiceHosting. + /// + public static string AzureSdkRegistryKeyName { + get { + return ResourceManager.GetString("AzureSdkRegistryKeyName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The installed Azure SDK version is not supported. Make sure you version is between {0} and {1} inclusive. + /// + public static string AzureSdkVersionNotSupported { + get { + return ResourceManager.GetString("AzureSdkVersionNotSupported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Azure Authoring Tools are not installed and are required. Installation of Azure SDK for .NET is recommended with Microsoft Web Platform Installer (PI) available at http://www.microsoft.com/web/downloads/platform.aspx.. + /// + public static string AzureToolsNotInstalledMessage { + get { + return ResourceManager.GetString("AzureToolsNotInstalledMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Base Uri was empty.. + /// + public static string BaseUriEmpty { + get { + return ResourceManager.GetString("BaseUriEmpty", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} begin processing without ParameterSet.. + /// + public static string BeginProcessingWithoutParameterSetLog { + get { + return ResourceManager.GetString("BeginProcessingWithoutParameterSetLog", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} begin processing with ParameterSet '{1}'.. + /// + public static string BeginProcessingWithParameterSetLog { + get { + return ResourceManager.GetString("BeginProcessingWithParameterSetLog", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Blob with the name {0} already exists in the account.. + /// + public static string BlobAlreadyExistsInTheAccount { + get { + return ResourceManager.GetString("BlobAlreadyExistsInTheAccount", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to https://{0}.blob.core.windows.net/. + /// + public static string BlobEndpointUri { + get { + return ResourceManager.GetString("BlobEndpointUri", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AZURE_BLOBSTORAGE_TEMPLATE. + /// + public static string BlobEndpointUriEnv { + get { + return ResourceManager.GetString("BlobEndpointUriEnv", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Memcache is already enabled for role '{0}'.. + /// + public static string CacheAlreadyEnabledMessage { + get { + return ResourceManager.GetString("CacheAlreadyEnabledMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to <configuration> + /// <configSections> + /// <section name="dataCacheClients" type="Microsoft.ApplicationServer.Caching.DataCacheClientsSection, Microsoft.ApplicationServer.Caching.Core" allowLocation="true" allowDefinition="Everywhere" /> + /// </configSections> + /// <dataCacheClients> + /// <tracing sinkType="DiagnosticSink" traceLevel="Error" /> + /// <dataCacheClient name="DefaultShimConfig" useLegacyProtocol="false"> + /// <autoDiscover isEnabled="true" identifier="$RoleName$" /> + /// </dataCacheClient> + /// </da [rest of string was truncated]";. + /// + public static string CacheAutoDiscoveryConfig { + get { + return ResourceManager.GetString("CacheAutoDiscoveryConfig", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.Azure.Plugins.Caching.ClientDiagnosticLevel. + /// + public static string CacheClientDiagnosticLevelAssemblyName { + get { + return ResourceManager.GetString("CacheClientDiagnosticLevelAssemblyName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DiagnosticStore. + /// + public static string CacheDiagnosticStoreName { + get { + return ResourceManager.GetString("CacheDiagnosticStoreName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please upgrade the cache runtime of role '{0}' to '{1}' using Set-AzureServiceProjectRole -RoleName {0} -Runtime Cache -Version {1}. + /// + public static string CacheMismatchMessage { + get { + return ResourceManager.GetString("CacheMismatchMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CACHERUNTIMEURL. + /// + public static string CacheRuntimeUrl { + get { + return ResourceManager.GetString("CacheRuntimeUrl", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to cache. + /// + public static string CacheRuntimeValue { + get { + return ResourceManager.GetString("CacheRuntimeValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to CacheRuntimeVersion. + /// + public static string CacheRuntimeVersionKey { + get { + return ResourceManager.GetString("CacheRuntimeVersionKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resources\Scaffolding\Cache. + /// + public static string CacheScaffolding { + get { + return ResourceManager.GetString("CacheScaffolding", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to setup_cache.cmd > cache_log.txt. + /// + public static string CacheStartupCommand { + get { + return ResourceManager.GetString("CacheStartupCommand", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Installing caching version {0} for Role '{1}' (the caching version locally installed is: {2}). + /// + public static string CacheVersionWarningText { + get { + return ResourceManager.GetString("CacheVersionWarningText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.Azure.Plugins.Caching.CacheSizePercentage. + /// + public static string CachingCacheSizePercentageSettingName { + get { + return ResourceManager.GetString("CachingCacheSizePercentageSettingName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.Azure.Plugins.Caching.ConfigStoreConnectionString. + /// + public static string CachingConfigStoreConnectionStringSettingName { + get { + return ResourceManager.GetString("CachingConfigStoreConnectionStringSettingName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1}. + /// + public static string CachingConfigStoreConnectionStringSettingValue { + get { + return ResourceManager.GetString("CachingConfigStoreConnectionStringSettingValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Caching. + /// + public static string CachingModuleName { + get { + return ResourceManager.GetString("CachingModuleName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot find {0} with name {1}.. + /// + public static string CannotFind { + get { + return ResourceManager.GetString("CannotFind", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deployment for service {0} with {1} slot doesn't exist. + /// + public static string CannotFindDeployment { + get { + return ResourceManager.GetString("CannotFindDeployment", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Can't find valid Microsoft Azure role in current directory {0}. + /// + public static string CannotFindRole { + get { + return ResourceManager.GetString("CannotFindRole", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to service {0} configuration file (ServiceConfiguration.Cloud.cscfg) is either null or doesn't exist. + /// + public static string CannotFindServiceConfigurationFile { + get { + return ResourceManager.GetString("CannotFindServiceConfigurationFile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid service path! Cannot locate ServiceDefinition.csdef in current folder or parent folders.. + /// + public static string CannotFindServiceRoot { + get { + return ResourceManager.GetString("CannotFindServiceRoot", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The subscription named {0} with id {1} is not currently imported. You must import this subscription before it can be updated.. + /// + public static string CannotUpdateUnknownSubscription { + get { + return ResourceManager.GetString("CannotUpdateUnknownSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ManagementCertificate. + /// + public static string CertificateElementName { + get { + return ResourceManager.GetString("CertificateElementName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to certificate.pfx. + /// + public static string CertificateFileName { + get { + return ResourceManager.GetString("CertificateFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Certificate imported into CurrentUser\My\{0}. + /// + public static string CertificateImportedMessage { + get { + return ResourceManager.GetString("CertificateImportedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No certificate was found in the certificate store with thumbprint {0}. + /// + public static string CertificateNotFoundInStore { + get { + return ResourceManager.GetString("CertificateNotFoundInStore", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No certificate was found in the certificate store with thumbprint {0}. + /// + public static string CertificateNotFoundInStore1 { + get { + return ResourceManager.GetString("CertificateNotFoundInStore1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Your account does not have access to the private key for certificate {0}. + /// + public static string CertificatePrivateKeyAccessError { + get { + return ResourceManager.GetString("CertificatePrivateKeyAccessError", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} {1} deployment for {2} service. + /// + public static string ChangeDeploymentStateWaitMessage { + get { + return ResourceManager.GetString("ChangeDeploymentStateWaitMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cloud service {0} is in {1} state.. + /// + public static string ChangeDeploymentStatusCompleteMessage { + get { + return ResourceManager.GetString("ChangeDeploymentStatusCompleteMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Changing/Removing public environment '{0}' is not allowed.. + /// + public static string ChangePublicEnvironmentMessage { + get { + return ResourceManager.GetString("ChangePublicEnvironmentMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Service {0} is set to value {1}. + /// + public static string ChangeSettingsElementMessage { + get { + return ResourceManager.GetString("ChangeSettingsElementMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Changing public environment is not supported.. + /// + public static string ChangingDefaultEnvironmentNotSupported { + get { + return ResourceManager.GetString("ChangingDefaultEnvironmentNotSupported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Choose which publish settings file to use:. + /// + public static string ChoosePublishSettingsFile { + get { + return ResourceManager.GetString("ChoosePublishSettingsFile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.Azure.Plugins.Caching.ClientDiagnosticLevel. + /// + public static string ClientDiagnosticLevelName { + get { + return ResourceManager.GetString("ClientDiagnosticLevelName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 1. + /// + public static string ClientDiagnosticLevelValue { + get { + return ResourceManager.GetString("ClientDiagnosticLevelValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to cloud_package.cspkg. + /// + public static string CloudPackageFileName { + get { + return ResourceManager.GetString("CloudPackageFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ServiceConfiguration.Cloud.cscfg. + /// + public static string CloudServiceConfigurationFileName { + get { + return ResourceManager.GetString("CloudServiceConfigurationFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add-ons for {0}. + /// + public static string CloudServiceDescription { + get { + return ResourceManager.GetString("CloudServiceDescription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Communication could not be established. This could be due to an invalid subscription ID. Note that subscription IDs are case sensitive.. + /// + public static string CommunicationCouldNotBeEstablished { + get { + return ResourceManager.GetString("CommunicationCouldNotBeEstablished", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Complete. + /// + public static string CompleteMessage { + get { + return ResourceManager.GetString("CompleteMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Complete. + /// + public static string CompleteMessage1 { + get { + return ResourceManager.GetString("CompleteMessage1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to config.json. + /// + public static string ConfigurationFileName { + get { + return ResourceManager.GetString("ConfigurationFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to VirtualMachine creation failed.. + /// + public static string CreateFailedErrorMessage { + get { + return ResourceManager.GetString("CreateFailedErrorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Creating the website failed. If this is the first website for this subscription, please create it using the management portal instead.. + /// + public static string CreateWebsiteFailed { + get { + return ResourceManager.GetString("CreateWebsiteFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to -Credential parameter can only be used with Organization ID credentials. For more information, please refer to http://go.microsoft.com/fwlink/?linkid=331007&clcid=0x409 for more information about the difference between an organizational account and a Microsoft account.. + /// + public static string CredentialOrganizationIdMessage { + get { + return ResourceManager.GetString("CredentialOrganizationIdMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.ApplicationServer.Caching.DataCacheClientsSection, Microsoft.ApplicationServer.Caching.Core. + /// + public static string DataCacheClientsType { + get { + return ResourceManager.GetString("DataCacheClientsType", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to //blobcontainer[@datacenter='{0}']. + /// + public static string DatacenterBlobQuery { + get { + return ResourceManager.GetString("DatacenterBlobQuery", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Setting: {0} as the default and current subscription. To view other subscriptions use Get-AzureSubscription. + /// + public static string DefaultAndCurrentSubscription { + get { + return ResourceManager.GetString("DefaultAndCurrentSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to none. + /// + public static string DefaultFileVersion { + get { + return ResourceManager.GetString("DefaultFileVersion", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to There are no hostnames which could be used for validation.. + /// + public static string DefaultHostnamesValidation { + get { + return ResourceManager.GetString("DefaultHostnamesValidation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 8080. + /// + public static string DefaultPort { + get { + return ResourceManager.GetString("DefaultPort", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 1000. + /// + public static string DefaultRoleCachingInMB { + get { + return ResourceManager.GetString("DefaultRoleCachingInMB", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Auto. + /// + public static string DefaultUpgradeMode { + get { + return ResourceManager.GetString("DefaultUpgradeMode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 80. + /// + public static string DefaultWebPort { + get { + return ResourceManager.GetString("DefaultWebPort", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Delete. + /// + public static string Delete { + get { + return ResourceManager.GetString("Delete", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The {0} slot for service {1} is already in {2} state. + /// + public static string DeploymentAlreadyInState { + get { + return ResourceManager.GetString("DeploymentAlreadyInState", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The deployment in {0} slot for service {1} is removed. + /// + public static string DeploymentRemovedMessage { + get { + return ResourceManager.GetString("DeploymentRemovedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.Azure.Plugins.Caching.DiagnosticLevel. + /// + public static string DiagnosticLevelName { + get { + return ResourceManager.GetString("DiagnosticLevelName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 1. + /// + public static string DiagnosticLevelValue { + get { + return ResourceManager.GetString("DiagnosticLevelValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The key to add already exists in the dictionary.. + /// + public static string DictionaryAddAlreadyContainsKey { + get { + return ResourceManager.GetString("DictionaryAddAlreadyContainsKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The array index cannot be less than zero.. + /// + public static string DictionaryCopyToArrayIndexLessThanZero { + get { + return ResourceManager.GetString("DictionaryCopyToArrayIndexLessThanZero", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The supplied array does not have enough room to contain the copied elements.. + /// + public static string DictionaryCopyToArrayTooShort { + get { + return ResourceManager.GetString("DictionaryCopyToArrayTooShort", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided dns {0} doesn't exist. + /// + public static string DnsDoesNotExist { + get { + return ResourceManager.GetString("DnsDoesNotExist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft Azure Certificate. + /// + public static string EnableRemoteDesktop_FriendlyCertificateName { + get { + return ResourceManager.GetString("EnableRemoteDesktop_FriendlyCertificateName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Endpoint can't be retrieved for storage account. + /// + public static string EndPointNotFoundForBlobStorage { + get { + return ResourceManager.GetString("EndPointNotFoundForBlobStorage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} end processing.. + /// + public static string EndProcessingLog { + get { + return ResourceManager.GetString("EndProcessingLog", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to To use Active Directory authentication, you must configure the ActiveDirectoryEndpoint, ActiveDirectoryTenantId, and ActiveDirectorServiceEndpointResourceId for environment of '{0}'. You can configure these properties for this environment using the Set-AzureEnvironment cmdlet.. + /// + public static string EnvironmentDoesNotSupportActiveDirectory { + get { + return ResourceManager.GetString("EnvironmentDoesNotSupportActiveDirectory", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The environment '{0}' already exists.. + /// + public static string EnvironmentExists { + get { + return ResourceManager.GetString("EnvironmentExists", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Environment name doesn't match one in subscription.. + /// + public static string EnvironmentNameDoesntMatchSubscription { + get { + return ResourceManager.GetString("EnvironmentNameDoesntMatchSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The environment name '{0}' is not found.. + /// + public static string EnvironmentNotFound { + get { + return ResourceManager.GetString("EnvironmentNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to environments.xml. + /// + public static string EnvironmentsFileName { + get { + return ResourceManager.GetString("EnvironmentsFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error creating VirtualMachine. + /// + public static string ErrorCreatingVirtualMachine { + get { + return ResourceManager.GetString("ErrorCreatingVirtualMachine", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to download available runtimes for location '{0}'. + /// + public static string ErrorRetrievingRuntimesForLocation { + get { + return ResourceManager.GetString("ErrorRetrievingRuntimesForLocation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error updating VirtualMachine. + /// + public static string ErrorUpdatingVirtualMachine { + get { + return ResourceManager.GetString("ErrorUpdatingVirtualMachine", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Your Microsoft Azure credential in the Windows PowerShell session has expired. Please use Add-AzureAccount to login again.. + /// + public static string ExpiredRefreshToken { + get { + return ResourceManager.GetString("ExpiredRefreshToken", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Job Id {0} failed. Error: {1}, ExceptionDetails: {2}. + /// + public static string FailedJobErrorMessage { + get { + return ResourceManager.GetString("FailedJobErrorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The HTTP request was forbidden with client authentication scheme 'Anonymous'.. + /// + public static string FirstPurchaseErrorMessage { + get { + return ResourceManager.GetString("FirstPurchaseErrorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to This add-on requires you to purchase the first instance through the Microsoft Azure Portal. Subsequent purchases can be performed through PowerShell.. + /// + public static string FirstPurchaseMessage { + get { + return ResourceManager.GetString("FirstPurchaseMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Operation Status:. + /// + public static string GatewayOperationStatus { + get { + return ResourceManager.GetString("GatewayOperationStatus", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resources\Scaffolding\General. + /// + public static string GeneralScaffolding { + get { + return ResourceManager.GetString("GeneralScaffolding", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Getting all available Microsoft Azure Add-Ons, this may take few minutes.... + /// + public static string GetAllAddOnsWaitMessage { + get { + return ResourceManager.GetString("GetAllAddOnsWaitMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Name{0}Primary Key{0}Seconday Key. + /// + public static string GetStorageKeysHeader { + get { + return ResourceManager.GetString("GetStorageKeysHeader", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Git not found. Please install git and place it in your command line path.. + /// + public static string GitNotFound { + get { + return ResourceManager.GetString("GitNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Could not find publish settings. Please run Import-AzurePublishSettingsFile.. + /// + public static string GlobalSettingsManager_Load_PublishSettingsNotFound { + get { + return ResourceManager.GetString("GlobalSettingsManager_Load_PublishSettingsNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Could not find publish settings. Please run Import-AzurePublishSettingsFile.. + /// + public static string GlobalSettingsManager_Load_PublishSettingsNotFound1 { + get { + return ResourceManager.GetString("GlobalSettingsManager_Load_PublishSettingsNotFound1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to iisnode.dll. + /// + public static string IISNodeDll { + get { + return ResourceManager.GetString("IISNodeDll", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to iisnode. + /// + public static string IISNodeEngineKey { + get { + return ResourceManager.GetString("IISNodeEngineKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to iisnode-dev\\release\\x64. + /// + public static string IISNodePath { + get { + return ResourceManager.GetString("IISNodePath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to iisnode. + /// + public static string IISNodeRuntimeValue { + get { + return ResourceManager.GetString("IISNodeRuntimeValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Installing IISNode version {0} in Azure for WebRole '{1}' (the version locally installed is: {2}). + /// + public static string IISNodeVersionWarningText { + get { + return ResourceManager.GetString("IISNodeVersionWarningText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Illegal characters in path.. + /// + public static string IllegalPath { + get { + return ResourceManager.GetString("IllegalPath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Illegal characters in path.. + /// + public static string IllegalPath1 { + get { + return ResourceManager.GetString("IllegalPath1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Internal Server Error. + /// + public static string InternalServerErrorMessage { + get { + return ResourceManager.GetString("InternalServerErrorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot enable memcach protocol on a cache worker role {0}.. + /// + public static string InvalidCacheRoleName { + get { + return ResourceManager.GetString("InvalidCacheRoleName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid certificate format. Publish settings may be corrupted. Use Get-AzurePublishSettingsFile to download updated settings. + /// + public static string InvalidCertificate { + get { + return ResourceManager.GetString("InvalidCertificate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid certificate format. Publish settings may be corrupted. Use Get-AzurePublishSettingsFile to download updated settings. + /// + public static string InvalidCertificate1 { + get { + return ResourceManager.GetString("InvalidCertificate1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid certificate format.. + /// + public static string InvalidCertificateSingle { + get { + return ResourceManager.GetString("InvalidCertificateSingle", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided configuration path is invalid or doesn't exist. + /// + public static string InvalidConfigPath { + get { + return ResourceManager.GetString("InvalidConfigPath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The country name is invalid, please use a valid two character country code, as described in ISO 3166-1 alpha-2.. + /// + public static string InvalidCountryNameMessage { + get { + return ResourceManager.GetString("InvalidCountryNameMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Credential type invalid, only handles '{0}'. + /// + public static string InvalidCredentialType { + get { + return ResourceManager.GetString("InvalidCredentialType", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No current subscription has been designated. Use Select-AzureSubscription -Current <subscriptionName> to set the current subscription.. + /// + public static string InvalidCurrentSubscription { + get { + return ResourceManager.GetString("InvalidCurrentSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The ID of the current subscription is invalid. Use Set-AzureSubscription to fix the subscription ID or use Select-AzureSubscription to use a different subscription.. + /// + public static string InvalidCurrentSubscriptionId { + get { + return ResourceManager.GetString("InvalidCurrentSubscriptionId", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The management certificate of the current subscription is invalid. Use Set-AzureSubscription to fix the management certificate or use Select-AzureSubscription to use a different subscription.. + /// + public static string InvalidCurrentSuscriptionCertificate { + get { + return ResourceManager.GetString("InvalidCurrentSuscriptionCertificate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No default subscription has been designated. Use Select-AzureSubscription -Default <subscriptionName> to set the default subscription.. + /// + public static string InvalidDefaultSubscription { + get { + return ResourceManager.GetString("InvalidDefaultSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deployment with {0} does not exist. + /// + public static string InvalidDeployment { + get { + return ResourceManager.GetString("InvalidDeployment", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The deployment slot name {0} is invalid. Slot name must be either "Staging" or "Production".. + /// + public static string InvalidDeploymentSlot { + get { + return ResourceManager.GetString("InvalidDeploymentSlot", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to "{0}" is an invalid DNS name for {1}. + /// + public static string InvalidDnsName { + get { + return ResourceManager.GetString("InvalidDnsName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid service endpoint.. + /// + public static string InvalidEndpoint { + get { + return ResourceManager.GetString("InvalidEndpoint", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided file in {0} must be have {1} extension. + /// + public static string InvalidFileExtension { + get { + return ResourceManager.GetString("InvalidFileExtension", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to File {0} has invalid characters. + /// + public static string InvalidFileName { + get { + return ResourceManager.GetString("InvalidFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You must create your git publishing credentials using the Microsoft Azure portal. + ///Please follow these steps in the portal: + ///1. On the left side open "Web Sites" + ///2. Click on any website + ///3. Choose "Setup Git Publishing" or "Reset deployment credentials" + ///4. Back in the PowerShell window, rerun this command by typing "New-AzureWebSite {site name} -Git -PublishingUsername {username}. + /// + public static string InvalidGitCredentials { + get { + return ResourceManager.GetString("InvalidGitCredentials", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The value {0} provided is not a valid GUID. Please provide a valid GUID.. + /// + public static string InvalidGuid { + get { + return ResourceManager.GetString("InvalidGuid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The specified hostname does not exist. Please specify a valid hostname for the site.. + /// + public static string InvalidHostnameValidation { + get { + return ResourceManager.GetString("InvalidHostnameValidation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role {0} instances must be greater than or equal 0 and less than or equal 20. + /// + public static string InvalidInstancesCount { + get { + return ResourceManager.GetString("InvalidInstancesCount", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to There was an error creating your webjob. Please make sure that the script is in the root folder of the zip file.. + /// + public static string InvalidJobFile { + get { + return ResourceManager.GetString("InvalidJobFile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot create instance of management client type {0}. It does not have the expected constructor.. + /// + public static string InvalidManagementClientType { + get { + return ResourceManager.GetString("InvalidManagementClientType", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Could not download a valid runtime manifest, Please check your internet connection and try again.. + /// + public static string InvalidManifestError { + get { + return ResourceManager.GetString("InvalidManifestError", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The account {0} was not found. Please specify a valid account name.. + /// + public static string InvalidMediaServicesAccount { + get { + return ResourceManager.GetString("InvalidMediaServicesAccount", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided name "{0}" does not match the service bus namespace naming rules.. + /// + public static string InvalidNamespaceName { + get { + return ResourceManager.GetString("InvalidNamespaceName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Value cannot be null. Parameter name: '{0}'. + /// + public static string InvalidNullArgument { + get { + return ResourceManager.GetString("InvalidNullArgument", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} is invalid or empty. + /// + public static string InvalidOrEmptyArgumentMessage { + get { + return ResourceManager.GetString("InvalidOrEmptyArgumentMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided package path is invalid or doesn't exist. + /// + public static string InvalidPackagePath { + get { + return ResourceManager.GetString("InvalidPackagePath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to '{0}' is an invalid parameter set name.. + /// + public static string InvalidParameterSetName { + get { + return ResourceManager.GetString("InvalidParameterSetName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} doesn't exist in {1} or you've not passed valid value for it. + /// + public static string InvalidPath { + get { + return ResourceManager.GetString("InvalidPath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Path {0} has invalid characters. + /// + public static string InvalidPathName { + get { + return ResourceManager.GetString("InvalidPathName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided publish settings file {0} has invalid content. Please get valid by running cmdlet Get-AzurePublishSettingsFile. + /// + public static string InvalidPublishSettingsSchema { + get { + return ResourceManager.GetString("InvalidPublishSettingsSchema", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided publish settings file {0} has invalid content. Please get valid by running cmdlet Get-AzurePublishSettingsFile. + /// + public static string InvalidPublishSettingsSchema1 { + get { + return ResourceManager.GetString("InvalidPublishSettingsSchema1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided role name "{0}" has invalid characters. + /// + public static string InvalidRoleNameMessage { + get { + return ResourceManager.GetString("InvalidRoleNameMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A valid name for the service root folder is required. + /// + public static string InvalidRootNameMessage { + get { + return ResourceManager.GetString("InvalidRootNameMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} is not a recognized runtime type. + /// + public static string InvalidRuntimeError { + get { + return ResourceManager.GetString("InvalidRuntimeError", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A valid language is required. + /// + public static string InvalidScaffoldingLanguageArg { + get { + return ResourceManager.GetString("InvalidScaffoldingLanguageArg", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No subscription is currently selected. Use Select-Subscription to activate a subscription.. + /// + public static string InvalidSelectedSubscription { + get { + return ResourceManager.GetString("InvalidSelectedSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided location "{0}" does not exist in the available locations use Get-AzureSBLocation for listing available locations.. + /// + public static string InvalidServiceBusLocation { + get { + return ResourceManager.GetString("InvalidServiceBusLocation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please provide a service name or run this command from inside a service project directory.. + /// + public static string InvalidServiceName { + get { + return ResourceManager.GetString("InvalidServiceName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You must provide valid value for {0}. + /// + public static string InvalidServiceSettingElement { + get { + return ResourceManager.GetString("InvalidServiceSettingElement", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You must provide valid value for {0}. + /// + public static string InvalidServiceSettingElement1 { + get { + return ResourceManager.GetString("InvalidServiceSettingElement1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to settings.json is invalid or doesn't exist. + /// + public static string InvalidServiceSettingMessage { + get { + return ResourceManager.GetString("InvalidServiceSettingMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The subscription named '{0}' cannot be found. Use Set-AzureSubscription to initialize the subscription data.. + /// + public static string InvalidSubscription { + get { + return ResourceManager.GetString("InvalidSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided subscription id {0} is not valid. + /// + public static string InvalidSubscriptionId { + get { + return ResourceManager.GetString("InvalidSubscriptionId", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Must specify a non-null subscription name.. + /// + public static string InvalidSubscriptionName { + get { + return ResourceManager.GetString("InvalidSubscriptionName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A valid subscription name is required. This can be provided using the -Subscription parameter or by setting the subscription via the Set-AzureSubscription cmdlet. + /// + public static string InvalidSubscriptionNameMessage { + get { + return ResourceManager.GetString("InvalidSubscriptionNameMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided subscriptions file {0} has invalid content.. + /// + public static string InvalidSubscriptionsDataSchema { + get { + return ResourceManager.GetString("InvalidSubscriptionsDataSchema", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Your Azure credentials have not been set up or have expired, please run Add-AzureAccount to set up your Azure credentials.. + /// + public static string InvalidSubscriptionState { + get { + return ResourceManager.GetString("InvalidSubscriptionState", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role {0} VM size should be ExtraSmall, Small, Medium, Large or ExtraLarge.. + /// + public static string InvalidVMSize { + get { + return ResourceManager.GetString("InvalidVMSize", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The web job file must have *.zip extension. + /// + public static string InvalidWebJobFile { + get { + return ResourceManager.GetString("InvalidWebJobFile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Singleton option works for continuous jobs only.. + /// + public static string InvalidWebJobSingleton { + get { + return ResourceManager.GetString("InvalidWebJobSingleton", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The website {0} was not found. Please specify a valid website name.. + /// + public static string InvalidWebsite { + get { + return ResourceManager.GetString("InvalidWebsite", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No job for id: {0} was found.. + /// + public static string JobNotFound { + get { + return ResourceManager.GetString("JobNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to engines. + /// + public static string JsonEnginesSectionName { + get { + return ResourceManager.GetString("JsonEnginesSectionName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Scaffolding for this language is not yet supported. + /// + public static string LanguageScaffoldingIsNotSupported { + get { + return ResourceManager.GetString("LanguageScaffoldingIsNotSupported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Link already established. + /// + public static string LinkAlreadyEstablished { + get { + return ResourceManager.GetString("LinkAlreadyEstablished", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to local_package.csx. + /// + public static string LocalPackageFileName { + get { + return ResourceManager.GetString("LocalPackageFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ServiceConfiguration.Local.cscfg. + /// + public static string LocalServiceConfigurationFileName { + get { + return ResourceManager.GetString("LocalServiceConfigurationFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Looking for {0} deployment for {1} cloud service.... + /// + public static string LookingForDeploymentMessage { + get { + return ResourceManager.GetString("LookingForDeploymentMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Looking for cloud service {0}.... + /// + public static string LookingForServiceMessage { + get { + return ResourceManager.GetString("LookingForServiceMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to managementCertificate.pem. + /// + public static string ManagementCertificateFileName { + get { + return ResourceManager.GetString("ManagementCertificateFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ?whr={0}. + /// + public static string ManagementPortalRealmFormat { + get { + return ResourceManager.GetString("ManagementPortalRealmFormat", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to //baseuri. + /// + public static string ManifestBaseUriQuery { + get { + return ResourceManager.GetString("ManifestBaseUriQuery", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to uri. + /// + public static string ManifestBlobUriKey { + get { + return ResourceManager.GetString("ManifestBlobUriKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to http://az413943.vo.msecnd.net/node/runtimemanifest_0.7.5.2.xml. + /// + public static string ManifestUri { + get { + return ResourceManager.GetString("ManifestUri", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to v2.5. + /// + public static string MaxSupportAzureSdkVersion { + get { + return ResourceManager.GetString("MaxSupportAzureSdkVersion", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to memcache_default. + /// + public static string MemcacheEndpointName { + get { + return ResourceManager.GetString("MemcacheEndpointName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 11211. + /// + public static string MemcacheEndpointPort { + get { + return ResourceManager.GetString("MemcacheEndpointPort", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to v2.5. + /// + public static string MinSupportAzureSdkVersion { + get { + return ResourceManager.GetString("MinSupportAzureSdkVersion", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Python 2.7 is not installed. Please install it as well as Django 1.4.. + /// + public static string MissingPythonPreReq { + get { + return ResourceManager.GetString("MissingPythonPreReq", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Multiple Add-Ons found holding name {0}. + /// + public static string MultipleAddOnsFoundMessage { + get { + return ResourceManager.GetString("MultipleAddOnsFoundMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Multiple possible publishing users. Please go to the Portal and use the listed deployment user, or click 'set/reset deployment credentials' to set up a new user account, then reurn this cmdlet and specify PublishingUsername.. + /// + public static string MultiplePublishingUsernames { + get { + return ResourceManager.GetString("MultiplePublishingUsernames", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The first publish settings file "{0}" is used. If you want to use another file specify the file name.. + /// + public static string MultiplePublishSettingsFilesFoundMessage { + get { + return ResourceManager.GetString("MultiplePublishSettingsFilesFoundMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.Azure.Plugins.Caching.NamedCaches. + /// + public static string NamedCacheSettingName { + get { + return ResourceManager.GetString("NamedCacheSettingName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {"caches":[{"name":"default","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":10,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0}]}. + /// + public static string NamedCacheSettingValue { + get { + return ResourceManager.GetString("NamedCacheSettingValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A publishing username is required. Please specify one using the argument PublishingUsername.. + /// + public static string NeedPublishingUsernames { + get { + return ResourceManager.GetString("NeedPublishingUsernames", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to New Add-On Confirmation. + /// + public static string NewAddOnConformation { + get { + return ResourceManager.GetString("NewAddOnConformation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to By typing "Yes", I (a) authorize Microsoft to charge my current payment method on a monthly basis + ///for the amount indicated at {0} for {1} until my service is cancelled or terminated, and (b) + ///agree to the {2}'s terms of user and privacy statement at {0} and (c) agree to sharing my + ///contact information with {2}.. + /// + public static string NewMicrosoftAddOnMessage { + get { + return ResourceManager.GetString("NewMicrosoftAddOnMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Internal Server Error. This could happen because the namespace name is already used or due to an incorrect location name. Use Get-AzureSBLocation cmdlet to list valid names.. + /// + public static string NewNamespaceErrorMessage { + get { + return ResourceManager.GetString("NewNamespaceErrorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to By typing "Yes", I (a) authorize Microsoft to charge my current payment method on a monthly basis + ///for the amount indicated at {0} for {1} until my service is cancelled or terminated, and (b) + ///acknowledge the offering is provided by {2}, not Microsoft, and agree to {2}'s terms of + ///use and privacy statement at {0} and (c) agree to sharing my contact information with {2}.. + /// + public static string NewNonMicrosoftAddOnMessage { + get { + return ResourceManager.GetString("NewNonMicrosoftAddOnMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Service has been created at {0}. + /// + public static string NewServiceCreatedMessage { + get { + return ResourceManager.GetString("NewServiceCreatedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No. + /// + public static string No { + get { + return ResourceManager.GetString("No", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to There is no access token cached for subscription {0}, user id {1}. Use the Add-AzureAccount cmdlet to log in again and get a token for this subscription.. + /// + public static string NoCachedToken { + get { + return ResourceManager.GetString("NoCachedToken", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The service does not have any cache worker roles, add one first by running cmdlet Add-AzureCacheWorkerRole.. + /// + public static string NoCacheWorkerRoles { + get { + return ResourceManager.GetString("NoCacheWorkerRoles", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No clouds available. + /// + public static string NoCloudsAvailable { + get { + return ResourceManager.GetString("NoCloudsAvailable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to nodejs. + /// + public static string NodeDirectory { + get { + return ResourceManager.GetString("NodeDirectory", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to node. + /// + public static string NodeEngineKey { + get { + return ResourceManager.GetString("NodeEngineKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to node.exe. + /// + public static string NodeExe { + get { + return ResourceManager.GetString("NodeExe", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to There is no default subscription set, please set a default subscription by running Set-AzureSubscription -Default <subscription name>. + /// + public static string NoDefaultSubscriptionMessage { + get { + return ResourceManager.GetString("NoDefaultSubscriptionMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft SDKs\Azure\Nodejs\Nov2011. + /// + public static string NodeModulesPath { + get { + return ResourceManager.GetString("NodeModulesPath", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to nodejs. + /// + public static string NodeProgramFilesFolderName { + get { + return ResourceManager.GetString("NodeProgramFilesFolderName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to node. + /// + public static string NodeRuntimeValue { + get { + return ResourceManager.GetString("NodeRuntimeValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resources\Scaffolding\Node. + /// + public static string NodeScaffolding { + get { + return ResourceManager.GetString("NodeScaffolding", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.Azure.Commands.CloudService.ScaffoldingResources.Node. + /// + public static string NodeScaffoldingResources { + get { + return ResourceManager.GetString("NodeScaffoldingResources", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Installing Node version {0} in Azure for Role '{1}' (the Node version locally installed is: {2}). + /// + public static string NodeVersionWarningText { + get { + return ResourceManager.GetString("NodeVersionWarningText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No, I do not agree. + /// + public static string NoHint { + get { + return ResourceManager.GetString("NoHint", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please connect to internet before executing this cmdlet. + /// + public static string NoInternetConnection { + get { + return ResourceManager.GetString("NoInternetConnection", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please connect to internet before executing this cmdlet. + /// + public static string NoInternetConnection1 { + get { + return ResourceManager.GetString("NoInternetConnection1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to <NONE>. + /// + public static string None { + get { + return ResourceManager.GetString("None", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No publish settings files with extension *.publishsettings are found in the directory "{0}".. + /// + public static string NoPublishSettingsFilesFoundMessage { + get { + return ResourceManager.GetString("NoPublishSettingsFilesFoundMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to There is no subscription associated with account {0}.. + /// + public static string NoSubscriptionAddedMessage { + get { + return ResourceManager.GetString("NoSubscriptionAddedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to '{0}' must be a cache worker role. Verify that it has proper cache worker role configuration.. + /// + public static string NotCacheWorkerRole { + get { + return ResourceManager.GetString("NotCacheWorkerRole", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Certificate can't be null.. + /// + public static string NullCertificateMessage { + get { + return ResourceManager.GetString("NullCertificateMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} could not be null or empty. + /// + public static string NullObjectMessage { + get { + return ResourceManager.GetString("NullObjectMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to add a null RoleSettings to {0}. + /// + public static string NullRoleSettingsMessage { + get { + return ResourceManager.GetString("NullRoleSettingsMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to add new role to null service definition. + /// + public static string NullServiceDefinitionMessage { + get { + return ResourceManager.GetString("NullServiceDefinitionMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The request offer '{0}' is not found.. + /// + public static string OfferNotFoundMessage { + get { + return ResourceManager.GetString("OfferNotFoundMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Operation "{0}" failed on VM with ID: {1}. + /// + public static string OperationFailedErrorMessage { + get { + return ResourceManager.GetString("OperationFailedErrorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The REST operation failed with message '{0}' and error code '{1}'. + /// + public static string OperationFailedMessage { + get { + return ResourceManager.GetString("OperationFailedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Job Id {0} did not complete within expected time or it is in Failed/Canceled/Invalid state.. + /// + public static string OperationTimedOutOrError { + get { + return ResourceManager.GetString("OperationTimedOutOrError", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to package. + /// + public static string Package { + get { + return ResourceManager.GetString("Package", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Package is created at service root path {0}.. + /// + public static string PackageCreated { + get { + return ResourceManager.GetString("PackageCreated", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {{ + /// "author": "", + /// + /// "name": "{0}", + /// "version": "0.0.0", + /// "dependencies":{{}}, + /// "devDependencies":{{}}, + /// "optionalDependencies": {{}}, + /// "engines": {{ + /// "node": "*", + /// "iisnode": "*" + /// }} + /// + ///}} + ///. + /// + public static string PackageJsonDefaultFile { + get { + return ResourceManager.GetString("PackageJsonDefaultFile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to package.json. + /// + public static string PackageJsonFileName { + get { + return ResourceManager.GetString("PackageJsonFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Path {0} doesn't exist.. + /// + public static string PathDoesNotExist { + get { + return ResourceManager.GetString("PathDoesNotExist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Path for {0} doesn't exist in {1}.. + /// + public static string PathDoesNotExistForElement { + get { + return ResourceManager.GetString("PathDoesNotExistForElement", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A value for the Peer Asn has to be provided.. + /// + public static string PeerAsnRequired { + get { + return ResourceManager.GetString("PeerAsnRequired", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 5.4.0. + /// + public static string PHPDefaultRuntimeVersion { + get { + return ResourceManager.GetString("PHPDefaultRuntimeVersion", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to php. + /// + public static string PhpRuntimeValue { + get { + return ResourceManager.GetString("PhpRuntimeValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resources\Scaffolding\PHP. + /// + public static string PHPScaffolding { + get { + return ResourceManager.GetString("PHPScaffolding", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Microsoft.Azure.Commands.CloudService.ScaffoldingResources.PHP. + /// + public static string PHPScaffoldingResources { + get { + return ResourceManager.GetString("PHPScaffoldingResources", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Installing PHP version {0} for Role '{1}' (the PHP version locally installed is: {2}). + /// + public static string PHPVersionWarningText { + get { + return ResourceManager.GetString("PHPVersionWarningText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to You must create your first web site using the Microsoft Azure portal. + ///Please follow these steps in the portal: + ///1. At the bottom of the page, click on New > Web Site > Quick Create + ///2. Type {0} in the URL field + ///3. Click on "Create Web Site" + ///4. Once the site has been created, click on the site name + ///5. Click on "Set up Git publishing" or "Reset deployment credentials" and setup a publishing username and password. Use those credentials for all new websites you create.. + /// + public static string PortalInstructions { + get { + return ResourceManager.GetString("PortalInstructions", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 6. Back in the console window, rerun this command by typing "New-AzureWebsite <site name> -Git". + /// + public static string PortalInstructionsGit { + get { + return ResourceManager.GetString("PortalInstructionsGit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A value for the Primary Peer Subnet has to be provided.. + /// + public static string PrimaryPeerSubnetRequired { + get { + return ResourceManager.GetString("PrimaryPeerSubnetRequired", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Promotion code can be used only when updating to a new plan.. + /// + public static string PromotionCodeWithCurrentPlanMessage { + get { + return ResourceManager.GetString("PromotionCodeWithCurrentPlanMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Service not published at user request.. + /// + public static string PublishAbortedAtUserRequest { + get { + return ResourceManager.GetString("PublishAbortedAtUserRequest", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Complete.. + /// + public static string PublishCompleteMessage { + get { + return ResourceManager.GetString("PublishCompleteMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Connecting.... + /// + public static string PublishConnectingMessage { + get { + return ResourceManager.GetString("PublishConnectingMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Created Deployment ID: {0}.. + /// + public static string PublishCreatedDeploymentMessage { + get { + return ResourceManager.GetString("PublishCreatedDeploymentMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Created hosted service '{0}'.. + /// + public static string PublishCreatedServiceMessage { + get { + return ResourceManager.GetString("PublishCreatedServiceMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Created Website URL: {0}.. + /// + public static string PublishCreatedWebsiteMessage { + get { + return ResourceManager.GetString("PublishCreatedWebsiteMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Creating.... + /// + public static string PublishCreatingServiceMessage { + get { + return ResourceManager.GetString("PublishCreatingServiceMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Initializing.... + /// + public static string PublishInitializingMessage { + get { + return ResourceManager.GetString("PublishInitializingMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to busy. + /// + public static string PublishInstanceStatusBusy { + get { + return ResourceManager.GetString("PublishInstanceStatusBusy", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to creating the virtual machine. + /// + public static string PublishInstanceStatusCreating { + get { + return ResourceManager.GetString("PublishInstanceStatusCreating", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Instance {0} of role {1} is {2}.. + /// + public static string PublishInstanceStatusMessage { + get { + return ResourceManager.GetString("PublishInstanceStatusMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ready. + /// + public static string PublishInstanceStatusReady { + get { + return ResourceManager.GetString("PublishInstanceStatusReady", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Preparing deployment for {0} with Subscription ID: {1}.... + /// + public static string PublishPreparingDeploymentMessage { + get { + return ResourceManager.GetString("PublishPreparingDeploymentMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Publishing {0} to Microsoft Azure. This may take several minutes.... + /// + public static string PublishServiceStartMessage { + get { + return ResourceManager.GetString("PublishServiceStartMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to publish settings. + /// + public static string PublishSettings { + get { + return ResourceManager.GetString("PublishSettings", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Azure. + /// + public static string PublishSettingsElementName { + get { + return ResourceManager.GetString("PublishSettingsElementName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to .PublishSettings. + /// + public static string PublishSettingsFileExtention { + get { + return ResourceManager.GetString("PublishSettingsFileExtention", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to publishSettings.xml. + /// + public static string PublishSettingsFileName { + get { + return ResourceManager.GetString("PublishSettingsFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to &whr={0}. + /// + public static string PublishSettingsFileRealmFormat { + get { + return ResourceManager.GetString("PublishSettingsFileRealmFormat", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Publish settings imported. + /// + public static string PublishSettingsSetSuccessfully { + get { + return ResourceManager.GetString("PublishSettingsSetSuccessfully", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to AZURE_PUBLISHINGPROFILE_URL. + /// + public static string PublishSettingsUrlEnv { + get { + return ResourceManager.GetString("PublishSettingsUrlEnv", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting.... + /// + public static string PublishStartingMessage { + get { + return ResourceManager.GetString("PublishStartingMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Upgrading.... + /// + public static string PublishUpgradingMessage { + get { + return ResourceManager.GetString("PublishUpgradingMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Uploading Package to storage service {0}.... + /// + public static string PublishUploadingPackageMessage { + get { + return ResourceManager.GetString("PublishUploadingPackageMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Verifying storage account '{0}'.... + /// + public static string PublishVerifyingStorageMessage { + get { + return ResourceManager.GetString("PublishVerifyingStorageMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resources\Scaffolding\Python. + /// + public static string PythonScaffolding { + get { + return ResourceManager.GetString("PythonScaffolding", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Replace current deployment with '{0}' Id ?. + /// + public static string RedeployCommit { + get { + return ResourceManager.GetString("RedeployCommit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to regenerate key?. + /// + public static string RegenerateKeyWarning { + get { + return ResourceManager.GetString("RegenerateKeyWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Generate new key.. + /// + public static string RegenerateKeyWhatIfMessage { + get { + return ResourceManager.GetString("RegenerateKeyWhatIfMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove account '{0}'?. + /// + public static string RemoveAccountConfirmation { + get { + return ResourceManager.GetString("RemoveAccountConfirmation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing account. + /// + public static string RemoveAccountMessage { + get { + return ResourceManager.GetString("RemoveAccountMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove Add-On Confirmation. + /// + public static string RemoveAddOnConformation { + get { + return ResourceManager.GetString("RemoveAddOnConformation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to If you delete this add-on, your data may be deleted and the operation may not be undone. You may have to purchase it again from the Microsoft Azure Store to use it. The price of the add-on may not be refunded. Are you sure you want to delete this add-on? Enter “Yes” to confirm.. + /// + public static string RemoveAddOnMessage { + get { + return ResourceManager.GetString("RemoveAddOnMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove-AzureBGPPeering Operation failed.. + /// + public static string RemoveAzureBGPPeeringFailed { + get { + return ResourceManager.GetString("RemoveAzureBGPPeeringFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing Bgp Peering. + /// + public static string RemoveAzureBGPPeeringMessage { + get { + return ResourceManager.GetString("RemoveAzureBGPPeeringMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Successfully removed Azure Bgp Peering with Service Key {0}.. + /// + public static string RemoveAzureBGPPeeringSucceeded { + get { + return ResourceManager.GetString("RemoveAzureBGPPeeringSucceeded", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove the Bgp Peering with service key '{0}'?. + /// + public static string RemoveAzureBGPPeeringWarning { + get { + return ResourceManager.GetString("RemoveAzureBGPPeeringWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove the Dedicated Circuit with service key '{0}'?. + /// + public static string RemoveAzureDedicatdCircuitWarning { + get { + return ResourceManager.GetString("RemoveAzureDedicatdCircuitWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove-AzureDedicatedCircuit Operation failed.. + /// + public static string RemoveAzureDedicatedCircuitFailed { + get { + return ResourceManager.GetString("RemoveAzureDedicatedCircuitFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove-AzureDedicatedCircuitLink Operation failed.. + /// + public static string RemoveAzureDedicatedCircuitLinkFailed { + get { + return ResourceManager.GetString("RemoveAzureDedicatedCircuitLinkFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing Dedicated Circui Link. + /// + public static string RemoveAzureDedicatedCircuitLinkMessage { + get { + return ResourceManager.GetString("RemoveAzureDedicatedCircuitLinkMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Successfully removed Azure Dedicated Circuit Link with Service Key {0} and Vnet Name {1}. + /// + public static string RemoveAzureDedicatedCircuitLinkSucceeded { + get { + return ResourceManager.GetString("RemoveAzureDedicatedCircuitLinkSucceeded", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove the Dedicated Circuit Link with service key '{0}' and virtual network name '{1}'?. + /// + public static string RemoveAzureDedicatedCircuitLinkWarning { + get { + return ResourceManager.GetString("RemoveAzureDedicatedCircuitLinkWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing Dedicated Circuit. + /// + public static string RemoveAzureDedicatedCircuitMessage { + get { + return ResourceManager.GetString("RemoveAzureDedicatedCircuitMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Successfully removed Azure Dedicated Circuit with Service Key {0}.. + /// + public static string RemoveAzureDedicatedCircuitSucceeded { + get { + return ResourceManager.GetString("RemoveAzureDedicatedCircuitSucceeded", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing cloud service {0}.... + /// + public static string RemoveAzureServiceWaitMessage { + get { + return ResourceManager.GetString("RemoveAzureServiceWaitMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The current subscription is being removed. Use Select-AzureSubscription <subscriptionName> to select a new current subscription.. + /// + public static string RemoveCurrentSubscription { + get { + return ResourceManager.GetString("RemoveCurrentSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The default subscription is being removed. Use Select-AzureSubscription -Default <subscriptionName> to select a new default subscription.. + /// + public static string RemoveDefaultSubscription { + get { + return ResourceManager.GetString("RemoveDefaultSubscription", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing {0} deployment for {1} service. + /// + public static string RemoveDeploymentWaitMessage { + get { + return ResourceManager.GetString("RemoveDeploymentWaitMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing an environment will remove all associated subscriptions and accounts. Are you sure you want to remove an environment '{0}'?. + /// + public static string RemoveEnvironmentConfirmation { + get { + return ResourceManager.GetString("RemoveEnvironmentConfirmation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing environment. + /// + public static string RemoveEnvironmentMessage { + get { + return ResourceManager.GetString("RemoveEnvironmentMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing job collection. + /// + public static string RemoveJobCollectionMessage { + get { + return ResourceManager.GetString("RemoveJobCollectionMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove the job collection "{0}". + /// + public static string RemoveJobCollectionWarning { + get { + return ResourceManager.GetString("RemoveJobCollectionWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing job. + /// + public static string RemoveJobMessage { + get { + return ResourceManager.GetString("RemoveJobMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove the job "{0}". + /// + public static string RemoveJobWarning { + get { + return ResourceManager.GetString("RemoveJobWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove the account?. + /// + public static string RemoveMediaAccountWarning { + get { + return ResourceManager.GetString("RemoveMediaAccountWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Account removed.. + /// + public static string RemoveMediaAccountWhatIfMessage { + get { + return ResourceManager.GetString("RemoveMediaAccountWhatIfMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Internal Server Error. This could happen because the namespace does not exist or it does not exist under your subscription.. + /// + public static string RemoveNamespaceErrorMessage { + get { + return ResourceManager.GetString("RemoveNamespaceErrorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing old package {0}.... + /// + public static string RemovePackage { + get { + return ResourceManager.GetString("RemovePackage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing the Azure profile will remove all associated environments, subscriptions, and accounts. Are you sure you want to remove the Azure profile?. + /// + public static string RemoveProfileConfirmation { + get { + return ResourceManager.GetString("RemoveProfileConfirmation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing the Azure profile. + /// + public static string RemoveProfileMessage { + get { + return ResourceManager.GetString("RemoveProfileMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to delete the namespace '{0}'?. + /// + public static string RemoveServiceBusNamespaceConfirmation { + get { + return ResourceManager.GetString("RemoveServiceBusNamespaceConfirmation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove cloud service?. + /// + public static string RemoveServiceWarning { + get { + return ResourceManager.GetString("RemoveServiceWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove cloud service and all it's deployments. + /// + public static string RemoveServiceWhatIfMessage { + get { + return ResourceManager.GetString("RemoveServiceWhatIfMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove subscription '{0}'?. + /// + public static string RemoveSubscriptionConfirmation { + get { + return ResourceManager.GetString("RemoveSubscriptionConfirmation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing subscription. + /// + public static string RemoveSubscriptionMessage { + get { + return ResourceManager.GetString("RemoveSubscriptionMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The endpoint {0} cannot be removed from profile {1} because it's not in the profile.. + /// + public static string RemoveTrafficManagerEndpointMissing { + get { + return ResourceManager.GetString("RemoveTrafficManagerEndpointMissing", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remove-AzureTrafficManagerProfile Operation failed.. + /// + public static string RemoveTrafficManagerProfileFailed { + get { + return ResourceManager.GetString("RemoveTrafficManagerProfileFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Successfully removed Traffic Manager profile with name {0}.. + /// + public static string RemoveTrafficManagerProfileSucceeded { + get { + return ResourceManager.GetString("RemoveTrafficManagerProfileSucceeded", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove the Traffic Manager profile "{0}"?. + /// + public static string RemoveTrafficManagerProfileWarning { + get { + return ResourceManager.GetString("RemoveTrafficManagerProfileWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to delete the VM '{0}'?. + /// + public static string RemoveVMConfirmationMessage { + get { + return ResourceManager.GetString("RemoveVMConfirmationMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deleting VM.. + /// + public static string RemoveVMMessage { + get { + return ResourceManager.GetString("RemoveVMMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing WebJob.... + /// + public static string RemoveWebJobMessage { + get { + return ResourceManager.GetString("RemoveWebJobMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove job '{0}'?. + /// + public static string RemoveWebJobWarning { + get { + return ResourceManager.GetString("RemoveWebJobWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing website. + /// + public static string RemoveWebsiteMessage { + get { + return ResourceManager.GetString("RemoveWebsiteMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to remove the website "{0}". + /// + public static string RemoveWebsiteWarning { + get { + return ResourceManager.GetString("RemoveWebsiteWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removing public environment is not supported.. + /// + public static string RemovingDefaultEnvironmentsNotSupported { + get { + return ResourceManager.GetString("RemovingDefaultEnvironmentsNotSupported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Deleting namespace. + /// + public static string RemovingNamespaceMessage { + get { + return ResourceManager.GetString("RemovingNamespaceMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Repository is not setup. You need to pass a valid site name.. + /// + public static string RepositoryNotSetup { + get { + return ResourceManager.GetString("RepositoryNotSetup", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Reserved IP with the Name:'{0}' will no longer be in use after the deployment is deleted, and it is still reserved for later use.. + /// + public static string ReservedIPNameNoLongerInUseButStillBeingReserved { + get { + return ResourceManager.GetString("ReservedIPNameNoLongerInUseButStillBeingReserved", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resource with ID : {0} does not exist.. + /// + public static string ResourceNotFound { + get { + return ResourceManager.GetString("ResourceNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Restart. + /// + public static string Restart { + get { + return ResourceManager.GetString("Restart", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resume. + /// + public static string Resume { + get { + return ResourceManager.GetString("Resume", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to /role:{0};"{1}/{0}" . + /// + public static string RoleArgTemplate { + get { + return ResourceManager.GetString("RoleArgTemplate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to bin. + /// + public static string RoleBinFolderName { + get { + return ResourceManager.GetString("RoleBinFolderName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role {0} is {1}. + /// + public static string RoleInstanceWaitMsg { + get { + return ResourceManager.GetString("RoleInstanceWaitMsg", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 20. + /// + public static string RoleMaxInstances { + get { + return ResourceManager.GetString("RoleMaxInstances", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to role name. + /// + public static string RoleName { + get { + return ResourceManager.GetString("RoleName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided role name {0} doesn't exist. + /// + public static string RoleNotFoundMessage { + get { + return ResourceManager.GetString("RoleNotFoundMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RoleSettings.xml. + /// + public static string RoleSettingsTemplateFileName { + get { + return ResourceManager.GetString("RoleSettingsTemplateFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role type {0} doesn't exist. + /// + public static string RoleTypeDoesNotExist { + get { + return ResourceManager.GetString("RoleTypeDoesNotExist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to public static Dictionary<string, Location> ReverseLocations { get; private set; }. + /// + public static string RuntimeDeploymentLocationError { + get { + return ResourceManager.GetString("RuntimeDeploymentLocationError", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Preparing runtime deployment for service '{0}'. + /// + public static string RuntimeDeploymentStart { + get { + return ResourceManager.GetString("RuntimeDeploymentStart", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WARNING Runtime Mismatch: Are you sure that you want to publish service '{0}' using an Azure runtime version that does not match your local runtime version?. + /// + public static string RuntimeMismatchWarning { + get { + return ResourceManager.GetString("RuntimeMismatchWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RUNTIMEOVERRIDEURL. + /// + public static string RuntimeOverrideKey { + get { + return ResourceManager.GetString("RuntimeOverrideKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to /runtimemanifest/runtimes/runtime. + /// + public static string RuntimeQuery { + get { + return ResourceManager.GetString("RuntimeQuery", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RUNTIMEID. + /// + public static string RuntimeTypeKey { + get { + return ResourceManager.GetString("RuntimeTypeKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RUNTIMEURL. + /// + public static string RuntimeUrlKey { + get { + return ResourceManager.GetString("RuntimeUrlKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to RUNTIMEVERSIONPRIMARYKEY. + /// + public static string RuntimeVersionPrimaryKey { + get { + return ResourceManager.GetString("RuntimeVersionPrimaryKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to scaffold.xml. + /// + public static string ScaffoldXml { + get { + return ResourceManager.GetString("ScaffoldXml", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invalid location entered. Pick one of the locations from Get-AzureSchedulerLocation. + /// + public static string SchedulerInvalidLocation { + get { + return ResourceManager.GetString("SchedulerInvalidLocation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A value for the Secondary Peer Subnet has to be provided.. + /// + public static string SecondaryPeerSubnetRequired { + get { + return ResourceManager.GetString("SecondaryPeerSubnetRequired", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Service {0} already exists on disk in location {1}. + /// + public static string ServiceAlreadyExistsOnDisk { + get { + return ResourceManager.GetString("ServiceAlreadyExistsOnDisk", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to No ServiceBus authorization rule with the given characteristics was found. + /// + public static string ServiceBusAuthorizationRuleNotFound { + get { + return ResourceManager.GetString("ServiceBusAuthorizationRuleNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The service bus entity '{0}' is not found.. + /// + public static string ServiceBusEntityTypeNotFound { + get { + return ResourceManager.GetString("ServiceBusEntityTypeNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Internal Server Error. This could happen due to an incorrect/missing namespace. + /// + public static string ServiceBusNamespaceMissingMessage { + get { + return ResourceManager.GetString("ServiceBusNamespaceMissingMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to service configuration. + /// + public static string ServiceConfiguration { + get { + return ResourceManager.GetString("ServiceConfiguration", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to service definition. + /// + public static string ServiceDefinition { + get { + return ResourceManager.GetString("ServiceDefinition", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ServiceDefinition.csdef. + /// + public static string ServiceDefinitionFileName { + get { + return ResourceManager.GetString("ServiceDefinitionFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ServiceDefinition.csdef. + /// + public static string ServiceDefinitionFileName1 { + get { + return ResourceManager.GetString("ServiceDefinitionFileName1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}Deploy. + /// + public static string ServiceDeploymentName { + get { + return ResourceManager.GetString("ServiceDeploymentName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The specified cloud service "{0}" does not exist.. + /// + public static string ServiceDoesNotExist { + get { + return ResourceManager.GetString("ServiceDoesNotExist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} slot for service {1} is in {2} state, please wait until it finish and update it's status. + /// + public static string ServiceIsInTransitionState { + get { + return ResourceManager.GetString("ServiceIsInTransitionState", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to retrieve service key for ServicePrincipal account {0}. Please run the Add-AzureAccount cmdlet to supply the credentials for this service principal.. + /// + public static string ServiceKeyNotFound { + get { + return ResourceManager.GetString("ServiceKeyNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to . + /// + public static string ServiceManagementClientExceptionStringFormat { + get { + return ResourceManager.GetString("ServiceManagementClientExceptionStringFormat", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to "An exception occurred when calling the ServiceManagement API. HTTP Status Code: {0}. Service Management Error Code: {1}. Message: {2}. Operation Tracking ID: {3}.". + /// + public static string ServiceManagementClientExceptionStringFormat1 { + get { + return ResourceManager.GetString("ServiceManagementClientExceptionStringFormat1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Begin Operation: {0}. + /// + public static string ServiceManagementExecuteClientActionBeginOperation { + get { + return ResourceManager.GetString("ServiceManagementExecuteClientActionBeginOperation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Completed Operation: {0}. + /// + public static string ServiceManagementExecuteClientActionCompletedOperation { + get { + return ResourceManager.GetString("ServiceManagementExecuteClientActionCompletedOperation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Begin Operation: {0}. + /// + public static string ServiceManagementExecuteClientActionInOCSBeginOperation { + get { + return ResourceManager.GetString("ServiceManagementExecuteClientActionInOCSBeginOperation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Completed Operation: {0}. + /// + public static string ServiceManagementExecuteClientActionInOCSCompletedOperation { + get { + return ResourceManager.GetString("ServiceManagementExecuteClientActionInOCSCompletedOperation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to service name. + /// + public static string ServiceName { + get { + return ResourceManager.GetString("ServiceName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided service name {0} already exists, please pick another name. + /// + public static string ServiceNameExists { + get { + return ResourceManager.GetString("ServiceNameExists", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provided service name {0} already exists, please pick another name. + /// + public static string ServiceNameExists1 { + get { + return ResourceManager.GetString("ServiceNameExists1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please provide name for the hosted service. + /// + public static string ServiceNameMissingMessage { + get { + return ResourceManager.GetString("ServiceNameMissingMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to service parent directory. + /// + public static string ServiceParentDirectory { + get { + return ResourceManager.GetString("ServiceParentDirectory", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Service {0} removed successfully. + /// + public static string ServiceRemovedMessage { + get { + return ResourceManager.GetString("ServiceRemovedMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to service directory. + /// + public static string ServiceRoot { + get { + return ResourceManager.GetString("ServiceRoot", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to service settings. + /// + public static string ServiceSettings { + get { + return ResourceManager.GetString("ServiceSettings", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The storage account name '{0}' is invalid. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.. + /// + public static string ServiceSettings_ValidateStorageAccountName_InvalidName { + get { + return ResourceManager.GetString("ServiceSettings_ValidateStorageAccountName_InvalidName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The storage account name '{0}' is invalid. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.. + /// + public static string ServiceSettings_ValidateStorageAccountName_InvalidName1 { + get { + return ResourceManager.GetString("ServiceSettings_ValidateStorageAccountName_InvalidName1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to service settings. + /// + public static string ServiceSettings1 { + get { + return ResourceManager.GetString("ServiceSettings1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The {0} slot for cloud service {1} doesn't exist.. + /// + public static string ServiceSlotDoesNotExist { + get { + return ResourceManager.GetString("ServiceSlotDoesNotExist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} slot for service {1} is {2}. + /// + public static string ServiceStatusChanged { + get { + return ResourceManager.GetString("ServiceStatusChanged", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Set Add-On Confirmation. + /// + public static string SetAddOnConformation { + get { + return ResourceManager.GetString("SetAddOnConformation", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Profile {0} does not contain endpoint {1}. Adding it.. + /// + public static string SetInexistentTrafficManagerEndpointMessage { + get { + return ResourceManager.GetString("SetInexistentTrafficManagerEndpointMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Note - You will be charged the amount for the new plan, without being refunded for time remaining + ///in the existing plan. + ///By typing "Yes", I (a) authorize Microsoft to charge my current payment method on a monthly basis + ///for the amount indicated at {0} for {1} until my service is cancelled or terminated, and (b) + ///agree to the {2}'s terms of user and privacy statement at {0} and (c) agree to sharing my + ///contact information with {2}.. + /// + public static string SetMicrosoftAddOnMessage { + get { + return ResourceManager.GetString("SetMicrosoftAddOnMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Note - You will be charged the amount for the new plan, without being refunded for time remaining + ///in the existing plan. + ///By typing "Yes", I (a) authorize Microsoft to charge my current payment method on a monthly basis + ///for the amount indicated at {0} for {1} until my service is cancelled or terminated, and (b) + ///acknowledge the offering is provided by {2}, not Microsoft, and agree to {2}'s terms of + ///use and privacy statement at <url> and (c) agree to sharing my contact information with {2}.. + /// + public static string SetNonMicrosoftAddOnMessage { + get { + return ResourceManager.GetString("SetNonMicrosoftAddOnMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Role {0} instances are set to {1}. + /// + public static string SetRoleInstancesMessage { + get { + return ResourceManager.GetString("SetRoleInstancesMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {"Slot":"","Location":"","Subscription":"","StorageAccountName":""}. + /// + public static string SettingsFileEmptyContent { + get { + return ResourceManager.GetString("SettingsFileEmptyContent", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to deploymentSettings.json. + /// + public static string SettingsFileName { + get { + return ResourceManager.GetString("SettingsFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to deploymentSettings.json. + /// + public static string SettingsFileName1 { + get { + return ResourceManager.GetString("SettingsFileName1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Insufficient parameters passed to create a new endpoint.. + /// + public static string SetTrafficManagerEndpointNeedsParameters { + get { + return ResourceManager.GetString("SetTrafficManagerEndpointNeedsParameters", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ambiguous operation: the profile name specified doesn't match the name of the profile object.. + /// + public static string SetTrafficManagerProfileAmbiguous { + get { + return ResourceManager.GetString("SetTrafficManagerProfileAmbiguous", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Confirm. + /// + public static string ShouldProcessCaption { + get { + return ResourceManager.GetString("ShouldProcessCaption", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Confirm. + /// + public static string ShouldProcessCaption1 { + get { + return ResourceManager.GetString("ShouldProcessCaption1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shutdown. + /// + public static string Shutdown { + get { + return ResourceManager.GetString("Shutdown", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to /sites:{0};{1};"{2}/{0}" . + /// + public static string SitesArgTemplate { + get { + return ResourceManager.GetString("SitesArgTemplate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 1000. + /// + public static string StandardRetryDelayInMs { + get { + return ResourceManager.GetString("StandardRetryDelayInMs", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Start. + /// + public static string Start { + get { + return ResourceManager.GetString("Start", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Started. + /// + public static string StartedEmulator { + get { + return ResourceManager.GetString("StartedEmulator", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Starting Emulator.... + /// + public static string StartingEmulator { + get { + return ResourceManager.GetString("StartingEmulator", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to start. + /// + public static string StartStorageEmulatorCommandArgument { + get { + return ResourceManager.GetString("StartStorageEmulatorCommandArgument", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stop. + /// + public static string Stop { + get { + return ResourceManager.GetString("Stop", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopping emulator.... + /// + public static string StopEmulatorMessage { + get { + return ResourceManager.GetString("StopEmulatorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stopped. + /// + public static string StoppedEmulatorMessage { + get { + return ResourceManager.GetString("StoppedEmulatorMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to stop. + /// + public static string StopStorageEmulatorCommandArgument { + get { + return ResourceManager.GetString("StopStorageEmulatorCommandArgument", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Account Name:. + /// + public static string StorageAccountName { + get { + return ResourceManager.GetString("StorageAccountName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot find storage account '{0}' please type the name of an existing storage account.. + /// + public static string StorageAccountNotFound { + get { + return ResourceManager.GetString("StorageAccountNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WAStorageEmulator.exe. + /// + public static string StorageEmulatorExe { + get { + return ResourceManager.GetString("StorageEmulatorExe", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to InstallPath. + /// + public static string StorageEmulatorInstallPathRegistryKeyValue { + get { + return ResourceManager.GetString("StorageEmulatorInstallPathRegistryKeyValue", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SOFTWARE\Microsoft\Windows Azure Storage Emulator. + /// + public static string StorageEmulatorRegistryKey { + get { + return ResourceManager.GetString("StorageEmulatorRegistryKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Primary Key:. + /// + public static string StoragePrimaryKey { + get { + return ResourceManager.GetString("StoragePrimaryKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Secondary Key:. + /// + public static string StorageSecondaryKey { + get { + return ResourceManager.GetString("StorageSecondaryKey", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The subscription named {0} already exists.. + /// + public static string SubscriptionAlreadyExists { + get { + return ResourceManager.GetString("SubscriptionAlreadyExists", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information.. + /// + public static string SubscriptionDataFileDeprecated { + get { + return ResourceManager.GetString("SubscriptionDataFileDeprecated", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DefaultSubscriptionData.xml. + /// + public static string SubscriptionDataFileName { + get { + return ResourceManager.GetString("SubscriptionDataFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The subscription data file {0} does not exist.. + /// + public static string SubscriptionDataFileNotFound { + get { + return ResourceManager.GetString("SubscriptionDataFileNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The subscription id {0} doesn't exist.. + /// + public static string SubscriptionIdNotFoundMessage { + get { + return ResourceManager.GetString("SubscriptionIdNotFoundMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Subscription must not be null. + /// + public static string SubscriptionMustNotBeNull { + get { + return ResourceManager.GetString("SubscriptionMustNotBeNull", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The subscription name {0} doesn't exist.. + /// + public static string SubscriptionNameNotFoundMessage { + get { + return ResourceManager.GetString("SubscriptionNameNotFoundMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Suspend. + /// + public static string Suspend { + get { + return ResourceManager.GetString("Suspend", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Swapping website production slot .... + /// + public static string SwappingWebsite { + get { + return ResourceManager.GetString("SwappingWebsite", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure you want to swap the website '{0}' production slot with slot '{1}'?. + /// + public static string SwapWebsiteSlotWarning { + get { + return ResourceManager.GetString("SwapWebsiteSlotWarning", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to create Django application: {0}. + /// + public static string UnableToCreateDjangoApp { + get { + return ResourceManager.GetString("UnableToCreateDjangoApp", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Make sure you have Python 2.7 installed along with Django installed to site-packages.. + /// + public static string UnableToCreateDjangoAppFix { + get { + return ResourceManager.GetString("UnableToCreateDjangoAppFix", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to decode string from base 64. Please make sure the string is correctly encoded: {0}.. + /// + public static string UnableToDecodeBase64String { + get { + return ResourceManager.GetString("UnableToDecodeBase64String", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unable to update mismatching Json structured: {0} {1}.. + /// + public static string UnableToPatchJson { + get { + return ResourceManager.GetString("UnableToPatchJson", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Illegal credential type. + /// + public static string UnknownCredentialType { + get { + return ResourceManager.GetString("UnknownCredentialType", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The provider {0} is unknown.. + /// + public static string UnknownProviderMessage { + get { + return ResourceManager.GetString("UnknownProviderMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Update. + /// + public static string Update { + get { + return ResourceManager.GetString("Update", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Updated settings for subscription '{0}'. Current subscription is '{1}'.. + /// + public static string UpdatedSettings { + get { + return ResourceManager.GetString("UpdatedSettings", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A value for the VLan Id has to be provided.. + /// + public static string VlanIdRequired { + get { + return ResourceManager.GetString("VlanIdRequired", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Please wait.... + /// + public static string WaitMessage { + get { + return ResourceManager.GetString("WaitMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The azure storage emulator is not installed, skip launching.... + /// + public static string WarningWhenStorageEmulatorIsMissing { + get { + return ResourceManager.GetString("WarningWhenStorageEmulatorIsMissing", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Web.cloud.config. + /// + public static string WebCloudConfig { + get { + return ResourceManager.GetString("WebCloudConfig", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to web.config. + /// + public static string WebConfigTemplateFileName { + get { + return ResourceManager.GetString("WebConfigTemplateFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MSDeploy. + /// + public static string WebDeployKeywordInWebSitePublishProfile { + get { + return ResourceManager.GetString("WebDeployKeywordInWebSitePublishProfile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cannot build the project successfully. Please see logs in {0}.. + /// + public static string WebProjectBuildFailTemplate { + get { + return ResourceManager.GetString("WebProjectBuildFailTemplate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WebRole. + /// + public static string WebRole { + get { + return ResourceManager.GetString("WebRole", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to setup_web.cmd > log.txt. + /// + public static string WebRoleStartupTaskCommandLine { + get { + return ResourceManager.GetString("WebRoleStartupTaskCommandLine", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WebRole.xml. + /// + public static string WebRoleTemplateFileName { + get { + return ResourceManager.GetString("WebRoleTemplateFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WebSite with given name {0} already exists in the specified Subscription and Webspace.. + /// + public static string WebsiteAlreadyExists { + get { + return ResourceManager.GetString("WebsiteAlreadyExists", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WebSite with given name {0} already exists in the specified Subscription and Location.. + /// + public static string WebsiteAlreadyExistsReplacement { + get { + return ResourceManager.GetString("WebsiteAlreadyExistsReplacement", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Site {0} already has repository created for it.. + /// + public static string WebsiteRepositoryAlreadyExists { + get { + return ResourceManager.GetString("WebsiteRepositoryAlreadyExists", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Workspaces/WebsiteExtension/Website/{0}/dashboard/. + /// + public static string WebsiteSufixUrl { + get { + return ResourceManager.GetString("WebsiteSufixUrl", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to https://{0}/msdeploy.axd?site={1}. + /// + public static string WebSiteWebDeployUriTemplate { + get { + return ResourceManager.GetString("WebSiteWebDeployUriTemplate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WorkerRole. + /// + public static string WorkerRole { + get { + return ResourceManager.GetString("WorkerRole", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to setup_worker.cmd > log.txt. + /// + public static string WorkerRoleStartupTaskCommandLine { + get { + return ResourceManager.GetString("WorkerRoleStartupTaskCommandLine", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to WorkerRole.xml. + /// + public static string WorkerRoleTemplateFileName { + get { + return ResourceManager.GetString("WorkerRoleTemplateFileName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to (x86). + /// + public static string x86InProgramFiles { + get { + return ResourceManager.GetString("x86InProgramFiles", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Yes. + /// + public static string Yes { + get { + return ResourceManager.GetString("Yes", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Yes, I agree. + /// + public static string YesHint { + get { + return ResourceManager.GetString("YesHint", resourceCulture); + } + } + } +} diff --git a/src/Common/Azure.Common.Extensions/Properties/Resources.resx b/src/Common/Azure.Common.Extensions/Properties/Resources.resx new file mode 100644 index 000000000000..be358f5d05b0 --- /dev/null +++ b/src/Common/Azure.Common.Extensions/Properties/Resources.resx @@ -0,0 +1,1579 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + The remote server returned an error: (401) Unauthorized. + + + Account "{0}" has been added. + + + To switch to a different subscription, please use Select-AzureSubscription. + + + Subscription "{0}" is selected as the default subscription. + + + To view all the subscriptions, please use Get-AzureSubscription. + + + Add-On {0} is created successfully. + + + Add-on name {0} is already used. + + + Add-On {0} not found. + + + Add-on {0} is removed successfully. + + + Add-On {0} is updated successfully. + + + Role has been created at {0}\{1}. + + + Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for Node.js by running ‘npm install azure’. + + + Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for PHP by running "pear Azure/Azure". + + + Role has been created at {0}\{1}. For easy access to Microsoft Azure services from your application code, install the Microsoft Azure client library for Python by running "pip Azure". + + + Unable to set role permissions. Please give the 'Network Service' user 'Read & execute' and 'Modify' permissions to the role folder, or run PowerShell as an Administrator + + + A role name '{0}' already exists + + + Windows Azure Powershell\ + + + Windows Azure Powershell + + + Emulator + + + Azure Emulator is not installed and is required + + + Azure Emulator\emulator + + + SOFTWARE\Microsoft\Windows Azure Emulator + + + https://manage.Azure.com + + + AZURE_PORTAL_URL + + + Azure SDK\{0}\ + + + InstallPath + + + SOFTWARE\Microsoft\Microsoft SDKs\ServiceHosting + + + The installed Azure SDK version is not supported. Make sure you version is between {0} and {1} inclusive + + + Azure service management error +{0} + + + Azure Authoring Tools are not installed and are required. Installation of Azure SDK for .NET is recommended with Microsoft Web Platform Installer (PI) available at http://www.microsoft.com/web/downloads/platform.aspx. + + + Base Uri was empty. + WAPackIaaS + + + {0} begin processing without ParameterSet. + + + {0} begin processing with ParameterSet '{1}'. + + + Blob with the name {0} already exists in the account. + + + https://{0}.blob.core.windows.net/ + + + AZURE_BLOBSTORAGE_TEMPLATE + + + Memcache is already enabled for role '{0}'. + + + <configuration> + <configSections> + <section name="dataCacheClients" type="Microsoft.ApplicationServer.Caching.DataCacheClientsSection, Microsoft.ApplicationServer.Caching.Core" allowLocation="true" allowDefinition="Everywhere" /> + </configSections> + <dataCacheClients> + <tracing sinkType="DiagnosticSink" traceLevel="Error" /> + <dataCacheClient name="DefaultShimConfig" useLegacyProtocol="false"> + <autoDiscover isEnabled="true" identifier="$RoleName$" /> + </dataCacheClient> + </dataCacheClients> +</configuration> + + + Microsoft.Azure.Plugins.Caching.ClientDiagnosticLevel + + + DiagnosticStore + + + Please upgrade the cache runtime of role '{0}' to '{1}' using Set-AzureServiceProjectRole -RoleName {0} -Runtime Cache -Version {1} + + + CACHERUNTIMEURL + + + cache + + + CacheRuntimeVersion + + + Resources\Scaffolding\Cache + + + setup_cache.cmd > cache_log.txt + + + Installing caching version {0} for Role '{1}' (the caching version locally installed is: {2}) + + + Microsoft.Azure.Plugins.Caching.CacheSizePercentage + + + Microsoft.Azure.Plugins.Caching.ConfigStoreConnectionString + + + DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1} + + + Caching + + + Cannot find {0} with name {1}. + + + Deployment for service {0} with {1} slot doesn't exist + + + Can't find valid Microsoft Azure role in current directory {0} + + + service {0} configuration file (ServiceConfiguration.Cloud.cscfg) is either null or doesn't exist + + + Invalid service path! Cannot locate ServiceDefinition.csdef in current folder or parent folders. + + + The subscription named {0} with id {1} is not currently imported. You must import this subscription before it can be updated. + + + ManagementCertificate + + + certificate.pfx + + + Certificate imported into CurrentUser\My\{0} + + + No certificate was found in the certificate store with thumbprint {0} + + + No certificate was found in the certificate store with thumbprint {0} + + + Your account does not have access to the private key for certificate {0} + + + {0} {1} deployment for {2} service + + + Cloud service {0} is in {1} state. + + + Changing/Removing public environment '{0}' is not allowed. + + + Service {0} is set to value {1} + + + Choose which publish settings file to use: + + + Microsoft.Azure.Plugins.Caching.ClientDiagnosticLevel + + + 1 + + + cloud_package.cspkg + + + ServiceConfiguration.Cloud.cscfg + + + Add-ons for {0} + + + Communication could not be established. This could be due to an invalid subscription ID. Note that subscription IDs are case sensitive. + + + Complete + + + Complete + + + config.json + + + VirtualMachine creation failed. + WAPackIaaS + + + Creating the website failed. If this is the first website for this subscription, please create it using the management portal instead. + + + Microsoft.ApplicationServer.Caching.DataCacheClientsSection, Microsoft.ApplicationServer.Caching.Core + + + //blobcontainer[@datacenter='{0}'] + + + Setting: {0} as the default and current subscription. To view other subscriptions use Get-AzureSubscription + + + none + + + There are no hostnames which could be used for validation. + + + 8080 + + + 1000 + + + Auto + + + 80 + + + Delete + WAPackIaaS + + + The {0} slot for service {1} is already in {2} state + + + The deployment in {0} slot for service {1} is removed + + + Microsoft.Azure.Plugins.Caching.DiagnosticLevel + + + 1 + + + The key to add already exists in the dictionary. + + + The array index cannot be less than zero. + + + The supplied array does not have enough room to contain the copied elements. + + + The provided dns {0} doesn't exist + + + Microsoft Azure Certificate + + + Endpoint can't be retrieved for storage account + + + {0} end processing. + + + To use Active Directory authentication, you must configure the ActiveDirectoryEndpoint, ActiveDirectoryTenantId, and ActiveDirectorServiceEndpointResourceId for environment of '{0}'. You can configure these properties for this environment using the Set-AzureEnvironment cmdlet. + + + The environment '{0}' already exists. + + + The environment name '{0}' is not found. + + + environments.xml + + + Error creating VirtualMachine + WAPackIaaS + + + Unable to download available runtimes for location '{0}' + + + Error updating VirtualMachine + WAPackIaaS + + + Your Microsoft Azure credential in the Windows PowerShell session has expired. Please use Add-AzureAccount to login again. + + + Job Id {0} failed. Error: {1}, ExceptionDetails: {2} + WAPackIaaS + + + The HTTP request was forbidden with client authentication scheme 'Anonymous'. + + + This add-on requires you to purchase the first instance through the Microsoft Azure Portal. Subsequent purchases can be performed through PowerShell. + + + Operation Status: + + + Resources\Scaffolding\General + + + Getting all available Microsoft Azure Add-Ons, this may take few minutes... + + + Name{0}Primary Key{0}Seconday Key + + + Git not found. Please install git and place it in your command line path. + + + Could not find publish settings. Please run Import-AzurePublishSettingsFile. + + + Could not find publish settings. Please run Import-AzurePublishSettingsFile. + + + iisnode.dll + + + iisnode + + + iisnode-dev\\release\\x64 + + + iisnode + + + Installing IISNode version {0} in Azure for WebRole '{1}' (the version locally installed is: {2}) + + + Illegal characters in path. + + + Illegal characters in path. + + + Internal Server Error + + + Cannot enable memcach protocol on a cache worker role {0}. + + + Invalid certificate format. Publish settings may be corrupted. Use Get-AzurePublishSettingsFile to download updated settings + + + Invalid certificate format. Publish settings may be corrupted. Use Get-AzurePublishSettingsFile to download updated settings + + + Invalid certificate format. + + + The provided configuration path is invalid or doesn't exist + + + The country name is invalid, please use a valid two character country code, as described in ISO 3166-1 alpha-2. + + + No current subscription has been designated. Use Select-AzureSubscription -Current <subscriptionName> to set the current subscription. + + + The ID of the current subscription is invalid. Use Set-AzureSubscription to fix the subscription ID or use Select-AzureSubscription to use a different subscription. + + + The management certificate of the current subscription is invalid. Use Set-AzureSubscription to fix the management certificate or use Select-AzureSubscription to use a different subscription. + + + No default subscription has been designated. Use Select-AzureSubscription -Default <subscriptionName> to set the default subscription. + + + Deployment with {0} does not exist + + + The deployment slot name {0} is invalid. Slot name must be either "Staging" or "Production". + + + "{0}" is an invalid DNS name for {1} + + + Invalid service endpoint. + + + The provided file in {0} must be have {1} extension + + + File {0} has invalid characters + + + You must create your git publishing credentials using the Microsoft Azure portal. +Please follow these steps in the portal: +1. On the left side open "Web Sites" +2. Click on any website +3. Choose "Setup Git Publishing" or "Reset deployment credentials" +4. Back in the PowerShell window, rerun this command by typing "New-AzureWebSite {site name} -Git -PublishingUsername {username} + + + The value {0} provided is not a valid GUID. Please provide a valid GUID. + + + The specified hostname does not exist. Please specify a valid hostname for the site. + + + Role {0} instances must be greater than or equal 0 and less than or equal 20 + + + There was an error creating your webjob. Please make sure that the script is in the root folder of the zip file. + + + Cannot create instance of management client type {0}. It does not have the expected constructor. + + + Could not download a valid runtime manifest, Please check your internet connection and try again. + + + The account {0} was not found. Please specify a valid account name. + + + The provided name "{0}" does not match the service bus namespace naming rules. + + + Value cannot be null. Parameter name: '{0}' + + + {0} is invalid or empty + + + The provided package path is invalid or doesn't exist + + + '{0}' is an invalid parameter set name. + + + {0} doesn't exist in {1} or you've not passed valid value for it + + + Path {0} has invalid characters + + + The provided publish settings file {0} has invalid content. Please get valid by running cmdlet Get-AzurePublishSettingsFile + + + The provided publish settings file {0} has invalid content. Please get valid by running cmdlet Get-AzurePublishSettingsFile + + + The provided role name "{0}" has invalid characters + + + A valid name for the service root folder is required + + + {0} is not a recognized runtime type + + + A valid language is required + + + No subscription is currently selected. Use Select-Subscription to activate a subscription. + + + The provided location "{0}" does not exist in the available locations use Get-AzureSBLocation for listing available locations. + + + Please provide a service name or run this command from inside a service project directory. + + + You must provide valid value for {0} + + + You must provide valid value for {0} + + + settings.json is invalid or doesn't exist + + + The subscription named '{0}' cannot be found. Use Set-AzureSubscription to initialize the subscription data. + + + The provided subscription id {0} is not valid + + + Must specify a non-null subscription name. + + + A valid subscription name is required. This can be provided using the -Subscription parameter or by setting the subscription via the Set-AzureSubscription cmdlet + + + The provided subscriptions file {0} has invalid content. + + + Your Azure credentials have not been set up or have expired, please run Add-AzureAccount to set up your Azure credentials. + + + Role {0} VM size should be ExtraSmall, Small, Medium, Large or ExtraLarge. + + + The web job file must have *.zip extension + + + Singleton option works for continuous jobs only. + + + The website {0} was not found. Please specify a valid website name. + + + No job for id: {0} was found. + WAPackIaaS + + + engines + + + Scaffolding for this language is not yet supported + + + Link already established + + + local_package.csx + + + ServiceConfiguration.Local.cscfg + + + Looking for {0} deployment for {1} cloud service... + + + Looking for cloud service {0}... + + + managementCertificate.pem + + + ?whr={0} + + + //baseuri + + + uri + + + http://az413943.vo.msecnd.net/node/runtimemanifest_0.7.5.2.xml + + + v2.5 + + + memcache_default + + + 11211 + + + v2.5 + + + Python 2.7 is not installed. Please install it as well as Django 1.4. + + + Multiple Add-Ons found holding name {0} + + + Multiple possible publishing users. Please go to the Portal and use the listed deployment user, or click 'set/reset deployment credentials' to set up a new user account, then reurn this cmdlet and specify PublishingUsername. + + + The first publish settings file "{0}" is used. If you want to use another file specify the file name. + + + Microsoft.Azure.Plugins.Caching.NamedCaches + + + {"caches":[{"name":"default","policy":{"eviction":{"type":0},"expiration":{"defaultTTL":10,"isExpirable":true,"type":1},"serverNotification":{"isEnabled":false}},"secondaries":0}]} + + + A publishing username is required. Please specify one using the argument PublishingUsername. + + + New Add-On Confirmation + + + By typing "Yes", I (a) authorize Microsoft to charge my current payment method on a monthly basis +for the amount indicated at {0} for {1} until my service is cancelled or terminated, and (b) +agree to the {2}'s terms of user and privacy statement at {0} and (c) agree to sharing my +contact information with {2}. + + + Internal Server Error. This could happen because the namespace name is already used or due to an incorrect location name. Use Get-AzureSBLocation cmdlet to list valid names. + + + By typing "Yes", I (a) authorize Microsoft to charge my current payment method on a monthly basis +for the amount indicated at {0} for {1} until my service is cancelled or terminated, and (b) +acknowledge the offering is provided by {2}, not Microsoft, and agree to {2}'s terms of +use and privacy statement at {0} and (c) agree to sharing my contact information with {2}. + + + Service has been created at {0} + + + No + + + There is no access token cached for subscription {0}, user id {1}. Use the Add-AzureAccount cmdlet to log in again and get a token for this subscription. + + + The service does not have any cache worker roles, add one first by running cmdlet Add-AzureCacheWorkerRole. + + + No clouds available + WAPackIaaS + + + nodejs + + + node + + + node.exe + + + There is no default subscription set, please set a default subscription by running Set-AzureSubscription -Default <subscription name> + + + Microsoft SDKs\Azure\Nodejs\Nov2011 + + + nodejs + + + node + + + Resources\Scaffolding\Node + + + Microsoft.Azure.Commands.CloudService.ScaffoldingResources.Node + + + Installing Node version {0} in Azure for Role '{1}' (the Node version locally installed is: {2}) + + + No, I do not agree + + + Please connect to internet before executing this cmdlet + + + Please connect to internet before executing this cmdlet + + + No publish settings files with extension *.publishsettings are found in the directory "{0}". + + + '{0}' must be a cache worker role. Verify that it has proper cache worker role configuration. + + + Certificate can't be null. + + + {0} could not be null or empty + + + Unable to add a null RoleSettings to {0} + + + Unable to add new role to null service definition + + + The request offer '{0}' is not found. + + + Operation "{0}" failed on VM with ID: {1} + WAPackIaaS + + + The REST operation failed with message '{0}' and error code '{1}' + + + Job Id {0} did not complete within expected time or it is in Failed/Canceled/Invalid state. + WAPackIaaS + + + package + + + Package is created at service root path {0}. + + + {{ + "author": "", + + "name": "{0}", + "version": "0.0.0", + "dependencies":{{}}, + "devDependencies":{{}}, + "optionalDependencies": {{}}, + "engines": {{ + "node": "*", + "iisnode": "*" + }} + +}} + + + + package.json + + + Path {0} doesn't exist. + + + Path for {0} doesn't exist in {1}. + + + A value for the Peer Asn has to be provided. + + + 5.4.0 + + + php + + + Resources\Scaffolding\PHP + + + Microsoft.Azure.Commands.CloudService.ScaffoldingResources.PHP + + + Installing PHP version {0} for Role '{1}' (the PHP version locally installed is: {2}) + + + You must create your first web site using the Microsoft Azure portal. +Please follow these steps in the portal: +1. At the bottom of the page, click on New > Web Site > Quick Create +2. Type {0} in the URL field +3. Click on "Create Web Site" +4. Once the site has been created, click on the site name +5. Click on "Set up Git publishing" or "Reset deployment credentials" and setup a publishing username and password. Use those credentials for all new websites you create. + + + 6. Back in the console window, rerun this command by typing "New-AzureWebsite <site name> -Git" + + + A value for the Primary Peer Subnet has to be provided. + + + Promotion code can be used only when updating to a new plan. + + + Service not published at user request. + + + Complete. + + + Connecting... + + + Created Deployment ID: {0}. + + + Created hosted service '{0}'. + + + Created Website URL: {0}. + + + Creating... + + + Initializing... + + + busy + + + creating the virtual machine + + + Instance {0} of role {1} is {2}. + + + ready + + + Preparing deployment for {0} with Subscription ID: {1}... + + + Publishing {0} to Microsoft Azure. This may take several minutes... + + + publish settings + + + Azure + + + .PublishSettings + + + publishSettings.xml + + + &whr={0} + + + Publish settings imported + + + AZURE_PUBLISHINGPROFILE_URL + + + Starting... + + + Upgrading... + + + Uploading Package to storage service {0}... + + + Verifying storage account '{0}'... + + + Resources\Scaffolding\Python + + + Replace current deployment with '{0}' Id ? + + + Are you sure you want to regenerate key? + + + Generate new key. + + + Are you sure you want to remove account '{0}'? + + + Removing account + + + Remove Add-On Confirmation + + + If you delete this add-on, your data may be deleted and the operation may not be undone. You may have to purchase it again from the Microsoft Azure Store to use it. The price of the add-on may not be refunded. Are you sure you want to delete this add-on? Enter “Yes” to confirm. + + + Remove-AzureBGPPeering Operation failed. + + + Removing Bgp Peering + + + Successfully removed Azure Bgp Peering with Service Key {0}. + + + Are you sure you want to remove the Bgp Peering with service key '{0}'? + + + Are you sure you want to remove the Dedicated Circuit with service key '{0}'? + + + Remove-AzureDedicatedCircuit Operation failed. + + + Remove-AzureDedicatedCircuitLink Operation failed. + + + Removing Dedicated Circui Link + + + Successfully removed Azure Dedicated Circuit Link with Service Key {0} and Vnet Name {1} + + + Are you sure you want to remove the Dedicated Circuit Link with service key '{0}' and virtual network name '{1}'? + + + Removing Dedicated Circuit + + + Successfully removed Azure Dedicated Circuit with Service Key {0}. + + + Removing cloud service {0}... + + + The current subscription is being removed. Use Select-AzureSubscription <subscriptionName> to select a new current subscription. + + + The default subscription is being removed. Use Select-AzureSubscription -Default <subscriptionName> to select a new default subscription. + + + Removing {0} deployment for {1} service + + + Removing job collection + + + Are you sure you want to remove the job collection "{0}" + + + Removing job + + + Are you sure you want to remove the job "{0}" + + + Are you sure you want to remove the account? + + + Account removed. + + + Internal Server Error. This could happen because the namespace does not exist or it does not exist under your subscription. + + + Removing old package {0}... + + + Are you sure you want to delete the namespace '{0}'? + + + Are you sure you want to remove cloud service? + + + Remove cloud service and all it's deployments + + + Are you sure you want to remove subscription '{0}'? + + + Removing subscription + + + Are you sure you want to delete the VM '{0}'? + + + Deleting VM. + + + Removing WebJob... + + + Are you sure you want to remove job '{0}'? + + + Removing website + + + Are you sure you want to remove the website "{0}" + + + Deleting namespace + + + Repository is not setup. You need to pass a valid site name. + + + Reserved IP with the Name:'{0}' will no longer be in use after the deployment is deleted, and it is still reserved for later use. + + + Resource with ID : {0} does not exist. + WAPackIaaS + + + Restart + WAPackIaaS + + + Resume + WAPackIaaS + + + /role:{0};"{1}/{0}" + + + bin + + + Role {0} is {1} + + + 20 + + + role name + + + The provided role name {0} doesn't exist + + + RoleSettings.xml + + + Role type {0} doesn't exist + + + public static Dictionary<string, Location> ReverseLocations { get; private set; } + + + Preparing runtime deployment for service '{0}' + + + WARNING Runtime Mismatch: Are you sure that you want to publish service '{0}' using an Azure runtime version that does not match your local runtime version? + + + RUNTIMEOVERRIDEURL + + + /runtimemanifest/runtimes/runtime + + + RUNTIMEID + + + RUNTIMEURL + + + RUNTIMEVERSIONPRIMARYKEY + + + scaffold.xml + + + Invalid location entered. Pick one of the locations from Get-AzureSchedulerLocation + + + A value for the Secondary Peer Subnet has to be provided. + + + Service {0} already exists on disk in location {1} + + + No ServiceBus authorization rule with the given characteristics was found + + + The service bus entity '{0}' is not found. + + + Internal Server Error. This could happen due to an incorrect/missing namespace + + + service configuration + + + service definition + + + ServiceDefinition.csdef + + + ServiceDefinition.csdef + + + {0}Deploy + + + The specified cloud service "{0}" does not exist. + + + {0} slot for service {1} is in {2} state, please wait until it finish and update it's status + + + Begin Operation: {0} + + + Completed Operation: {0} + + + Begin Operation: {0} + + + Completed Operation: {0} + + + service name + + + The provided service name {0} already exists, please pick another name + + + The provided service name {0} already exists, please pick another name + + + Please provide name for the hosted service + + + service parent directory + + + Service {0} removed successfully + + + service directory + + + service settings + + + The storage account name '{0}' is invalid. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. + + + The storage account name '{0}' is invalid. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. + + + service settings + + + The {0} slot for cloud service {1} doesn't exist. + + + {0} slot for service {1} is {2} + + + Set Add-On Confirmation + + + Note - You will be charged the amount for the new plan, without being refunded for time remaining +in the existing plan. +By typing "Yes", I (a) authorize Microsoft to charge my current payment method on a monthly basis +for the amount indicated at {0} for {1} until my service is cancelled or terminated, and (b) +agree to the {2}'s terms of user and privacy statement at {0} and (c) agree to sharing my +contact information with {2}. + + + Note - You will be charged the amount for the new plan, without being refunded for time remaining +in the existing plan. +By typing "Yes", I (a) authorize Microsoft to charge my current payment method on a monthly basis +for the amount indicated at {0} for {1} until my service is cancelled or terminated, and (b) +acknowledge the offering is provided by {2}, not Microsoft, and agree to {2}'s terms of +use and privacy statement at <url> and (c) agree to sharing my contact information with {2}. + + + Role {0} instances are set to {1} + + + {"Slot":"","Location":"","Subscription":"","StorageAccountName":""} + + + deploymentSettings.json + + + deploymentSettings.json + + + Confirm + + + Confirm + + + Shutdown + WAPackIaaS + + + /sites:{0};{1};"{2}/{0}" + + + 1000 + + + Start + WAPackIaaS + + + Started + + + Starting Emulator... + + + start + + + Stop + WAPackIaaS + + + Stopping emulator... + + + Stopped + + + stop + + + Account Name: + + + Cannot find storage account '{0}' please type the name of an existing storage account. + + + WAStorageEmulator.exe + + + InstallPath + + + SOFTWARE\Microsoft\Windows Azure Storage Emulator + + + Primary Key: + + + Secondary Key: + + + The subscription named {0} already exists. + + + DefaultSubscriptionData.xml + + + The subscription data file {0} does not exist. + + + The subscription id {0} doesn't exist. + + + The subscription name {0} doesn't exist. + + + Subscription must not be null + WAPackIaaS + + + Suspend + WAPackIaaS + + + Swapping website production slot ... + + + Are you sure you want to swap the website '{0}' production slot with slot '{1}'? + + + Unable to create Django application: {0} + + + Make sure you have Python 2.7 installed along with Django installed to site-packages. + + + Unable to update mismatching Json structured: {0} {1}. + + + The provider {0} is unknown. + + + Update + WAPackIaaS + + + Updated settings for subscription '{0}'. Current subscription is '{1}'. + + + A value for the VLan Id has to be provided. + + + Please wait... + + + The azure storage emulator is not installed, skip launching... + + + Web.cloud.config + + + web.config + + + MSDeploy + + + Cannot build the project successfully. Please see logs in {0}. + + + WebRole + + + setup_web.cmd > log.txt + + + WebRole.xml + + + WebSite with given name {0} already exists in the specified Subscription and Webspace. + + + WebSite with given name {0} already exists in the specified Subscription and Location. + + + Site {0} already has repository created for it. + + + Workspaces/WebsiteExtension/Website/{0}/dashboard/ + + + https://{0}/msdeploy.axd?site={1} + + + WorkerRole + + + setup_worker.cmd > log.txt + + + WorkerRole.xml + + + (x86) + + + Yes + + + Yes, I agree + + + Remove-AzureTrafficManagerProfile Operation failed. + + + Successfully removed Traffic Manager profile with name {0}. + + + Are you sure you want to remove the Traffic Manager profile "{0}"? + + + Profile {0} already has an endpoint with name {1} + + + Profile {0} does not contain endpoint {1}. Adding it. + + + The endpoint {0} cannot be removed from profile {1} because it's not in the profile. + + + Insufficient parameters passed to create a new endpoint. + + + Ambiguous operation: the profile name specified doesn't match the name of the profile object. + + + <NONE> + + + + + + "An exception occurred when calling the ServiceManagement API. HTTP Status Code: {0}. Service Management Error Code: {1}. Message: {2}. Operation Tracking ID: {3}." + {0} is the HTTP status code. {1} is the Service Management Error Code. {2} is the Service Management Error message. {3} is the operation tracking ID. + + + Unable to decode string from base 64. Please make sure the string is correctly encoded: {0}. + {0} is the string that is not in a valid base 64 format. + + + -Credential parameter can only be used with Organization ID credentials. For more information, please refer to http://go.microsoft.com/fwlink/?linkid=331007&clcid=0x409 for more information about the difference between an organizational account and a Microsoft account. + + + Skipping external tenant {0}, because you are using a guest or a foreign principal object identity. In order to access this tenant, please run Add-AzureAccount without "-Credential". + + + Removing an environment will remove all associated subscriptions and accounts. Are you sure you want to remove an environment '{0}'? + + + Removing environment + + + Removing public environment is not supported. + + + Changing public environment is not supported. + + + Credential type invalid, only handles '{0}' + + + Illegal credential type + + + There is no subscription associated with account {0}. + + + Account id doesn't match one in subscription. + + + Environment name doesn't match one in subscription. + + + Unable to retrieve service key for ServicePrincipal account {0}. Please run the Add-AzureAccount cmdlet to supply the credentials for this service principal. + + + Removing the Azure profile will remove all associated environments, subscriptions, and accounts. Are you sure you want to remove the Azure profile? + + + Removing the Azure profile + + + The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. + + \ No newline at end of file diff --git a/src/Common/Commands.Common/Utilities/DictionaryExtensions.cs b/src/Common/Azure.Common.Extensions/Utilities/DictionaryExtensions.cs similarity index 98% rename from src/Common/Commands.Common/Utilities/DictionaryExtensions.cs rename to src/Common/Azure.Common.Extensions/Utilities/DictionaryExtensions.cs index 1eaaa77c3b6c..19c2f027c20a 100644 --- a/src/Common/Commands.Common/Utilities/DictionaryExtensions.cs +++ b/src/Common/Azure.Common.Extensions/Utilities/DictionaryExtensions.cs @@ -16,7 +16,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.WindowsAzure.Commands.Common.Utilities +namespace Microsoft.Azure.Common.Extensions.Utilities { public static class DictionaryExtensions { diff --git a/src/Common/Commands.Common/Utilities/FileUtilities.cs b/src/Common/Azure.Common.Extensions/Utilities/FileUtilities.cs similarity index 98% rename from src/Common/Commands.Common/Utilities/FileUtilities.cs rename to src/Common/Azure.Common.Extensions/Utilities/FileUtilities.cs index 33ce3f25c731..0a1aa121f2a9 100644 --- a/src/Common/Commands.Common/Utilities/FileUtilities.cs +++ b/src/Common/Azure.Common.Extensions/Utilities/FileUtilities.cs @@ -12,17 +12,17 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Interfaces; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions.Properties; using System; using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; using System.Text; -using Microsoft.WindowsAzure.Commands.Common.Interfaces; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Common.Properties; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.Azure.Common.Extensions { public static class FileUtilities { diff --git a/src/Common/Commands.Common/Utilities/JsonUtilities.cs b/src/Common/Azure.Common.Extensions/Utilities/JsonUtilities.cs similarity index 97% rename from src/Common/Commands.Common/Utilities/JsonUtilities.cs rename to src/Common/Azure.Common.Extensions/Utilities/JsonUtilities.cs index fda8d38e39d9..775718642225 100644 --- a/src/Common/Commands.Common/Utilities/JsonUtilities.cs +++ b/src/Common/Azure.Common.Extensions/Utilities/JsonUtilities.cs @@ -12,15 +12,14 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Properties; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Web.Script.Serialization; -using Microsoft.WindowsAzure.Commands.Common.Properties; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.Azure.Common.Extensions { public static class JsonUtilities { diff --git a/src/Common/Commands.Common/Utilities/XmlUtilities.cs b/src/Common/Azure.Common.Extensions/Utilities/XmlUtilities.cs similarity index 97% rename from src/Common/Commands.Common/Utilities/XmlUtilities.cs rename to src/Common/Azure.Common.Extensions/Utilities/XmlUtilities.cs index 9d2af2753947..834c12df07bc 100644 --- a/src/Common/Commands.Common/Utilities/XmlUtilities.cs +++ b/src/Common/Azure.Common.Extensions/Utilities/XmlUtilities.cs @@ -12,15 +12,15 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Properties; using System; using System.IO; using System.Text; using System.Xml; using System.Xml.Linq; using System.Xml.Serialization; -using Microsoft.WindowsAzure.Commands.Common.Properties; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.Azure.Common.Extensions { public static class XmlUtilities { diff --git a/src/Common/Commands.Common/XmlSchema/PublishProfile.cs b/src/Common/Azure.Common.Extensions/XmlSchema/PublishProfile.cs similarity index 98% rename from src/Common/Commands.Common/XmlSchema/PublishProfile.cs rename to src/Common/Azure.Common.Extensions/XmlSchema/PublishProfile.cs index 4eb2764bf1a0..852dff1f026e 100644 --- a/src/Common/Commands.Common/XmlSchema/PublishProfile.cs +++ b/src/Common/Azure.Common.Extensions/XmlSchema/PublishProfile.cs @@ -24,7 +24,7 @@ using System.Xml.Serialization; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema +namespace Microsoft.Azure.Common.Extensions.XmlSchema { /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.30319.1")] diff --git a/src/Common/Azure.Common.Extensions/packages.config b/src/Common/Azure.Common.Extensions/packages.config new file mode 100644 index 000000000000..56b52b68db88 --- /dev/null +++ b/src/Common/Azure.Common.Extensions/packages.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj b/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj index b1b8cc0d7dab..8c32acd701c8 100644 --- a/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj +++ b/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj @@ -131,6 +131,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs b/src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs index fdeb4d022aeb..9e9294f98d9b 100644 --- a/src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs +++ b/src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs @@ -15,10 +15,11 @@ using System; using System.Collections.Generic; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Management.Storage; using Microsoft.WindowsAzure.Storage; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { diff --git a/src/Common/Commands.Common.Test/Commands.Common.Test.csproj b/src/Common/Commands.Common.Test/Commands.Common.Test.csproj index cde8cb977aa3..052b5d184fa0 100644 --- a/src/Common/Commands.Common.Test/Commands.Common.Test.csproj +++ b/src/Common/Commands.Common.Test/Commands.Common.Test.csproj @@ -187,6 +187,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/Common/Commands.Common.Test/Common/AuthenticationFactoryTests.cs b/src/Common/Commands.Common.Test/Common/AuthenticationFactoryTests.cs index 3dd6a921c807..1c40dff9da38 100644 --- a/src/Common/Commands.Common.Test/Common/AuthenticationFactoryTests.cs +++ b/src/Common/Commands.Common.Test/Common/AuthenticationFactoryTests.cs @@ -15,10 +15,10 @@ using System.Collections.Generic; using Xunit; using System; -using Microsoft.WindowsAzure.Commands.Common.Factories; +using Microsoft.Azure.Common.Extensions.Factories; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Authentication; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common { @@ -34,7 +34,7 @@ public void VerifySubscriptionTokenCacheRemove() var subscriptionId = Guid.NewGuid(); - var credential = authFactory.GetSubscriptionCloudCredentials(new Models.AzureContext + var credential = authFactory.GetSubscriptionCloudCredentials(new AzureContext { Environment = AzureEnvironment.PublicEnvironments["AzureCloud"], Account = new AzureAccount diff --git a/src/Common/Commands.Common.Test/Common/ConversionUtilitiesTests.cs b/src/Common/Commands.Common.Test/Common/ConversionUtilitiesTests.cs index ed098a0d1679..68cf9479d686 100644 --- a/src/Common/Commands.Common.Test/Common/ConversionUtilitiesTests.cs +++ b/src/Common/Commands.Common.Test/Common/ConversionUtilitiesTests.cs @@ -15,6 +15,7 @@ using System.Collections.Generic; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Common.Test { diff --git a/src/Common/Commands.Common.Test/Common/Data.cs b/src/Common/Commands.Common.Test/Common/Data.cs index d3199651a331..18c6d3189341 100644 --- a/src/Common/Commands.Common.Test/Common/Data.cs +++ b/src/Common/Commands.Common.Test/Common/Data.cs @@ -19,6 +19,8 @@ using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { diff --git a/src/Common/Commands.Common.Test/Common/GeneralTests.cs b/src/Common/Commands.Common.Test/Common/GeneralTests.cs index 91f4cf38197c..52c47af4e469 100644 --- a/src/Common/Commands.Common.Test/Common/GeneralTests.cs +++ b/src/Common/Commands.Common.Test/Common/GeneralTests.cs @@ -16,6 +16,7 @@ using System.IO; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common { diff --git a/src/Common/Commands.Common.Test/Common/JsonUtilitiesTests.cs b/src/Common/Commands.Common.Test/Common/JsonUtilitiesTests.cs index e2dfd02e0a3c..9d01c351e8e7 100644 --- a/src/Common/Commands.Common.Test/Common/JsonUtilitiesTests.cs +++ b/src/Common/Commands.Common.Test/Common/JsonUtilitiesTests.cs @@ -19,6 +19,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common { diff --git a/src/Common/Commands.Common.Test/Common/ProfileClientTests.cs b/src/Common/Commands.Common.Test/Common/ProfileClientTests.cs index bc610519eaae..271051bc6811 100644 --- a/src/Common/Commands.Common.Test/Common/ProfileClientTests.cs +++ b/src/Common/Commands.Common.Test/Common/ProfileClientTests.cs @@ -17,12 +17,13 @@ using System.IO; using System.Linq; using Microsoft.Azure.Subscriptions.Models; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Profile; using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Authentication; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common { @@ -1438,7 +1439,7 @@ private void SetMockData() oldProfileDataPath = System.IO.Path.Combine(AzurePowerShell.ProfileDirectory, AzurePowerShell.OldProfileFile); oldProfileDataPathError = System.IO.Path.Combine(AzurePowerShell.ProfileDirectory, AzurePowerShell.OldProfileFileBackup); oldProfileData = @" - + AzureCloud @@ -1547,7 +1548,7 @@ private void SetMockData() "; oldProfileDataBadSubscription = @" - + AzureCloud @@ -1628,7 +1629,7 @@ private void SetMockData() "; oldProfileDataCorruptedFile = @" - + AzureCloud diff --git a/src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs b/src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs index 25ad50d3662c..856392d00b8e 100644 --- a/src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs +++ b/src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs @@ -22,13 +22,14 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using Microsoft.IdentityModel.Clients.ActiveDirectory; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Profile; using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Authentication; using Moq; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common { diff --git a/src/Common/Commands.Common.Test/Common/RemoveAzurePublishSettings.cs b/src/Common/Commands.Common.Test/Common/RemoveAzurePublishSettings.cs index 07819a16ea4e..6c5fa8acfa92 100644 --- a/src/Common/Commands.Common.Test/Common/RemoveAzurePublishSettings.cs +++ b/src/Common/Commands.Common.Test/Common/RemoveAzurePublishSettings.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common diff --git a/src/Common/Commands.Common.Test/Common/ServicePrincipalStoreTests.cs b/src/Common/Commands.Common.Test/Common/ServicePrincipalStoreTests.cs index a3a8d4d59863..727260cdbf2a 100644 --- a/src/Common/Commands.Common.Test/Common/ServicePrincipalStoreTests.cs +++ b/src/Common/Commands.Common.Test/Common/ServicePrincipalStoreTests.cs @@ -12,10 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Authentication; using System; using System.Runtime.InteropServices; using System.Security; -using Microsoft.WindowsAzure.Commands.Common.Authentication; using Xunit; using Assert = Xunit.Assert; diff --git a/src/Common/Commands.Common.Test/Common/TestBase.cs b/src/Common/Commands.Common.Test/Common/TestBase.cs index 1d45fbe53e34..9e36cc6c2c61 100644 --- a/src/Common/Commands.Common.Test/Common/TestBase.cs +++ b/src/Common/Commands.Common.Test/Common/TestBase.cs @@ -16,9 +16,10 @@ using System.Collections.Generic; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { diff --git a/src/Common/Commands.Common.Test/Mocks/MockAccessToken.cs b/src/Common/Commands.Common.Test/Mocks/MockAccessToken.cs index de070b5a63f7..72037f0e2809 100644 --- a/src/Common/Commands.Common.Test/Mocks/MockAccessToken.cs +++ b/src/Common/Commands.Common.Test/Mocks/MockAccessToken.cs @@ -13,7 +13,7 @@ // ---------------------------------------------------------------------------------- using System; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Authentication; namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks { diff --git a/src/Common/Commands.Common.Test/Mocks/MockAccessTokenProvider.cs b/src/Common/Commands.Common.Test/Mocks/MockAccessTokenProvider.cs index 50bc854b8e87..34bfe4adb8d6 100644 --- a/src/Common/Commands.Common.Test/Mocks/MockAccessTokenProvider.cs +++ b/src/Common/Commands.Common.Test/Mocks/MockAccessTokenProvider.cs @@ -13,9 +13,9 @@ // ---------------------------------------------------------------------------------- using System.Security; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Authentication; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { diff --git a/src/Common/Commands.Common.Test/Mocks/MockCertificateAuthenticationFactory.cs b/src/Common/Commands.Common.Test/Mocks/MockCertificateAuthenticationFactory.cs index 746486b575b3..e2b68c5b2143 100644 --- a/src/Common/Commands.Common.Test/Mocks/MockCertificateAuthenticationFactory.cs +++ b/src/Common/Commands.Common.Test/Mocks/MockCertificateAuthenticationFactory.cs @@ -14,8 +14,9 @@ using System.Security; using System.Security.Cryptography.X509Certificates; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions.Authentication; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks { diff --git a/src/Common/Commands.Common.Test/Mocks/MockClientFactory.cs b/src/Common/Commands.Common.Test/Mocks/MockClientFactory.cs index 12ede8e14c8d..fca693ee7621 100644 --- a/src/Common/Commands.Common.Test/Mocks/MockClientFactory.cs +++ b/src/Common/Commands.Common.Test/Mocks/MockClientFactory.cs @@ -18,9 +18,10 @@ using System.Net; using System.Net.Http; using Microsoft.Azure.Utilities.HttpRecorder; -using Microsoft.WindowsAzure.Commands.Common.Factories; -using Microsoft.WindowsAzure.Commands.Common.Models; using Microsoft.WindowsAzure.Common; +using Microsoft.Azure.Common.Extensions.Factories; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks { diff --git a/src/Common/Commands.Common.Test/Mocks/MockDataStore.cs b/src/Common/Commands.Common.Test/Mocks/MockDataStore.cs index 5f975085054c..55b2f053632b 100644 --- a/src/Common/Commands.Common.Test/Mocks/MockDataStore.cs +++ b/src/Common/Commands.Common.Test/Mocks/MockDataStore.cs @@ -19,7 +19,7 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using System.Text.RegularExpressions; -using Microsoft.WindowsAzure.Commands.Common.Interfaces; +using Microsoft.Azure.Common.Extensions.Interfaces; namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks { diff --git a/src/Common/Commands.Common.Test/Mocks/MockTokenAuthenticationFactory.cs b/src/Common/Commands.Common.Test/Mocks/MockTokenAuthenticationFactory.cs index 8269cdb7e422..5675b84696e5 100644 --- a/src/Common/Commands.Common.Test/Mocks/MockTokenAuthenticationFactory.cs +++ b/src/Common/Commands.Common.Test/Mocks/MockTokenAuthenticationFactory.cs @@ -15,8 +15,9 @@ using System; using System.Security; using System.Security.Cryptography.X509Certificates; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions.Authentication; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks { diff --git a/src/Common/Commands.Common/Common/AzurePSCmdlet.cs b/src/Common/Commands.Common/AzurePSCmdlet.cs similarity index 95% rename from src/Common/Commands.Common/Common/AzurePSCmdlet.cs rename to src/Common/Commands.Common/AzurePSCmdlet.cs index 15bc85031677..abf5f1496930 100644 --- a/src/Common/Commands.Common/Common/AzurePSCmdlet.cs +++ b/src/Common/Commands.Common/AzurePSCmdlet.cs @@ -12,12 +12,13 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.WindowsAzure.Commands.Common.Properties; using System; using System.Diagnostics; using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Common.Properties; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { @@ -25,6 +26,16 @@ public abstract class AzurePSCmdlet : PSCmdlet { private readonly RecordingTracingInterceptor httpTracingInterceptor = new RecordingTracingInterceptor(); + static AzurePSCmdlet() + { + if (!TestMockSupport.RunningMocked) + { + AzureSession.ClientFactory.AddAction(new RPRegistrationAction()); + } + + AzureSession.ClientFactory.UserAgents.Add(AzurePowerShell.UserAgentValue); + } + public AzurePSCmdlet() { DefaultProfileClient = new ProfileClient(); diff --git a/src/Common/Commands.Common/Common/AzurePowerShell.cs b/src/Common/Commands.Common/AzurePowerShell.cs similarity index 86% rename from src/Common/Commands.Common/Common/AzurePowerShell.cs rename to src/Common/Commands.Common/AzurePowerShell.cs index a78b979298a3..b4be4772a6ed 100644 --- a/src/Common/Commands.Common/Common/AzurePowerShell.cs +++ b/src/Common/Commands.Common/AzurePowerShell.cs @@ -12,9 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions.Properties; using System; using System.IO; -using Microsoft.WindowsAzure.Commands.Common.Properties; +using System.Net.Http.Headers; namespace Microsoft.WindowsAzure.Commands.Common { @@ -38,6 +39,10 @@ public class AzurePowerShell public const string TokenCacheFile = "TokenCache.dat"; + public static ProductInfoHeaderValue UserAgentValue = new ProductInfoHeaderValue( + "AzurePowershell", + string.Format("v{0}", AzurePowerShell.AssemblyVersion)); + public static string ProfileDirectory = Path.Combine( Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Resources.AzureDirectoryName); diff --git a/src/Common/Commands.Common/Common/ChannelHelper.cs b/src/Common/Commands.Common/ChannelHelper.cs similarity index 99% rename from src/Common/Commands.Common/Common/ChannelHelper.cs rename to src/Common/Commands.Common/ChannelHelper.cs index 3dd385d3273c..57a41327e92b 100644 --- a/src/Common/Commands.Common/Common/ChannelHelper.cs +++ b/src/Common/Commands.Common/ChannelHelper.cs @@ -12,6 +12,8 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using System; using System.Diagnostics.CodeAnalysis; using System.IO; @@ -27,7 +29,6 @@ using System.Text; using System.Threading; using System.Xml; -using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { @@ -300,7 +301,7 @@ public class UserAgentMessageProcessingHandler : MessageProcessingHandler { protected override HttpRequestMessage ProcessRequest(HttpRequestMessage request, CancellationToken cancellationToken) { - request.Headers.UserAgent.Add(ApiConstants.UserAgentValue); + request.Headers.UserAgent.Add(AzurePowerShell.UserAgentValue); return request; } diff --git a/src/Common/Commands.Common/Common/ClientCreatedArgs.cs b/src/Common/Commands.Common/ClientCreatedArgs.cs similarity index 100% rename from src/Common/Commands.Common/Common/ClientCreatedArgs.cs rename to src/Common/Commands.Common/ClientCreatedArgs.cs diff --git a/src/Common/Commands.Common/Common/CloudBaseCmdlet.cs b/src/Common/Commands.Common/CloudBaseCmdlet.cs similarity index 98% rename from src/Common/Commands.Common/Common/CloudBaseCmdlet.cs rename to src/Common/Commands.Common/CloudBaseCmdlet.cs index 6f1cfb01292f..b8a8ee7a4412 100644 --- a/src/Common/Commands.Common/Common/CloudBaseCmdlet.cs +++ b/src/Common/Commands.Common/CloudBaseCmdlet.cs @@ -12,18 +12,18 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.WindowsAzure.Commands.Common.Properties; +using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using System; +using System.Diagnostics; using System.Globalization; using System.Management.Automation; using System.Net; using System.ServiceModel; using System.ServiceModel.Channels; using System.ServiceModel.Security; -using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Common.Properties; -using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; -using System.Diagnostics; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { diff --git a/src/Common/Commands.Common/Common/CmdletExtensions.cs b/src/Common/Commands.Common/CmdletExtensions.cs similarity index 100% rename from src/Common/Commands.Common/Common/CmdletExtensions.cs rename to src/Common/Commands.Common/CmdletExtensions.cs diff --git a/src/Common/Commands.Common/Commands.Common.csproj b/src/Common/Commands.Common/Commands.Common.csproj index 8a7df1ba2964..1c07ac6e9cdb 100644 --- a/src/Common/Commands.Common/Commands.Common.csproj +++ b/src/Common/Commands.Common/Commands.Common.csproj @@ -134,79 +134,32 @@ - - - - - - - - - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + True @@ -221,11 +174,16 @@ - Designer + + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + + diff --git a/src/Common/Commands.Common/Common/ManagementConstants.cs b/src/Common/Commands.Common/Common/ManagementConstants.cs deleted file mode 100644 index 269eaa2c119d..000000000000 --- a/src/Common/Commands.Common/Common/ManagementConstants.cs +++ /dev/null @@ -1,123 +0,0 @@ -// ---------------------------------------------------------------------------------- -// -// Copyright Microsoft Corporation -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// ---------------------------------------------------------------------------------- - -using System.Net.Http.Headers; -using Microsoft.WindowsAzure.Commands.Common; - -namespace Microsoft.WindowsAzure.Commands.Utilities.Common -{ - public static class ApiConstants - { - public const string AuthorizationHeaderName = "Authorization"; - - public const string BasicAuthorization = "Basic"; - - public const string UserAgentHeaderName = "User-Agent"; - - public const string UserAgentHeaderValue = "AzurePowershell/v" + AzurePowerShell.AssemblyVersion; - - public static ProductInfoHeaderValue UserAgentValue = new ProductInfoHeaderValue( - "AzurePowershell", - string.Format("v{0}", AzurePowerShell.AssemblyVersion)); - - public const string VSDebuggerCausalityDataHeaderName = "VSDebuggerCausalityData"; - - public const string OperationTrackingIdHeader = "x-ms-request-id"; - - public const string VersionHeaderContentLatest = "2013-08-01"; - - public const string VersionHeaderName = "x-ms-version"; - - } - - public class SDKVersion - { - public const string Version180 = "1.8.0"; - - public const string Version200 = "2.0.0"; - - public const string Version220 = "2.2.0"; - - public const string Version230 = "2.3.0"; - - public const string Version240 = "2.4.0"; - - public const string Version250 = "2.5.0"; - } - - public enum DevEnv - { - Local, - Cloud - } - - public enum RoleType - { - WebRole, - WorkerRole - } - - public enum RuntimeType - { - IISNode, - Node, - PHP, - Cache, - Null - } - - public static class EnvironmentName - { - public const string AzureCloud = "AzureCloud"; - - public const string AzureChinaCloud = "AzureChinaCloud"; - } - - public static class AzureEnvironmentConstants - { - public const string AzureServiceEndpoint = "https://management.core.windows.net/"; - - public const string ChinaServiceEndpoint = "https://management.core.chinacloudapi.cn/"; - - public const string AzureResourceManagerEndpoint = "https://management.azure.com/"; - - public const string GalleryEndpoint = "https://gallery.azure.com/"; - - public const string AzurePublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301775"; - - public const string ChinaPublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301776"; - - public const string AzureManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=254433"; - - public const string ChinaManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=301902"; - - public const string AzureStorageEndpointSuffix = "core.windows.net"; - - public const string ChinaStorageEndpointSuffix = "core.chinacloudapi.cn"; - - public const string AzureSqlDatabaseDnsSuffix = ".database.windows.net"; - - public const string ChinaSqlDatabaseDnsSuffix = ".database.chinacloudapi.cn"; - - public const string AzureActiveDirectoryEndpoint = "https://login.windows.net/"; - - public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/"; - - public const string AzureGraphEndpoint = "https://graph.windows.net/"; - - public const string AzureTrafficManagerDnsSuffix = "trafficmanager.net"; - - public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn"; - } -} \ No newline at end of file diff --git a/src/Common/Commands.Common/Common/ConfigurationConstants.cs b/src/Common/Commands.Common/ConfigurationConstants.cs similarity index 100% rename from src/Common/Commands.Common/Common/ConfigurationConstants.cs rename to src/Common/Commands.Common/ConfigurationConstants.cs diff --git a/src/Common/Commands.Common/Constants.cs b/src/Common/Commands.Common/Constants.cs new file mode 100644 index 000000000000..33794d1e455d --- /dev/null +++ b/src/Common/Commands.Common/Constants.cs @@ -0,0 +1,72 @@ +// ---------------------------------------------------------------------------------- +// +// Copyright Microsoft Corporation +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ---------------------------------------------------------------------------------- + +namespace Microsoft.WindowsAzure.Commands.Common +{ + public static class ApiConstants + { + public const string AuthorizationHeaderName = "Authorization"; + + public const string BasicAuthorization = "Basic"; + + public const string UserAgentHeaderName = "User-Agent"; + + public const string UserAgentHeaderValue = "AzurePowershell/v" + AzurePowerShell.AssemblyVersion; + + public const string VSDebuggerCausalityDataHeaderName = "VSDebuggerCausalityData"; + + public const string OperationTrackingIdHeader = "x-ms-request-id"; + + public const string VersionHeaderContentLatest = "2013-08-01"; + + public const string VersionHeaderName = "x-ms-version"; + + } + + public class SDKVersion + { + public const string Version180 = "1.8.0"; + + public const string Version200 = "2.0.0"; + + public const string Version220 = "2.2.0"; + + public const string Version230 = "2.3.0"; + + public const string Version240 = "2.4.0"; + + public const string Version250 = "2.5.0"; + } + + public enum DevEnv + { + Local, + Cloud + } + + public enum RoleType + { + WebRole, + WorkerRole + } + + public enum RuntimeType + { + IISNode, + Node, + PHP, + Cache, + Null + } +} diff --git a/src/Common/Commands.Common/Utilities/ConversionUtilities.cs b/src/Common/Commands.Common/ConversionUtilities.cs similarity index 98% rename from src/Common/Commands.Common/Utilities/ConversionUtilities.cs rename to src/Common/Commands.Common/ConversionUtilities.cs index 464ebd4f59ea..270b4153b08a 100644 --- a/src/Common/Commands.Common/Utilities/ConversionUtilities.cs +++ b/src/Common/Commands.Common/ConversionUtilities.cs @@ -20,7 +20,7 @@ using System.Security; using System.Text; -namespace Microsoft.WindowsAzure.Commands.Utilities.Common +namespace Microsoft.WindowsAzure.Commands.Common { public static class ConversionUtilities { diff --git a/src/Common/Commands.Common/Common/ErrorHelper.cs b/src/Common/Commands.Common/ErrorHelper.cs similarity index 99% rename from src/Common/Commands.Common/Common/ErrorHelper.cs rename to src/Common/Commands.Common/ErrorHelper.cs index 0b931ec57c58..26cddb43a87a 100644 --- a/src/Common/Commands.Common/Common/ErrorHelper.cs +++ b/src/Common/Commands.Common/ErrorHelper.cs @@ -12,11 +12,12 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using System.IO; using System.Net; using System.ServiceModel; using System.Xml; -using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { diff --git a/src/Common/Commands.Common/Utilities/GeneralUtilities.cs b/src/Common/Commands.Common/GeneralUtilities.cs similarity index 99% rename from src/Common/Commands.Common/Utilities/GeneralUtilities.cs rename to src/Common/Commands.Common/GeneralUtilities.cs index 02189364034e..04098501bd36 100644 --- a/src/Common/Commands.Common/Utilities/GeneralUtilities.cs +++ b/src/Common/Commands.Common/GeneralUtilities.cs @@ -12,10 +12,13 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Properties; +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.WindowsAzure.Common.Internals; using System; using System.Collections.Generic; using System.Diagnostics; -using System.Globalization; using System.IO; using System.Linq; using System.Net; @@ -27,8 +30,6 @@ using System.ServiceModel.Channels; using System.Text; using System.Xml; -using Microsoft.WindowsAzure.Commands.Common.Properties; -using Microsoft.WindowsAzure.Common.Internals; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { diff --git a/src/Common/Commands.Common/Common/HttpClientExtensions.cs b/src/Common/Commands.Common/HttpClientExtensions.cs similarity index 96% rename from src/Common/Commands.Common/Common/HttpClientExtensions.cs rename to src/Common/Commands.Common/HttpClientExtensions.cs index b5df42f25c46..1571324e132f 100644 --- a/src/Common/Commands.Common/Common/HttpClientExtensions.cs +++ b/src/Common/Commands.Common/HttpClientExtensions.cs @@ -13,13 +13,13 @@ // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; +using Microsoft.WindowsAzure.Commands.Common; +using Newtonsoft.Json; using System; using System.Net; using System.Net.Http; using System.Net.Http.Headers; -using System.Threading.Tasks; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { @@ -27,9 +27,9 @@ public static class HttpClientExtensions { private static void AddUserAgent(HttpClient client) { - if (!client.DefaultRequestHeaders.UserAgent.Contains(ApiConstants.UserAgentValue)) + if (!client.DefaultRequestHeaders.UserAgent.Contains(AzurePowerShell.UserAgentValue)) { - client.DefaultRequestHeaders.UserAgent.Add(ApiConstants.UserAgentValue); + client.DefaultRequestHeaders.UserAgent.Add(AzurePowerShell.UserAgentValue); } } diff --git a/src/Common/Commands.Common/Common/HttpRestCallLogger.cs b/src/Common/Commands.Common/HttpRestCallLogger.cs similarity index 100% rename from src/Common/Commands.Common/Common/HttpRestCallLogger.cs rename to src/Common/Commands.Common/HttpRestCallLogger.cs diff --git a/src/Common/Commands.Common/Common/HttpRestMessageInspector.cs b/src/Common/Commands.Common/HttpRestMessageInspector.cs similarity index 100% rename from src/Common/Commands.Common/Common/HttpRestMessageInspector.cs rename to src/Common/Commands.Common/HttpRestMessageInspector.cs diff --git a/src/Common/Commands.Common/Common/IdnHelper.cs b/src/Common/Commands.Common/IdnHelper.cs similarity index 100% rename from src/Common/Commands.Common/Common/IdnHelper.cs rename to src/Common/Commands.Common/IdnHelper.cs diff --git a/src/Common/Commands.Common/Common/ManagementOperationContext.cs b/src/Common/Commands.Common/ManagementOperationContext.cs similarity index 100% rename from src/Common/Commands.Common/Common/ManagementOperationContext.cs rename to src/Common/Commands.Common/ManagementOperationContext.cs diff --git a/src/Common/Commands.Common/Common/PSAzureAccount.cs b/src/Common/Commands.Common/PSAzureAccount.cs similarity index 94% rename from src/Common/Commands.Common/Common/PSAzureAccount.cs rename to src/Common/Commands.Common/PSAzureAccount.cs index df62a50e8989..f39fcd405d0c 100644 --- a/src/Common/Commands.Common/Common/PSAzureAccount.cs +++ b/src/Common/Commands.Common/PSAzureAccount.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public class PSAzureAccount { diff --git a/src/Common/Commands.Common/Common/Parameters.cs b/src/Common/Commands.Common/Parameters.cs similarity index 100% rename from src/Common/Commands.Common/Common/Parameters.cs rename to src/Common/Commands.Common/Parameters.cs diff --git a/src/Common/Commands.Common/Utilities/PowerShellUtilities.cs b/src/Common/Commands.Common/PowerShellUtilities.cs similarity index 100% rename from src/Common/Commands.Common/Utilities/PowerShellUtilities.cs rename to src/Common/Commands.Common/PowerShellUtilities.cs diff --git a/src/Common/Commands.Common/Common/ProcessHelper.cs b/src/Common/Commands.Common/ProcessHelper.cs similarity index 100% rename from src/Common/Commands.Common/Common/ProcessHelper.cs rename to src/Common/Commands.Common/ProcessHelper.cs diff --git a/src/Common/Commands.Common/Common/ProfileClientExtensions.cs b/src/Common/Commands.Common/ProfileClientExtensions.cs similarity index 96% rename from src/Common/Commands.Common/Common/ProfileClientExtensions.cs rename to src/Common/Commands.Common/ProfileClientExtensions.cs index 795eec2bcc99..5a14b5d566c7 100644 --- a/src/Common/Commands.Common/Common/ProfileClientExtensions.cs +++ b/src/Common/Commands.Common/ProfileClientExtensions.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.Common { diff --git a/src/Common/Commands.Common/Properties/Resources.Designer.cs b/src/Common/Commands.Common/Properties/Resources.Designer.cs index 1a8465743d8b..aadcee8cea7b 100644 --- a/src/Common/Commands.Common/Properties/Resources.Designer.cs +++ b/src/Common/Commands.Common/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.WindowsAzure.Commands.Common.Properties { - using System; - - +namespace Microsoft.WindowsAzure.Commands.Common.Properties +{ + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// diff --git a/src/Common/Commands.Common/Models/RecordingTracingInterceptor.cs b/src/Common/Commands.Common/RecordingTracingInterceptor.cs similarity index 97% rename from src/Common/Commands.Common/Models/RecordingTracingInterceptor.cs rename to src/Common/Commands.Common/RecordingTracingInterceptor.cs index 03b40f1815e7..6cd9ed9406eb 100644 --- a/src/Common/Commands.Common/Models/RecordingTracingInterceptor.cs +++ b/src/Common/Commands.Common/RecordingTracingInterceptor.cs @@ -12,13 +12,14 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.WindowsAzure; +using Microsoft.WindowsAzure.Commands.Utilities.Common; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Net.Http; -using Microsoft.WindowsAzure.Commands.Utilities.Common; -namespace Microsoft.WindowsAzure.Commands.Common.Models +namespace Microsoft.Azure.Common.Extensions.Models { public class RecordingTracingInterceptor : ICloudTracingInterceptor { @@ -26,7 +27,7 @@ public RecordingTracingInterceptor() { MessageQueue = new ConcurrentQueue(); } - + public ConcurrentQueue MessageQueue { get; private set; } private void Write(string message, params object[] arguments) diff --git a/src/Common/Commands.Common/Common/ServiceManagementTypes.cs b/src/Common/Commands.Common/ServiceManagementTypes.cs similarity index 100% rename from src/Common/Commands.Common/Common/ServiceManagementTypes.cs rename to src/Common/Commands.Common/ServiceManagementTypes.cs index b613f7e99ace..b2aeb7aaa4b4 100644 --- a/src/Common/Commands.Common/Common/ServiceManagementTypes.cs +++ b/src/Common/Commands.Common/ServiceManagementTypes.cs @@ -14,6 +14,7 @@ //TODO: When transition to SM.NET is completed, rename the namespace to "Microsoft.WindowsAzure.ServiceManagement" +using Microsoft.WindowsAzure.Commands.Common.Properties; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -27,7 +28,6 @@ using System.ServiceModel.Web; using System.Text; using System.Xml; -using Microsoft.WindowsAzure.Commands.Common.Properties; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Model { diff --git a/src/Common/Commands.Common/Common/SubscriptionCmdletBase.cs b/src/Common/Commands.Common/SubscriptionCmdletBase.cs similarity index 98% rename from src/Common/Commands.Common/Common/SubscriptionCmdletBase.cs rename to src/Common/Commands.Common/SubscriptionCmdletBase.cs index f7860d025ae0..91031a45c851 100644 --- a/src/Common/Commands.Common/Common/SubscriptionCmdletBase.cs +++ b/src/Common/Commands.Common/SubscriptionCmdletBase.cs @@ -12,10 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using System.Management.Automation; namespace Microsoft.WindowsAzure.Commands.Utilities.Profile { diff --git a/src/Common/Commands.Common/Common/Tasks.cs b/src/Common/Commands.Common/Tasks.cs similarity index 100% rename from src/Common/Commands.Common/Common/Tasks.cs rename to src/Common/Commands.Common/Tasks.cs diff --git a/src/Common/Commands.Common/Common/TestMockSupport.cs b/src/Common/Commands.Common/TestMockSupport.cs similarity index 100% rename from src/Common/Commands.Common/Common/TestMockSupport.cs rename to src/Common/Commands.Common/TestMockSupport.cs diff --git a/src/Common/Commands.Profile/Account/AddAzureAccount.cs b/src/Common/Commands.Profile/Account/AddAzureAccount.cs index 99027ed9630d..d6793e6522d9 100644 --- a/src/Common/Commands.Profile/Account/AddAzureAccount.cs +++ b/src/Common/Commands.Profile/Account/AddAzureAccount.cs @@ -15,7 +15,7 @@ using System.Management.Automation; using System.Security; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Profile; diff --git a/src/Common/Commands.Profile/Account/GetAzureAccount.cs b/src/Common/Commands.Profile/Account/GetAzureAccount.cs index 5af5642e9b3a..ad63b8dc70ee 100644 --- a/src/Common/Commands.Profile/Account/GetAzureAccount.cs +++ b/src/Common/Commands.Profile/Account/GetAzureAccount.cs @@ -14,7 +14,7 @@ using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Profile; using System.Collections.Generic; diff --git a/src/Common/Commands.Profile/Account/RemoveAzureAccount.cs b/src/Common/Commands.Profile/Account/RemoveAzureAccount.cs index 01a103c100ad..5e16e019cf35 100644 --- a/src/Common/Commands.Profile/Account/RemoveAzureAccount.cs +++ b/src/Common/Commands.Profile/Account/RemoveAzureAccount.cs @@ -13,7 +13,7 @@ // ---------------------------------------------------------------------------------- using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Profile; diff --git a/src/Common/Commands.Profile/Commands.Profile.csproj b/src/Common/Commands.Profile/Commands.Profile.csproj index 0b1154c8cefa..c8dfd0f6e933 100644 --- a/src/Common/Commands.Profile/Commands.Profile.csproj +++ b/src/Common/Commands.Profile/Commands.Profile.csproj @@ -143,6 +143,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/Common/Commands.Profile/Environment/AddAzureEnvironment.cs b/src/Common/Commands.Profile/Environment/AddAzureEnvironment.cs index 06b42ada3921..63f4218214bd 100644 --- a/src/Common/Commands.Profile/Environment/AddAzureEnvironment.cs +++ b/src/Common/Commands.Profile/Environment/AddAzureEnvironment.cs @@ -14,7 +14,7 @@ using System.Management.Automation; using System.Security.Permissions; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Profile; using System.Collections.Generic; using System; diff --git a/src/Common/Commands.Profile/Environment/GetAzureEnvironment.cs b/src/Common/Commands.Profile/Environment/GetAzureEnvironment.cs index 0ad23b085004..d57fb27a1379 100644 --- a/src/Common/Commands.Profile/Environment/GetAzureEnvironment.cs +++ b/src/Common/Commands.Profile/Environment/GetAzureEnvironment.cs @@ -15,7 +15,7 @@ using System.Collections.Generic; using System.Management.Automation; using System.Security.Permissions; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Profile; using System; diff --git a/src/Common/Commands.Profile/Environment/RemoveAzureEnvironment.cs b/src/Common/Commands.Profile/Environment/RemoveAzureEnvironment.cs index eb37a9ba13dc..941b0724c871 100644 --- a/src/Common/Commands.Profile/Environment/RemoveAzureEnvironment.cs +++ b/src/Common/Commands.Profile/Environment/RemoveAzureEnvironment.cs @@ -14,7 +14,7 @@ using System.Management.Automation; using System.Security.Permissions; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Profile; diff --git a/src/Common/Commands.Profile/Environment/SetAzureEnvironment.cs b/src/Common/Commands.Profile/Environment/SetAzureEnvironment.cs index 9696fce851d8..df8036991d36 100644 --- a/src/Common/Commands.Profile/Environment/SetAzureEnvironment.cs +++ b/src/Common/Commands.Profile/Environment/SetAzureEnvironment.cs @@ -14,7 +14,7 @@ using System.Management.Automation; using System.Security.Permissions; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Profile; namespace Microsoft.WindowsAzure.Commands.Profile diff --git a/src/Common/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.format.ps1xml b/src/Common/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.format.ps1xml index 46d19326ea34..3e2281e8506c 100644 --- a/src/Common/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.format.ps1xml +++ b/src/Common/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.format.ps1xml @@ -2,9 +2,9 @@ - Microsoft.WindowsAzure.Commands.Common.Models.PSAzureAccount + Microsoft.Azure.Common.Extensions.Models.PSAzureAccount - Microsoft.WindowsAzure.Commands.Common.Models.PSAzureAccount + Microsoft.Azure.Common.Extensions.Models.PSAzureAccount diff --git a/src/Common/Commands.Profile/Models/PsAzureSubscription.cs b/src/Common/Commands.Profile/Models/PsAzureSubscription.cs index d2ecabeb46df..3c2d72096935 100644 --- a/src/Common/Commands.Profile/Models/PsAzureSubscription.cs +++ b/src/Common/Commands.Profile/Models/PsAzureSubscription.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.Profile.Models { diff --git a/src/Common/Commands.Profile/Models/PsAzureSubscriptionExtended.cs b/src/Common/Commands.Profile/Models/PsAzureSubscriptionExtended.cs index 96985161b4c7..c4894d9e73b9 100644 --- a/src/Common/Commands.Profile/Models/PsAzureSubscriptionExtended.cs +++ b/src/Common/Commands.Profile/Models/PsAzureSubscriptionExtended.cs @@ -13,7 +13,7 @@ // ---------------------------------------------------------------------------------- using System.Security.Cryptography.X509Certificates; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.Profile.Models { diff --git a/src/Common/Commands.Profile/ProfileDoctor/ClearAzureProfile.cs b/src/Common/Commands.Profile/ProfileDoctor/ClearAzureProfile.cs index f751d1dbba65..a60306b008f7 100644 --- a/src/Common/Commands.Profile/ProfileDoctor/ClearAzureProfile.cs +++ b/src/Common/Commands.Profile/ProfileDoctor/ClearAzureProfile.cs @@ -14,7 +14,7 @@ using System.Management.Automation; using System.Security.Permissions; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Profile; diff --git a/src/Common/Commands.Profile/Subscription/GetAzurePublishSettingsFile.cs b/src/Common/Commands.Profile/Subscription/GetAzurePublishSettingsFile.cs index 14c82dba2d56..4cea0c630855 100644 --- a/src/Common/Commands.Profile/Subscription/GetAzurePublishSettingsFile.cs +++ b/src/Common/Commands.Profile/Subscription/GetAzurePublishSettingsFile.cs @@ -14,7 +14,7 @@ using System.Management.Automation; using System.Security.Permissions; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Profile; diff --git a/src/Common/Commands.Profile/Subscription/GetAzureSubscription.cs b/src/Common/Commands.Profile/Subscription/GetAzureSubscription.cs index 568efb8365a6..ad91a7d22a46 100644 --- a/src/Common/Commands.Profile/Subscription/GetAzureSubscription.cs +++ b/src/Common/Commands.Profile/Subscription/GetAzureSubscription.cs @@ -17,13 +17,13 @@ using System.Linq; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Profile.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; using Microsoft.WindowsAzure.Commands.Utilities.Profile; using Microsoft.WindowsAzure.Management; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Profile { diff --git a/src/Common/Commands.Profile/Subscription/ImportAzurePublishSettings.cs b/src/Common/Commands.Profile/Subscription/ImportAzurePublishSettings.cs index eb0b8b968fc6..1e0c6ca498b4 100644 --- a/src/Common/Commands.Profile/Subscription/ImportAzurePublishSettings.cs +++ b/src/Common/Commands.Profile/Subscription/ImportAzurePublishSettings.cs @@ -17,12 +17,13 @@ using System.Linq; using System.Management.Automation; using System.Security.Permissions; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Profile; using Microsoft.WindowsAzure.Commands.Common; using System.Diagnostics; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Profile { diff --git a/src/Common/Commands.Profile/Subscription/RemoveAzureSubscription.cs b/src/Common/Commands.Profile/Subscription/RemoveAzureSubscription.cs index f37dc1106be4..e12a652d4ca1 100644 --- a/src/Common/Commands.Profile/Subscription/RemoveAzureSubscription.cs +++ b/src/Common/Commands.Profile/Subscription/RemoveAzureSubscription.cs @@ -14,7 +14,7 @@ using System; using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Profile; diff --git a/src/Common/Commands.Profile/Subscription/SelectAzureSubscription.cs b/src/Common/Commands.Profile/Subscription/SelectAzureSubscription.cs index 131142a120fc..51b5adf693b8 100644 --- a/src/Common/Commands.Profile/Subscription/SelectAzureSubscription.cs +++ b/src/Common/Commands.Profile/Subscription/SelectAzureSubscription.cs @@ -15,9 +15,10 @@ using System; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Profile; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Profile { diff --git a/src/Common/Commands.Profile/Subscription/SetAzureSubscription.cs b/src/Common/Commands.Profile/Subscription/SetAzureSubscription.cs index 3b93419e6e2c..52a97162a980 100644 --- a/src/Common/Commands.Profile/Subscription/SetAzureSubscription.cs +++ b/src/Common/Commands.Profile/Subscription/SetAzureSubscription.cs @@ -16,7 +16,7 @@ using System.Linq; using System.Management.Automation; using System.Security.Cryptography.X509Certificates; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Profile; diff --git a/src/Common/Commands.Profile/SwitchAzureMode.cs b/src/Common/Commands.Profile/SwitchAzureMode.cs index 4836d8c5c05e..7d9ad67780f8 100644 --- a/src/Common/Commands.Profile/SwitchAzureMode.cs +++ b/src/Common/Commands.Profile/SwitchAzureMode.cs @@ -15,6 +15,7 @@ using System; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Profile { diff --git a/src/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs b/src/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs index 2031c893319a..e2a688844803 100644 --- a/src/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs +++ b/src/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Testing; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest { diff --git a/src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj b/src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj index dd6fb9684e84..3963ef572626 100644 --- a/src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj +++ b/src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj @@ -472,6 +472,10 @@ {cd5aa507-f5ef-473d-855b-84b91a1abe54} Commands + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {3b48a77b-5956-4a62-9081-92ba04b02b27} Commands.Common.Test diff --git a/src/Common/Commands.ScenarioTest/Common/PowerShellTest.cs b/src/Common/Commands.ScenarioTest/Common/PowerShellTest.cs index 8408bf5c15d4..27dc682af445 100644 --- a/src/Common/Commands.ScenarioTest/Common/PowerShellTest.cs +++ b/src/Common/Commands.ScenarioTest/Common/PowerShellTest.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Common.Test.Common; using Microsoft.WindowsAzure.Commands.ScenarioTest.Resources; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest.Common { diff --git a/src/Common/Commands.ScenarioTest/Common/ServiceManagementTestEnvironmentFactory.cs b/src/Common/Commands.ScenarioTest/Common/ServiceManagementTestEnvironmentFactory.cs index 146ecc8bac3b..da5fe60bcfb1 100644 --- a/src/Common/Commands.ScenarioTest/Common/ServiceManagementTestEnvironmentFactory.cs +++ b/src/Common/Commands.ScenarioTest/Common/ServiceManagementTestEnvironmentFactory.cs @@ -22,6 +22,8 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema; using Microsoft.WindowsAzure.Common.Internals; +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.XmlSchema; namespace Microsoft.WindowsAzure.Commands.ScenarioTest.Common { diff --git a/src/Common/Commands.ScenarioTest/Common/WindowsAzurePowerShellCertificateTest.cs b/src/Common/Commands.ScenarioTest/Common/WindowsAzurePowerShellCertificateTest.cs index 121bba1156f6..1cad2ff4d32f 100644 --- a/src/Common/Commands.ScenarioTest/Common/WindowsAzurePowerShellCertificateTest.cs +++ b/src/Common/Commands.ScenarioTest/Common/WindowsAzurePowerShellCertificateTest.cs @@ -22,6 +22,8 @@ using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Testing; +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.ScenarioTest.Common { diff --git a/src/Common/Commands.ScenarioTest/CredentialTests/AddAccountForArmTests.cs b/src/Common/Commands.ScenarioTest/CredentialTests/AddAccountForArmTests.cs index 2ccf8513cb62..c29a3c4f28ad 100644 --- a/src/Common/Commands.ScenarioTest/CredentialTests/AddAccountForArmTests.cs +++ b/src/Common/Commands.ScenarioTest/CredentialTests/AddAccountForArmTests.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Xunit; using Xunit.Extensions; diff --git a/src/Common/Commands.ScenarioTest/CredentialTests/CredentialTestBase.cs b/src/Common/Commands.ScenarioTest/CredentialTests/CredentialTestBase.cs index fd75b199535b..5a6c8dd425c0 100644 --- a/src/Common/Commands.ScenarioTest/CredentialTests/CredentialTestBase.cs +++ b/src/Common/Commands.ScenarioTest/CredentialTests/CredentialTestBase.cs @@ -16,6 +16,7 @@ using System.Linq; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest.CredentialTests { diff --git a/src/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs b/src/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs index 04b590c9d0a0..a764f52988d6 100644 --- a/src/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs +++ b/src/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest.CredentialTests { diff --git a/src/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs b/src/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs index 1051882d468d..2b88c873a64c 100644 --- a/src/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs +++ b/src/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Testing; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest { diff --git a/src/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs b/src/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs index 3d9213993f26..1b6b5451e141 100644 --- a/src/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs +++ b/src/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Testing; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest { diff --git a/src/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs b/src/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs index 43bcb1169aaa..7a68556d1e00 100644 --- a/src/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs +++ b/src/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTestsBase.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Management.Storage; using Microsoft.WindowsAzure.Management.WebSites; using Microsoft.WindowsAzure.Testing; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest.WebsitesTests { diff --git a/src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj b/src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj index 9470c6f55c73..2de84d0e510d 100644 --- a/src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj +++ b/src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj @@ -123,6 +123,10 @@ {bc420543-c04e-4bf3-96e1-cd81b823bdd7} Commands.Test.Utilities + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {3b48a77b-5956-4a62-9081-92ba04b02b27} Commands.Common.Test diff --git a/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs b/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs index e0839b2350cd..09186ab53cf9 100644 --- a/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs +++ b/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs @@ -19,11 +19,12 @@ using System.Security.Cryptography.X509Certificates; using Microsoft.Azure.Utilities.HttpRecorder; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Testing; using System.Diagnostics; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest { diff --git a/src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj b/src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj index bd9b1f1b8abf..39fc0f191441 100644 --- a/src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj +++ b/src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj @@ -157,6 +157,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {3b48a77b-5956-4a62-9081-92ba04b02b27} Commands.Common.Test diff --git a/src/ResourceManager/Batch/Commands.Batch.Test/ScenarioTests/BatchController.cs b/src/ResourceManager/Batch/Commands.Batch.Test/ScenarioTests/BatchController.cs index 6e7703f939da..80d7419bd882 100644 --- a/src/ResourceManager/Batch/Commands.Batch.Test/ScenarioTests/BatchController.cs +++ b/src/ResourceManager/Batch/Commands.Batch.Test/ScenarioTests/BatchController.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.Azure.Gallery; using Microsoft.Azure.Management.Authorization; using Microsoft.Azure.Management.Batch; diff --git a/src/ResourceManager/Batch/Commands.Batch/BatchClient.cs b/src/ResourceManager/Batch/Commands.Batch/BatchClient.cs index ba26940632e8..7bd6e73ee855 100644 --- a/src/ResourceManager/Batch/Commands.Batch/BatchClient.cs +++ b/src/ResourceManager/Batch/Commands.Batch/BatchClient.cs @@ -13,12 +13,13 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Batch.Properties; +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.Azure.Management.Batch; using Microsoft.Azure.Management.Batch.Models; using Microsoft.Azure.Management.Resources; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; using System; using System.Collections; using System.Collections.Generic; diff --git a/src/ResourceManager/Batch/Commands.Batch/BatchCmdletBase.cs b/src/ResourceManager/Batch/Commands.Batch/BatchCmdletBase.cs index 09a2cca6a9cc..74c6e56c1634 100644 --- a/src/ResourceManager/Batch/Commands.Batch/BatchCmdletBase.cs +++ b/src/ResourceManager/Batch/Commands.Batch/BatchCmdletBase.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Common.Internals; diff --git a/src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj b/src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj index ae8a9dc45ba6..049c1f1e4d3b 100644 --- a/src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj +++ b/src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj @@ -130,6 +130,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj index 3b4589012854..a56c340f32ee 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj @@ -275,6 +275,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs index 0f8a9700bda4..55684c826064 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.Azure.Gallery; using Microsoft.Azure.Management.Authorization; using Microsoft.Azure.Management.DataFactories; diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDataFactoryTests.cs b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDataFactoryTests.cs index d39c00f72358..0cf5d56959a6 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDataFactoryTests.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDataFactoryTests.cs @@ -17,7 +17,7 @@ using Microsoft.Azure.Management.DataFactories.Models; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; using Moq; using Xunit; diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj index 8f9119a49e28..e5f9759f391c 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj @@ -189,6 +189,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/DataFactoryCommonUtilities.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/DataFactoryCommonUtilities.cs index cbf016351a4c..d3916e93c8d1 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/DataFactoryCommonUtilities.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/DataFactoryCommonUtilities.cs @@ -21,6 +21,7 @@ using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Newtonsoft.Json; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.DataFactories { diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.cs index e872b5984e22..9de6c60116c6 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.cs @@ -15,12 +15,13 @@ using System.IO; using Microsoft.Azure.Management.DataFactories; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.Azure.Commands.DataFactories.Properties; using System; using Microsoft.WindowsAzure.Storage.Blob; using Microsoft.WindowsAzure.Storage; using System.Net; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.DataFactories { diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj index 2684f6c3919f..9d97b35690d5 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj +++ b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj @@ -125,6 +125,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs index 50e707b8874d..c6519b8ab712 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs +++ b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs @@ -19,6 +19,7 @@ namespace Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Testing; using Microsoft.Azure.Management.Redis; + using Microsoft.Azure.Common.Extensions; public abstract class RedisCacheTestsBase : IDisposable { diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj index 42ff601e2e7a..49d934539a72 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj +++ b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj @@ -123,6 +123,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheClient.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheClient.cs index 03ad3bd6740f..5260bdc592be 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheClient.cs +++ b/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheClient.cs @@ -14,11 +14,12 @@ namespace Microsoft.Azure.Commands.RedisCache { + using Microsoft.Azure.Common.Extensions; + using Microsoft.Azure.Common.Extensions.Models; using Microsoft.Azure.Management.Redis; using Microsoft.Azure.Management.Redis.Models; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Common; - using Microsoft.WindowsAzure.Commands.Common.Models; public class RedisCacheClient { diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj index 03d69ac81284..960fccd5f28c 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj +++ b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj @@ -176,6 +176,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs b/src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs index 36294e0a7132..24d28101b7ce 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs +++ b/src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs @@ -40,6 +40,7 @@ using Xunit; using Xunit.Extensions; using System.Diagnostics; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.Resources.Test.Models { diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Resources/NewAzureResourceCommandTests.cs b/src/ResourceManager/Resources/Commands.Resources.Test/Resources/NewAzureResourceCommandTests.cs index faa6bf162921..71553f72ec02 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/Resources/NewAzureResourceCommandTests.cs +++ b/src/ResourceManager/Resources/Commands.Resources.Test/Resources/NewAzureResourceCommandTests.cs @@ -17,7 +17,7 @@ using System.Management.Automation; using Microsoft.Azure.Commands.Resources.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; using Moq; using Xunit; diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Resources/SetAzureResourceCommandTests.cs b/src/ResourceManager/Resources/Commands.Resources.Test/Resources/SetAzureResourceCommandTests.cs index 50dad9739fa9..691c80133c4e 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/Resources/SetAzureResourceCommandTests.cs +++ b/src/ResourceManager/Resources/Commands.Resources.Test/Resources/SetAzureResourceCommandTests.cs @@ -16,7 +16,7 @@ using System.Management.Automation; using Microsoft.Azure.Commands.Resources.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; using Moq; using Xunit; diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs index e29eda280d29..3174a07ce596 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs +++ b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.Azure.Gallery; using Microsoft.Azure.Graph.RBAC; using Microsoft.Azure.Management.Authorization; diff --git a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj index 4acac539e020..74d0be3be1b1 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj +++ b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj @@ -210,6 +210,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs index b7475ca21fcc..483a39ff5381 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs @@ -15,12 +15,13 @@ using Microsoft.Azure.Graph.RBAC; using Microsoft.Azure.Graph.RBAC.Models; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Models; using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using Microsoft.Azure.Common.Extensions.Authentication; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.Resources.Models.ActiveDirectory { diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/PSADObject.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/PSADObject.cs index 493ca15dd90e..ba9ddd9ddd69 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/PSADObject.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/PSADObject.cs @@ -15,7 +15,6 @@ using System; using System.Collections.Generic; using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common.Utilities; namespace Microsoft.Azure.Commands.Resources.Models.ActiveDirectory { diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs index 6ef94d622729..abfa4fefdb75 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs @@ -16,12 +16,13 @@ using Microsoft.Azure.Management.Authorization; using Microsoft.Azure.Management.Authorization.Models; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using System; using System.Collections.Generic; using System.Linq; using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.Resources.Models.Authorization { diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/GalleryTemplatesClient.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/GalleryTemplatesClient.cs index dbe14c7bbeba..8b887a0e560b 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/GalleryTemplatesClient.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/GalleryTemplatesClient.cs @@ -27,11 +27,12 @@ using Microsoft.Azure.Gallery.Models; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Common.OData; using Newtonsoft.Json; using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.Resources.Models { diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs index 1111d933e694..6d93e9741201 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs @@ -24,7 +24,7 @@ using Microsoft.Azure.Management.Resources.Models; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Monitoring.Events; using Newtonsoft.Json; @@ -33,6 +33,7 @@ using Microsoft.Azure.Management.Authorization.Models; using Microsoft.Azure.Commands.Resources.Models.Authorization; using System.Diagnostics; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.Resources.Models { diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceWithParameterBaseCmdlet.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceWithParameterBaseCmdlet.cs index da0d9563989a..bba855dffd90 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceWithParameterBaseCmdlet.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceWithParameterBaseCmdlet.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Commands.Resources.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.Resources { diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourcesExtensions.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourcesExtensions.cs index 76bec9fdb307..2624717f4f1b 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourcesExtensions.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourcesExtensions.cs @@ -26,6 +26,7 @@ using Newtonsoft.Json; using Microsoft.Azure.Commands.Resources.Models.Authorization; using Microsoft.Azure.Management.Authorization.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.Resources.Models { diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj index 7cdb083c79e3..0cd13b1779c8 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj +++ b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj @@ -146,6 +146,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs index 132bcad207cb..de54e30bd5f6 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs +++ b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Storage; using Microsoft.WindowsAzure.Testing; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.ScenarioTest.SqlTests { diff --git a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj index dbabb3532ef8..5197bce544c7 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj +++ b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj @@ -161,6 +161,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ResourceManager/Sql/Commands.Sql/Security/Services/EndpointsCommunicator.cs b/src/ResourceManager/Sql/Commands.Sql/Security/Services/EndpointsCommunicator.cs index 241f3315f915..cfd90d3c7c12 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Security/Services/EndpointsCommunicator.cs +++ b/src/ResourceManager/Sql/Commands.Sql/Security/Services/EndpointsCommunicator.cs @@ -14,13 +14,14 @@ using Microsoft.Azure.Commands.Sql.Security.Model; using Microsoft.Azure.Commands.Sql.Services; +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.Azure.Management.Resources; using Microsoft.Azure.Management.Resources.Models; using Microsoft.Azure.Management.Sql; using Microsoft.Azure.Management.Sql.Models; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; using Microsoft.WindowsAzure.Management.Storage; using Microsoft.WindowsAzure.Management.Storage.Models; using Newtonsoft.Json.Linq; diff --git a/src/ResourceManager/Sql/Commands.Sql/Security/Services/SqlClient.cs b/src/ResourceManager/Sql/Commands.Sql/Security/Services/SqlClient.cs index 19e4ef8e7732..377978ed9ed3 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Security/Services/SqlClient.cs +++ b/src/ResourceManager/Sql/Commands.Sql/Security/Services/SqlClient.cs @@ -13,8 +13,8 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Sql.Security.Model; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.Azure.Management.Sql.Models; -using Microsoft.WindowsAzure.Commands.Common.Models; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj index c145e024160d..c6695d4763fd 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj @@ -134,6 +134,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs index 3d9a04411b02..174343bac5e7 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.Azure.Gallery; using Microsoft.Azure.Management.Authorization; using Microsoft.Azure.Management.Resources; diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj index e2755e3a7859..78b4c1b06911 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj @@ -89,6 +89,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.cs b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.cs index 1cfb6e5bc089..8861ac9e5909 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.cs +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Models/StreamAnalyticsClient.cs @@ -15,7 +15,8 @@ using System.IO; using Microsoft.Azure.Management.StreamAnalytics; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.StreamAnalytics.Models { diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/StreamAnalyticsCommonUtilities.cs b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/StreamAnalyticsCommonUtilities.cs index 0624910d9c44..c95d5349aaa7 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/StreamAnalyticsCommonUtilities.cs +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/StreamAnalyticsCommonUtilities.cs @@ -20,6 +20,7 @@ using Microsoft.Azure.Commands.StreamAnalytics.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Newtonsoft.Json; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.StreamAnalytics { diff --git a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj index fdedd95890ca..7b4da8b9743b 100644 --- a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj +++ b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj @@ -106,6 +106,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ResourceManager/Tags/Commands.Tags/Model/TagsClient.cs b/src/ResourceManager/Tags/Commands.Tags/Model/TagsClient.cs index b4c460ab6f15..135981ca718b 100644 --- a/src/ResourceManager/Tags/Commands.Tags/Model/TagsClient.cs +++ b/src/ResourceManager/Tags/Commands.Tags/Model/TagsClient.cs @@ -19,8 +19,9 @@ using Microsoft.Azure.Management.Resources; using Microsoft.Azure.Management.Resources.Models; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.Tags.Model { diff --git a/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj b/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj index 075d0daa9067..76b33eb455a6 100644 --- a/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj +++ b/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj @@ -159,6 +159,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs b/src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs index 83de8f67ee7e..ef1d5de7d28e 100644 --- a/src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs +++ b/src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs @@ -23,12 +23,13 @@ using Microsoft.Azure.Commands.Automation.Properties; using Microsoft.Azure.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Newtonsoft.Json; namespace Microsoft.Azure.Commands.Automation.Common { using AutomationManagement = Management.Automation; + using Microsoft.Azure.Common.Extensions; public class AutomationClient : IAutomationClient { diff --git a/src/ServiceManagement/Automation/Commands.Automation/Common/IAutomationClient.cs b/src/ServiceManagement/Automation/Commands.Automation/Common/IAutomationClient.cs index 0ec14ddcb7d3..cc001f934108 100644 --- a/src/ServiceManagement/Automation/Commands.Automation/Common/IAutomationClient.cs +++ b/src/ServiceManagement/Automation/Commands.Automation/Common/IAutomationClient.cs @@ -16,7 +16,7 @@ using System.Collections; using System.Collections.Generic; using Microsoft.Azure.Commands.Automation.Model; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.Azure.Commands.Automation.Common { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj index 01a02057f314..c0bfd43b48f9 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj @@ -477,6 +477,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdSASUriTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdSASUriTest.cs index ecd8cc84743f..283b04ed0b29 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdSASUriTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdSASUriTest.cs @@ -16,7 +16,7 @@ using System.IO; using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Storage.Auth; using Microsoft.WindowsAzure.Storage.Blob; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdTest.cs index e7fdccb07a9f..fbfba24dce32 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/AddAzureVhdTest.cs @@ -16,7 +16,7 @@ using System.IO; using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs index ecc912dfada4..d7d37b6320c4 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ExtensionTests/AzureVMAccessExtensionTests.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ExtensionTests { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTest.cs index d1a018fae11c..0d9d3c02922f 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTest.cs @@ -24,7 +24,7 @@ using System.Text; using System.Xml; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/GenericIaaSExtensionTests.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/GenericIaaSExtensionTests.cs index d1abbb377cf2..6d7ac843a565 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/GenericIaaSExtensionTests.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/GenericIaaSExtensionTests.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/SaveAzureVhdTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/SaveAzureVhdTest.cs index 1120a465e35d..f0f5e9982c48 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/SaveAzureVhdTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/SaveAzureVhdTest.cs @@ -16,7 +16,7 @@ using System.IO; using System.Reflection; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Sync.Download; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs index f1ba137d59dd..892a29864284 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs @@ -27,7 +27,7 @@ using System.Xml; using System.Xml.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests.ConfigDataInfo; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs index 5bcd4edd33c1..65805b657a79 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs @@ -22,7 +22,7 @@ using System.Security.Cryptography.X509Certificates; using System.Xml; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.Profile.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs index ef084d8d9fac..7c5f0b74ddc6 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs @@ -20,7 +20,7 @@ using System.Threading; using System.Xml.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Profile.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Test.Properties; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj index 6a433f6bb948..a1d67d475b17 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj @@ -501,6 +501,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs index a8dc507d4915..a87cf667d1e7 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs @@ -16,7 +16,7 @@ using System; using System.Management.Automation; using System.Net; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions; using Microsoft.WindowsAzure.Commands.ServiceManagement.Helpers; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; @@ -111,7 +111,7 @@ public virtual void NewPaaSDeploymentProcess() AssertNoPersistenVmRoleExistsInDeployment(PVM.DeploymentSlotType.Production); AssertNoPersistenVmRoleExistsInDeployment(PVM.DeploymentSlotType.Staging); - var storageName = CurrentContext.Subscription.GetProperty(Commands.Common.Models.AzureSubscription.Property.StorageAccount); + var storageName = CurrentContext.Subscription.GetProperty(AzureSubscription.Property.StorageAccount); Uri packageUrl; if (this.Package.StartsWith(Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase) || diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs index 7c2db3e46472..4fdc9c4c49fc 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs @@ -15,7 +15,7 @@ using System; using System.Management.Automation; using System.Net; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions; using Microsoft.WindowsAzure.Commands.ServiceManagement.Helpers; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Disks/AddAzureDataDisk.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Disks/AddAzureDataDisk.cs index 123d19bb833f..17abeb97d913 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Disks/AddAzureDataDisk.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Disks/AddAzureDataDisk.cs @@ -19,9 +19,10 @@ using System.Linq; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Common/VirtualMachineExtensionCmdletBase.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Common/VirtualMachineExtensionCmdletBase.cs index 9d4a84bd1257..1b139bd0242f 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Common/VirtualMachineExtensionCmdletBase.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Common/VirtualMachineExtensionCmdletBase.cs @@ -21,6 +21,7 @@ using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/CustomScript/SetAzureVMCustomScriptExtension.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/CustomScript/SetAzureVMCustomScriptExtension.cs index 232aa49bb7bf..23167af9a292 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/CustomScript/SetAzureVMCustomScriptExtension.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/CustomScript/SetAzureVMCustomScriptExtension.cs @@ -16,12 +16,13 @@ using System.Linq; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; using Microsoft.WindowsAzure.Storage; using Microsoft.WindowsAzure.Storage.Auth; using Microsoft.WindowsAzure.Storage.Blob; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/CustomScript/VirtualMachineCustomScriptExtensionCmdletBase.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/CustomScript/VirtualMachineCustomScriptExtensionCmdletBase.cs index eb1769245b3e..f7af774ca2f4 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/CustomScript/VirtualMachineCustomScriptExtensionCmdletBase.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/CustomScript/VirtualMachineCustomScriptExtensionCmdletBase.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Newtonsoft.Json; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/ServiceManagementBaseCmdletExtentions.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/ServiceManagementBaseCmdletExtentions.cs index 2b930f601209..05233b2f906d 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/ServiceManagementBaseCmdletExtentions.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/ServiceManagementBaseCmdletExtentions.cs @@ -15,7 +15,7 @@ using System; using System.Globalization; using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/SqlServer/VirtualMachineSqlServerExtensionCmdletBase.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/SqlServer/VirtualMachineSqlServerExtensionCmdletBase.cs index 1d82cef7492a..f4cdcacf6e3b 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/SqlServer/VirtualMachineSqlServerExtensionCmdletBase.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/SqlServer/VirtualMachineSqlServerExtensionCmdletBase.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Newtonsoft.Json; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/GetAzureNetworkSecurityGroupConfig.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/GetAzureNetworkSecurityGroupConfig.cs index 9bee4f32e509..441282b2ab56 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/GetAzureNetworkSecurityGroupConfig.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/GetAzureNetworkSecurityGroupConfig.cs @@ -19,6 +19,7 @@ using Microsoft.Azure.Commands.Network.NetworkSecurityGroup.Model; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureQuickVM.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureQuickVM.cs index 6a3627f7560b..fe3ff8b244fa 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureQuickVM.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureQuickVM.cs @@ -21,7 +21,7 @@ using System.Net; using System.Security.Cryptography.X509Certificates; using AutoMapper; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Common; using Microsoft.WindowsAzure.Commands.ServiceManagement.Helpers; using Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS.Extensions; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVM.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVM.cs index 1120de3088aa..18678c8dc634 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVM.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVM.cs @@ -18,7 +18,7 @@ using System.Management.Automation; using System.Net; using AutoMapper; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Helpers; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVMConfig.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVMConfig.cs index 5a99d880d1b4..fb08778cb8ef 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVMConfig.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVMConfig.cs @@ -16,7 +16,7 @@ using System; using System.Collections.ObjectModel; using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/UpdateAzureVM.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/UpdateAzureVM.cs index 7617aa7753ee..95f00ff5e63e 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/UpdateAzureVM.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/UpdateAzureVM.cs @@ -17,7 +17,7 @@ using System.Linq; using System.Management.Automation; using AutoMapper; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Helpers; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/StorageServices/StorageCredentialsFactory.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/StorageServices/StorageCredentialsFactory.cs index 8b989e796b39..c12a470e24ab 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/StorageServices/StorageCredentialsFactory.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/StorageServices/StorageCredentialsFactory.cs @@ -13,7 +13,7 @@ // ---------------------------------------------------------------------------------- using System; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties; using Microsoft.WindowsAzure.Commands.Sync.Download; using Microsoft.WindowsAzure.Management.Storage; diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj index 8ad59476a26f..66268195ceec 100644 --- a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj +++ b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj @@ -149,6 +149,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs index cb14378a0e79..a8d9340e11d3 100644 --- a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs +++ b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs @@ -14,7 +14,7 @@ using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Common; namespace Microsoft.WindowsAzure.Commands.ExpressRoute @@ -25,6 +25,8 @@ namespace Microsoft.WindowsAzure.Commands.ExpressRoute using System.Collections.Generic; using System.Net; using Utilities.Common; + using Microsoft.Azure.Common.Extensions.Models; + using Microsoft.Azure.Common.Extensions; public class ExpressRouteClient @@ -94,7 +96,7 @@ public AzureDedicatedCircuit GetAzureDedicatedCircuit(string serviceKey) return (Client.DedicatedCircuits.Get(serviceKey)).DedicatedCircuit; } - public AzureDedicatedCircuit NewAzureDedicatedCircuit(string circuitName, + public AzureDedicatedCircuit NewAzureDedicatedCircuit(string circuitName, UInt32 bandwidth, string location, string serviceProviderName) { return (Client.DedicatedCircuits.New(new DedicatedCircuitNewParameters() diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj index ce0aa0c4258f..fad22f253ca0 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj @@ -209,6 +209,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {3b48a77b-5956-4a62-9081-92ba04b02b27} Commands.Common.Test diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/HDInsight/CommandTests/HDInsightGetCommandTests.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/HDInsight/CommandTests/HDInsightGetCommandTests.cs index fa6e95cb3bc9..ff0db4f6a304 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/HDInsight/CommandTests/HDInsightGetCommandTests.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/HDInsight/CommandTests/HDInsightGetCommandTests.cs @@ -18,7 +18,7 @@ using Microsoft.Hadoop.Client; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Test.HDInsight.CmdLetTests; using Microsoft.WindowsAzure.Commands.Test.Utilities.HDInsight.Utilities; using Microsoft.WindowsAzure.Management.HDInsight; @@ -26,6 +26,7 @@ using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.DataObjects; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.ServiceLocation; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.HDInsight.CommandTests { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightSubscriptionResolverSimulator.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightSubscriptionResolverSimulator.cs index 707b1ebc29ff..be2be604af89 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightSubscriptionResolverSimulator.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightSubscriptionResolverSimulator.cs @@ -17,10 +17,11 @@ using System.Linq; using System.Security.Cryptography.X509Certificates; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Test.Utilities.HDInsight.Utilities; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.HDInsight.Simulators { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightSubscriptionResolverSimulatorFactory.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightSubscriptionResolverSimulatorFactory.cs index fa9d1e79a8c3..a1c485b1486c 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightSubscriptionResolverSimulatorFactory.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightSubscriptionResolverSimulatorFactory.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.HDInsight.Simulators diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Utilities/IntegrationTestBase.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Utilities/IntegrationTestBase.cs index 1b3b73b190fa..54edc408d01c 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Utilities/IntegrationTestBase.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Utilities/IntegrationTestBase.cs @@ -21,7 +21,7 @@ using System.Security.Cryptography.X509Certificates; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.HDInsight.PowerShellTestAbstraction.Concretes; using Microsoft.WindowsAzure.Commands.Test.Utilities.HDInsight.PowerShellTestAbstraction.Interfaces; @@ -35,6 +35,7 @@ using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.ServiceLocation; using Microsoft.WindowsAzure.Management.HDInsight.Framework.Core; using Microsoft.WindowsAzure.Management.HDInsight.Logging; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.HDInsight.Utilities { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AzureHDInsightCmdlet.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AzureHDInsightCmdlet.cs index f44e44c940b8..b5df97274f09 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AzureHDInsightCmdlet.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AzureHDInsightCmdlet.cs @@ -17,13 +17,14 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.Extensions; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.Logging; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.ServiceLocation; using Microsoft.WindowsAzure.Management.HDInsight.Logging; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.PSCmdlets { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj b/src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj index 1b5491787cef..a9ccabd2e293 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj @@ -322,6 +322,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/AddAzureHDInsightStorageCommand.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/AddAzureHDInsightStorageCommand.cs index 25a1031b0912..337e4d49d2a5 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/AddAzureHDInsightStorageCommand.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/AddAzureHDInsightStorageCommand.cs @@ -16,7 +16,7 @@ using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.Commands.CommandInterfaces; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.DataObjects; diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/UseAzureHDInsightClusterCommand.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/UseAzureHDInsightClusterCommand.cs index ce40cf65eabf..8c7a3bd75978 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/UseAzureHDInsightClusterCommand.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/UseAzureHDInsightClusterCommand.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.DataObjects; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.Extensions; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.Commands.CommandImplementations { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightClusterCommandBase.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightClusterCommandBase.cs index 1b7efc87dd02..a037f725e205 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightClusterCommandBase.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightClusterCommandBase.cs @@ -17,6 +17,7 @@ using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.Extensions; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.ServiceLocation; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandBase.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandBase.cs index b4a0ca978f5d..dee236bc6b37 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandBase.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandBase.cs @@ -16,7 +16,7 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Framework.Core; using Microsoft.WindowsAzure.Management.HDInsight.Logging; diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandExtensions.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandExtensions.cs index 07e347d88d3b..c19a310bf8f2 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandExtensions.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandExtensions.cs @@ -17,13 +17,13 @@ using System.Reflection; using Microsoft.Hadoop.Client; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Factories; -using Microsoft.WindowsAzure.Commands.Common.Models; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.Commands.CommandImplementations; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.Extensions; using System.Diagnostics; +using Microsoft.Azure.Common.Extensions.Authentication; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightJobCommandExecutorBase.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightJobCommandExecutorBase.cs index d2d26f9dc1a3..7d4f1c814611 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightJobCommandExecutorBase.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightJobCommandExecutorBase.cs @@ -18,10 +18,11 @@ using System.Threading; using Microsoft.Hadoop.Client; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.Extensions; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.ServiceLocation; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightSubscriptionResolver.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightSubscriptionResolver.cs index 893d8ba2b11e..e2630298b462 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightSubscriptionResolver.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightSubscriptionResolver.cs @@ -14,7 +14,7 @@ using System; using System.Linq; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.Extensions; diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightSubscriptionResolverFactory.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightSubscriptionResolverFactory.cs index 0da5844a0e5b..dda48854ea49 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightSubscriptionResolverFactory.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightSubscriptionResolverFactory.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightCommandBase.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightCommandBase.cs index 1817da51d5bd..1aa735f604de 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightCommandBase.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightCommandBase.cs @@ -14,7 +14,7 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightSubscriptionResolver.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightSubscriptionResolver.cs index 365eb5274966..7a9c3aed34cc 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightSubscriptionResolver.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightSubscriptionResolver.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightSubscriptionResolverFactory.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightSubscriptionResolverFactory.cs index 9f6f04fe28d6..785b11d32e51 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightSubscriptionResolverFactory.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/BaseInterfaces/IAzureHDInsightSubscriptionResolverFactory.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.BaseInterfaces { diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/IInvokeAzureHDInsightJobCommand.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/IInvokeAzureHDInsightJobCommand.cs index b14ab4086fb7..56a779457f8b 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/IInvokeAzureHDInsightJobCommand.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/IInvokeAzureHDInsightJobCommand.cs @@ -15,7 +15,7 @@ using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.DataObjects; using Microsoft.WindowsAzure.Management.HDInsight.Logging; diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/InvokeAzureHDInsightJobCommandBase.cs b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/InvokeAzureHDInsightJobCommandBase.cs index 1b4e22a07739..e0928f28f103 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/InvokeAzureHDInsightJobCommandBase.cs +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/InvokeAzureHDInsightJobCommandBase.cs @@ -21,7 +21,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Hadoop.Client; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.Commands.BaseCommandInterfaces; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.DataObjects; using Microsoft.WindowsAzure.Management.HDInsight.Cmdlet.GetAzureHDInsightClusters.Extensions; diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj index 5d5afb66da44..263a10a59f99 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj @@ -160,6 +160,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {3b48a77b-5956-4a62-9081-92ba04b02b27} Commands.Common.Test diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/ScenarioTests/ManagedCacheTestsBase.cs b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/ScenarioTests/ManagedCacheTestsBase.cs index 320cd6660e95..77de25285d93 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/ScenarioTests/ManagedCacheTestsBase.cs +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/ScenarioTests/ManagedCacheTestsBase.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.Azure.Management.ManagedCache; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Microsoft.WindowsAzure.Commands.Utilities.Common; diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj index 1aeed4f80c51..6191b85ddc9e 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj @@ -138,6 +138,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {CD5AA507-F5EF-473D-855B-84B91A1ABE54} Commands diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/PSCacheClient.cs b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/PSCacheClient.cs index 9eb6f3f20df5..a2638475cde2 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/PSCacheClient.cs +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/PSCacheClient.cs @@ -24,8 +24,9 @@ using Microsoft.Azure.Management.ManagedCache.Models; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.ManagedCache { diff --git a/src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj b/src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj index 01aebb1449b0..504a9f644dcb 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj +++ b/src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj @@ -153,6 +153,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs index 00344384d8ce..bbd2fc043116 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs +++ b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs @@ -25,6 +25,7 @@ namespace Microsoft.Azure.Commands.Network.Test.ScenarioTests using Microsoft.WindowsAzure.Testing; using Xunit; using Microsoft.WindowsAzure.Management; + using Microsoft.Azure.Common.Extensions; public class NSGScenarioTests { diff --git a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkTestsBase.cs b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkTestsBase.cs index 36be43cff76b..3c80c9221637 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkTestsBase.cs +++ b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkTestsBase.cs @@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.Network.Test.ScenarioTests { + using Microsoft.Azure.Common.Extensions; using WindowsAzure.Management.Network; public abstract class NetworkTestsBase diff --git a/src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj b/src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj index 22b4f7382b0d..abfcc68550d6 100644 --- a/src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj +++ b/src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj @@ -151,6 +151,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ServiceManagement/Network/Commands.Network/NetworkClient.cs b/src/ServiceManagement/Network/Commands.Network/NetworkClient.cs index 6511819cb9be..d6b7ae04bf8f 100644 --- a/src/ServiceManagement/Network/Commands.Network/NetworkClient.cs +++ b/src/ServiceManagement/Network/Commands.Network/NetworkClient.cs @@ -24,7 +24,6 @@ namespace Microsoft.Azure.Commands.Network using Routes.Model; using WindowsAzure; using WindowsAzure.Commands.Common; - using WindowsAzure.Commands.Common.Models; using WindowsAzure.Commands.Common.Storage; using WindowsAzure.Commands.Utilities.Common; using WindowsAzure.Common; @@ -32,6 +31,8 @@ namespace Microsoft.Azure.Commands.Network using WindowsAzure.Management.Network; using WindowsAzure.Management.Network.Models; using WindowsAzure.Storage.Auth; + using Microsoft.Azure.Common.Extensions.Models; + using Microsoft.Azure.Common.Extensions; public class NetworkClient { diff --git a/src/ServiceManagement/Network/Commands.Network/NetworkCmdletBase.cs b/src/ServiceManagement/Network/Commands.Network/NetworkCmdletBase.cs index bb0016f16b72..87c8b563ba2c 100644 --- a/src/ServiceManagement/Network/Commands.Network/NetworkCmdletBase.cs +++ b/src/ServiceManagement/Network/Commands.Network/NetworkCmdletBase.cs @@ -14,8 +14,9 @@ namespace Microsoft.Azure.Commands.Network { + using Microsoft.Azure.Common.Extensions; + using Microsoft.Azure.Common.Extensions.Models; using WindowsAzure.Commands.Common; - using WindowsAzure.Commands.Common.Models; using WindowsAzure.Commands.Utilities.Common; using WindowsAzure.Commands.Utilities.Profile; diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj index 24c70054bb9d..9987efb08bd7 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj @@ -123,6 +123,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs index f18cf116a2ce..222d7f6a6c23 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs @@ -27,7 +27,8 @@ using Microsoft.WindowsAzure.Management.SiteRecovery; using Microsoft.WindowsAzure.Testing; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.RecoveryServices.Test.ScenarioTests { diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj index 8d5e36cfa7d0..ffeeac1d9294 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj @@ -141,6 +141,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesClient.cs b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesClient.cs index 85613f71c947..1e30a45dd38f 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesClient.cs +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesClient.cs @@ -26,14 +26,14 @@ using Microsoft.Azure.Portal.RecoveryServices.Models.Common; using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Factories; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.RecoveryServices; using Microsoft.WindowsAzure.Management.RecoveryServices.Models; using Microsoft.WindowsAzure.Management.SiteRecovery; using Microsoft.WindowsAzure.Management.SiteRecovery.Models; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.RecoveryServices { diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryRecoveryPlan.cs b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryRecoveryPlan.cs index 7ab4f4bd117c..78d95a792f0f 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryRecoveryPlan.cs +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryRecoveryPlan.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Management.SiteRecovery.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.Azure.Commands.RecoveryServices { diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj b/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj index 7f6ed2882fc6..8c6f57f6736a 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj @@ -129,6 +129,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {e1ca72ba-8374-45f6-904d-fd34ecdf5b6f} Commands.ServiceManagement diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/AzureAssert.cs b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/AzureAssert.cs index d3e215eae724..b7450a09710d 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/AzureAssert.cs +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/AzureAssert.cs @@ -26,6 +26,7 @@ namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { using ConfigConfigurationSetting = Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema.ConfigurationSetting; using DefinitionConfigurationSetting = Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema.ConfigurationSetting; + using Microsoft.Azure.Common.Extensions; public static class AzureAssert { diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FakeAccessToken.cs b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FakeAccessToken.cs index 2790d8cf256d..242371ecf20d 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FakeAccessToken.cs +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FakeAccessToken.cs @@ -13,7 +13,7 @@ // ---------------------------------------------------------------------------------- using System; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Authentication; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FakeAccessTokenProvider.cs b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FakeAccessTokenProvider.cs index 2166aae9ecdc..f240e0c9bc32 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FakeAccessTokenProvider.cs +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FakeAccessTokenProvider.cs @@ -13,9 +13,9 @@ // ---------------------------------------------------------------------------------- using System.Security; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; -using Microsoft.WindowsAzure.Commands.Utilities.Common.Authentication; +using Microsoft.Azure.Common.Extensions.Authentication; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs index f3b310d1abb7..6dba8bed3435 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Utilities.CloudService; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs index 8b269008b892..f936935a51b8 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs @@ -23,6 +23,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Common; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureMemcacheRoleTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureMemcacheRoleTests.cs index 27f967e5350c..3c2c0d037247 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureMemcacheRoleTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureMemcacheRoleTests.cs @@ -34,6 +34,7 @@ namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Development.Tests using ConfigConfigurationSetting = Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema.ConfigurationSetting; using DefinitionConfigurationSetting = Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema.ConfigurationSetting; using TestResources = Commands.Common.Test.Properties.Resources; + using Microsoft.Azure.Common.Extensions; public class EnableAzureMemcacheRoleTests : TestBase { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs index 75fd05db5a10..8f4463b5a538 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs @@ -26,6 +26,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; using Microsoft.WindowsAzure.Commands.Common; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs index b5851fa57a2c..ead84c2be6ca 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs @@ -24,6 +24,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.WindowsAzure.Commands.Common; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs index 34fd2df6c4f7..40c618e12f2a 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs @@ -26,6 +26,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Utilities { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CloudServiceClientTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CloudServiceClientTests.cs index 3ff4662130e6..4ca15015db45 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CloudServiceClientTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CloudServiceClientTests.cs @@ -18,7 +18,7 @@ using System.Net; using System.Threading; using Xunit; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.CloudService; @@ -31,6 +31,7 @@ using Moq; using MockStorageService = Microsoft.WindowsAzure.Commands.Test.Utilities.Common.MockStorageService; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Utilities { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CsPackTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CsPackTests.cs index 4763a411a036..720f06a3ee32 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CsPackTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CsPackTests.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.CloudService; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Utilities { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CsPackUtilTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CsPackUtilTests.cs index d5bffb1bceca..89fb42c90666 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CsPackUtilTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/CsPackUtilTests.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.CloudService; using Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools; diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/GeneralTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/GeneralTests.cs index 31425f73bd46..67b990cbd864 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/GeneralTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/GeneralTests.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Utilities { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/PublishContextTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/PublishContextTests.cs index 996c4b7bd747..cc4939661291 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/PublishContextTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/PublishContextTests.cs @@ -23,6 +23,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.CloudService; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Utilities { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/ScaffoldTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/ScaffoldTests.cs index 1a85239d1612..3114798e5b92 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/ScaffoldTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/ScaffoldTests.cs @@ -17,6 +17,7 @@ using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.CloudService.Scaffolding; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Utilities { diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj index f8c8093f264b..7f8081662820 100644 --- a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj +++ b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj @@ -334,6 +334,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {e1ca72ba-8374-45f6-904d-fd34ecdf5b6f} Commands.ServiceManagement diff --git a/src/ServiceManagement/Services/Commands.Test/Environment/AddAzureEnvironmentTests.cs b/src/ServiceManagement/Services/Commands.Test/Environment/AddAzureEnvironmentTests.cs index 0a18681f19cd..dbae4495621c 100644 --- a/src/ServiceManagement/Services/Commands.Test/Environment/AddAzureEnvironmentTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Environment/AddAzureEnvironmentTests.cs @@ -16,13 +16,14 @@ using System.Management.Automation; using System.Reflection; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Profile; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Moq; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Environment { diff --git a/src/ServiceManagement/Services/Commands.Test/Environment/GetAzureEnvironmentTests.cs b/src/ServiceManagement/Services/Commands.Test/Environment/GetAzureEnvironmentTests.cs index 86cd58ef51b7..0382d1202d30 100644 --- a/src/ServiceManagement/Services/Commands.Test/Environment/GetAzureEnvironmentTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Environment/GetAzureEnvironmentTests.cs @@ -15,13 +15,14 @@ using System.Collections.Generic; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Profile; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Moq; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Environment { diff --git a/src/ServiceManagement/Services/Commands.Test/Environment/RemoveAzureEnvironmentTests.cs b/src/ServiceManagement/Services/Commands.Test/Environment/RemoveAzureEnvironmentTests.cs index bb5af475b2be..ad1085a6af8f 100644 --- a/src/ServiceManagement/Services/Commands.Test/Environment/RemoveAzureEnvironmentTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Environment/RemoveAzureEnvironmentTests.cs @@ -16,13 +16,14 @@ using System.Collections.Generic; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Profile; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Moq; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Environment { diff --git a/src/ServiceManagement/Services/Commands.Test/Environment/SetAzureEnvironmentTests.cs b/src/ServiceManagement/Services/Commands.Test/Environment/SetAzureEnvironmentTests.cs index c98fbb613994..25587ec8616b 100644 --- a/src/ServiceManagement/Services/Commands.Test/Environment/SetAzureEnvironmentTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Environment/SetAzureEnvironmentTests.cs @@ -18,12 +18,13 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Profile; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Environment { diff --git a/src/ServiceManagement/Services/Commands.Test/MediaServices/GetAzureMediaServicesTests.cs b/src/ServiceManagement/Services/Commands.Test/MediaServices/GetAzureMediaServicesTests.cs index c582d6eedc9a..dd00777e74fb 100644 --- a/src/ServiceManagement/Services/Commands.Test/MediaServices/GetAzureMediaServicesTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/MediaServices/GetAzureMediaServicesTests.cs @@ -17,7 +17,7 @@ using System.Threading.Tasks; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.MediaServices; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; @@ -26,6 +26,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.MediaServices.Services.Entities; using Microsoft.WindowsAzure.Management.MediaServices.Models; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.MediaServices { diff --git a/src/ServiceManagement/Services/Commands.Test/MediaServices/MediaServicesClientTests.cs b/src/ServiceManagement/Services/Commands.Test/MediaServices/MediaServicesClientTests.cs index 7a32a10f6d40..c40cb015bafc 100644 --- a/src/ServiceManagement/Services/Commands.Test/MediaServices/MediaServicesClientTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/MediaServices/MediaServicesClientTests.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Xunit; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.MediaServices; using Microsoft.WindowsAzure.Management.MediaServices; using Microsoft.WindowsAzure.Management.MediaServices.Models; diff --git a/src/ServiceManagement/Services/Commands.Test/Profile/GetAzurePublishSettingsFileTests.cs b/src/ServiceManagement/Services/Commands.Test/Profile/GetAzurePublishSettingsFileTests.cs index dc826e3222c1..a053082992b8 100644 --- a/src/ServiceManagement/Services/Commands.Test/Profile/GetAzurePublishSettingsFileTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Profile/GetAzurePublishSettingsFileTests.cs @@ -19,6 +19,8 @@ using Microsoft.WindowsAzure.Commands.Profile; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Moq; +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.Test.Profile { diff --git a/src/ServiceManagement/Services/Commands.Test/ServiceBus/GetAzureSBNamespaceTest.cs b/src/ServiceManagement/Services/Commands.Test/ServiceBus/GetAzureSBNamespaceTest.cs index fa71b952eaab..d1c170b9786b 100644 --- a/src/ServiceManagement/Services/Commands.Test/ServiceBus/GetAzureSBNamespaceTest.cs +++ b/src/ServiceManagement/Services/Commands.Test/ServiceBus/GetAzureSBNamespaceTest.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.WindowsAzure.Commands.Utilities.ServiceBus; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.ServiceBus { diff --git a/src/ServiceManagement/Services/Commands.Test/WAPackIaaS/WebClient/GetAbsoluteUriTests.cs b/src/ServiceManagement/Services/Commands.Test/WAPackIaaS/WebClient/GetAbsoluteUriTests.cs index 4c2e6dbc79c2..9600f704a96c 100644 --- a/src/ServiceManagement/Services/Commands.Test/WAPackIaaS/WebClient/GetAbsoluteUriTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/WAPackIaaS/WebClient/GetAbsoluteUriTests.cs @@ -15,7 +15,7 @@ using System; using System.Text; using Xunit; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.WAPackIaaS.WebClient; namespace Microsoft.WindowsAzure.Commands.Test.WAPackIaaS.WebClient diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/DisableAzureWebsiteDiagnosticTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/DisableAzureWebsiteDiagnosticTests.cs index dd6330e9c20b..765191222d13 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/DisableAzureWebsiteDiagnosticTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/DisableAzureWebsiteDiagnosticTests.cs @@ -14,12 +14,13 @@ using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Websites; using Moq; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/EnableAzureWebsiteDiagnosticTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/EnableAzureWebsiteDiagnosticTests.cs index af3db57ecc19..18fa8a81eb9d 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/EnableAzureWebsiteDiagnosticTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/EnableAzureWebsiteDiagnosticTests.cs @@ -15,13 +15,14 @@ using System.Collections.Generic; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.DeploymentEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; using Xunit; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebSiteMetricsTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebSiteMetricsTests.cs index cb619b5d506f..97b27ddd563d 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebSiteMetricsTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebSiteMetricsTests.cs @@ -17,13 +17,14 @@ using System.Linq; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebSiteTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebSiteTests.cs index b00c5f774dc9..466f519b4e57 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebSiteTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebSiteTests.cs @@ -17,7 +17,7 @@ using System.Linq; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; @@ -26,6 +26,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebsiteDeploymentTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebsiteDeploymentTests.cs index 7043b0d44993..148fa84cd857 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebsiteDeploymentTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/GetAzureWebsiteDeploymentTests.cs @@ -17,7 +17,7 @@ using System.Linq; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; @@ -25,6 +25,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/NewAzureWebSiteTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/NewAzureWebSiteTests.cs index 8a3f66fcac03..2670efa213db 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/NewAzureWebSiteTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/NewAzureWebSiteTests.cs @@ -15,7 +15,7 @@ using System; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; @@ -23,6 +23,7 @@ using Microsoft.WindowsAzure.Commands.Websites; using Microsoft.WindowsAzure.Management.WebSites.Models; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/RemoveAzureWebSiteTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/RemoveAzureWebSiteTests.cs index 8f86e922c0fb..7d92d34adc01 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/RemoveAzureWebSiteTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/RemoveAzureWebSiteTests.cs @@ -15,13 +15,14 @@ using System; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/RestartAzureWebsiteTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/RestartAzureWebsiteTests.cs index 58e1a9099ef3..e952048e6e09 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/RestartAzureWebsiteTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/RestartAzureWebsiteTests.cs @@ -15,12 +15,13 @@ using System; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/RestoreAzureWebsiteDeploymentTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/RestoreAzureWebsiteDeploymentTests.cs index b9aac67c3acf..114c851d2b8f 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/RestoreAzureWebsiteDeploymentTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/RestoreAzureWebsiteDeploymentTests.cs @@ -17,7 +17,7 @@ using System.Linq; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; @@ -25,6 +25,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/SaveAzureWebsiteLogTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/SaveAzureWebsiteLogTests.cs index c6471e90303a..0c878701c3c2 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/SaveAzureWebsiteLogTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/SaveAzureWebsiteLogTests.cs @@ -18,7 +18,7 @@ using System.Text; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Common; @@ -26,6 +26,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/SetAzureWebSiteTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/SetAzureWebSiteTests.cs index baab7d646f42..290079cb57d5 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/SetAzureWebSiteTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/SetAzureWebSiteTests.cs @@ -17,13 +17,14 @@ using System.Linq; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/ShowAzurePortalTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/ShowAzurePortalTests.cs index 37c350772665..f60098e641f8 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/ShowAzurePortalTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/ShowAzurePortalTests.cs @@ -16,6 +16,7 @@ using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Websites; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/ShowAzureWebsiteTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/ShowAzureWebsiteTests.cs index 4a569bc82829..ab3c9b5129e4 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/ShowAzureWebsiteTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/ShowAzureWebsiteTests.cs @@ -15,13 +15,14 @@ using System; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/StartAzureWebSiteTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/StartAzureWebSiteTests.cs index 79d60d38c04c..df9dee13dc96 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/StartAzureWebSiteTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/StartAzureWebSiteTests.cs @@ -15,12 +15,13 @@ using System; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/StopAzureWebSiteTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/StopAzureWebSiteTests.cs index 7a2f97ebbc06..58c7f1acbc4b 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/StopAzureWebSiteTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/StopAzureWebSiteTests.cs @@ -15,12 +15,13 @@ using System; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/SwitchAzureWebSiteSlotTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/SwitchAzureWebSiteSlotTests.cs index badb4ec73a60..099cbf223ca9 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/SwitchAzureWebSiteSlotTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/SwitchAzureWebSiteSlotTests.cs @@ -16,13 +16,14 @@ using System.Collections.Generic; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/UpdateAzureWebsiteRepositoryTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/UpdateAzureWebsiteRepositoryTests.cs index bb2a8517f450..5210c9759ced 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/UpdateAzureWebsiteRepositoryTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/UpdateAzureWebsiteRepositoryTests.cs @@ -16,13 +16,14 @@ using System.Collections.Generic; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites { diff --git a/src/ServiceManagement/Services/Commands.Test/Websites/WebHostingPlans/GetAzureWebHostingPlanTests.cs b/src/ServiceManagement/Services/Commands.Test/Websites/WebHostingPlans/GetAzureWebHostingPlanTests.cs index df0b53b9e1a4..52c4c19a050c 100644 --- a/src/ServiceManagement/Services/Commands.Test/Websites/WebHostingPlans/GetAzureWebHostingPlanTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/Websites/WebHostingPlans/GetAzureWebHostingPlanTests.cs @@ -18,13 +18,14 @@ using System.Linq; using Xunit; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Test.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Websites.WebHostingPlan; using Moq; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Test.Websites.WebHostingPlans { diff --git a/src/ServiceManagement/Services/Commands.Utilities/CloudService/CacheConfigurationFactory.cs b/src/ServiceManagement/Services/Commands.Utilities/CloudService/CacheConfigurationFactory.cs index e163c564997e..233c833f8ac7 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/CloudService/CacheConfigurationFactory.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/CloudService/CacheConfigurationFactory.cs @@ -27,6 +27,7 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { using ConfigConfigurationSetting = Common.XmlSchema.ServiceConfigurationSchema.ConfigurationSetting; using DefinitionConfigurationSetting = Common.XmlSchema.ServiceDefinitionSchema.ConfigurationSetting; + using Microsoft.WindowsAzure.Commands.Common; static class CacheConfigurationFactory { diff --git a/src/ServiceManagement/Services/Commands.Utilities/CloudService/CloudServiceClient.cs b/src/ServiceManagement/Services/Commands.Utilities/CloudService/CloudServiceClient.cs index 1b97290245a7..b07ffad44cf0 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/CloudService/CloudServiceClient.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/CloudService/CloudServiceClient.cs @@ -22,7 +22,7 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools; using Microsoft.WindowsAzure.Commands.Utilities.CloudService.Model; @@ -41,6 +41,8 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { using ConfigCertificate = Common.XmlSchema.ServiceConfigurationSchema.Certificate; using ConfigConfigurationSetting = Common.XmlSchema.ServiceConfigurationSchema.ConfigurationSetting; + using Microsoft.Azure.Common.Extensions.Models; + using Microsoft.Azure.Common.Extensions; public class CloudServiceClient : ICloudServiceClient { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj index f3277cd1a8d8..872739c0960c 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj @@ -219,6 +219,8 @@ + + @@ -716,6 +718,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs index 5ac3c6ec6c3d..40ef0cb6d6e2 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs @@ -22,6 +22,8 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntime.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntime.cs index f21e0f7f0910..10f309b6141f 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntime.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntime.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimeCollection.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimeCollection.cs index 6a192a0ff497..9b853562becf 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimeCollection.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimeCollection.cs @@ -18,6 +18,7 @@ using System.Xml; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimePackage.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimePackage.cs index d4aca37d73a4..0c193412dd3a 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimePackage.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudRuntimePackage.cs @@ -17,6 +17,7 @@ using System.Xml; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServicePathInfo.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServicePathInfo.cs index ad7c9c27ff49..c21ea4fdb4aa 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServicePathInfo.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServicePathInfo.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs index 3a14d0c9c888..ffd12d3e6550 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs @@ -26,6 +26,8 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; using Microsoft.WindowsAzure.Commands.Utilities; +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CommonUtilities.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CommonUtilities.cs index 40e59f90c5ac..dfff278043ad 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CommonUtilities.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CommonUtilities.cs @@ -17,6 +17,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.CloudService; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/JavaScriptPackageHelpers.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/JavaScriptPackageHelpers.cs index c6d1b7f10d3e..d5a00b52369b 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/JavaScriptPackageHelpers.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/JavaScriptPackageHelpers.cs @@ -18,6 +18,7 @@ using System.Web.Script.Serialization; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/PublishContext.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/PublishContext.cs index 136cc8de3401..efd3f357acd2 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/PublishContext.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/PublishContext.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/RoleInfo.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/RoleInfo.cs index 60b8ea583165..f6fd5477ba61 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/RoleInfo.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/RoleInfo.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Common.Extensions; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/NodeRules.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/NodeRules.cs index 5116a9d19305..4d3077897178 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/NodeRules.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/NodeRules.cs @@ -17,6 +17,8 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/PHPRules.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/PHPRules.cs index 98a087815da9..67d0f22aab6a 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/PHPRules.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/PHPRules.cs @@ -17,6 +17,8 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; +using Microsoft.Azure.Common.Extensions; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/PythonRules.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/PythonRules.cs index df0e6b8021f0..2d347a777af9 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/PythonRules.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/PythonRules.cs @@ -17,6 +17,8 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; +using Microsoft.Azure.Common.Extensions; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs index a1cd70481fc8..9eae6d86279d 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs @@ -20,6 +20,7 @@ using System.Xml.Linq; using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceComponents.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceComponents.cs index 59c0b53c06e4..8a71dd4d11f4 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceComponents.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceComponents.cs @@ -21,6 +21,8 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; +using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/Common/Commands.Common/XmlSchema/ServiceConfigurationSchema.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceConfigurationSchema.cs similarity index 99% rename from src/Common/Commands.Common/XmlSchema/ServiceConfigurationSchema.cs rename to src/ServiceManagement/Services/Commands.Utilities/Common/ServiceConfigurationSchema.cs index b7dbffe076b9..9c2e9a899813 100644 --- a/src/Common/Commands.Common/XmlSchema/ServiceConfigurationSchema.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceConfigurationSchema.cs @@ -10,7 +10,7 @@ // This source code was auto-generated by xsd, Version=4.0.30319.34014 using command: // xsd.exe "C:\Program Files\Microsoft SDKs\Azure\.NET SDK\v2.5\schemas\ServiceConfigurationSchema.xsd" -// /c /namespace:Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema +// /c /namespace:Microsoft.Azure.Common.Extensions.XmlSchema.ServiceConfigurationSchema // /language:cs namespace Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema { diff --git a/src/Common/Commands.Common/XmlSchema/ServiceDefinitionSchema.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceDefinitionSchema.cs similarity index 99% rename from src/Common/Commands.Common/XmlSchema/ServiceDefinitionSchema.cs rename to src/ServiceManagement/Services/Commands.Utilities/Common/ServiceDefinitionSchema.cs index 522b146a9758..0141831de1f5 100644 --- a/src/Common/Commands.Common/XmlSchema/ServiceDefinitionSchema.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceDefinitionSchema.cs @@ -10,7 +10,7 @@ // This source code was auto-generated by xsd, Version=4.0.30319.34014 using command: // xsd.exe "C:\Program Files\Microsoft SDKs\Azure\.NET SDK\v2.5\schemas\ServiceDefinitionSchema.xsd" -// /c /namespace:Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema +// /c /namespace:Microsoft.Azure.Common.Extensions.XmlSchema.ServiceDefinitionSchema // /language:cs namespace Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceManagementBaseCmdlet.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceManagementBaseCmdlet.cs index 204253015b96..5febc9e247ab 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceManagementBaseCmdlet.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceManagementBaseCmdlet.cs @@ -21,13 +21,14 @@ using System.ServiceModel.Dispatcher; using AutoMapper; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.WindowsAzure.Management; using Microsoft.WindowsAzure.Management.Compute; using Microsoft.WindowsAzure.Management.Network; using Microsoft.WindowsAzure.Management.Storage; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceSettings.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceSettings.cs index 30d06f454e59..b1db82219311 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceSettings.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceSettings.cs @@ -21,6 +21,7 @@ using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/ServiceManagement/Services/Commands.Utilities/MediaServices/MediaServicesClient.cs b/src/ServiceManagement/Services/Commands.Utilities/MediaServices/MediaServicesClient.cs index 9886c252fd42..8115b61589d0 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/MediaServices/MediaServicesClient.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/MediaServices/MediaServicesClient.cs @@ -22,7 +22,7 @@ using System.Xml; using System.Xml.Serialization; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services; using Microsoft.WindowsAzure.Management.MediaServices; @@ -30,6 +30,7 @@ using Microsoft.WindowsAzure.Management.Storage; using Microsoft.WindowsAzure.Management.Storage.Models; using Newtonsoft.Json; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.MediaServices { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Scheduler/SchedulerMgmntClient.CreateJobs.cs b/src/ServiceManagement/Services/Commands.Utilities/Scheduler/SchedulerMgmntClient.CreateJobs.cs index 99d104d97491..c678fe40b48c 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Scheduler/SchedulerMgmntClient.CreateJobs.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Scheduler/SchedulerMgmntClient.CreateJobs.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Scheduler.Model; using Microsoft.WindowsAzure.Scheduler; using Microsoft.WindowsAzure.Scheduler.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.Scheduler { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Scheduler/SchedulerMgmntClient.cs b/src/ServiceManagement/Services/Commands.Utilities/Scheduler/SchedulerMgmntClient.cs index 728b6c902af8..0eb9d533ad57 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Scheduler/SchedulerMgmntClient.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Scheduler/SchedulerMgmntClient.cs @@ -16,7 +16,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.WindowsAzure.Commands.Utilities.Scheduler.Common; using Microsoft.WindowsAzure.Commands.Utilities.Scheduler.Model; @@ -24,6 +24,7 @@ using Microsoft.WindowsAzure.Management.Scheduler.Models; using Microsoft.WindowsAzure.Scheduler; using Microsoft.WindowsAzure.Scheduler.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.Scheduler { diff --git a/src/ServiceManagement/Services/Commands.Utilities/ServiceBus/ServiceBusClientExtensions.cs b/src/ServiceManagement/Services/Commands.Utilities/ServiceBus/ServiceBusClientExtensions.cs index dd353879c61f..9e8c4ca20910 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/ServiceBus/ServiceBusClientExtensions.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/ServiceBus/ServiceBusClientExtensions.cs @@ -22,7 +22,7 @@ using Microsoft.ServiceBus.Messaging; using Microsoft.ServiceBus.Notifications; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.WindowsAzure.Management.ServiceBus; using Microsoft.WindowsAzure.Management.ServiceBus.Models; @@ -30,6 +30,8 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.ServiceBus { using ServiceBusNamespaceDescription = Management.ServiceBus.Models.NamespaceDescription; + using Microsoft.Azure.Common.Extensions.Models; + using Microsoft.Azure.Common.Extensions; public class ServiceBusClientExtensions { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Store/StoreClient.cs b/src/ServiceManagement/Services/Commands.Utilities/Store/StoreClient.cs index 47655197556f..dfa975d3c4f0 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Store/StoreClient.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Store/StoreClient.cs @@ -19,7 +19,7 @@ using System.Security.Cryptography; using System.Text; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.MarketplaceServiceReference; using Microsoft.WindowsAzure.Commands.Utilities.Properties; @@ -32,6 +32,8 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.Store { using Resource = Management.Store.Models.CloudServiceListResponse.CloudService.AddOnResource; + using Microsoft.Azure.Common.Extensions.Models; + using Microsoft.Azure.Common.Extensions; public class StoreClient { diff --git a/src/ServiceManagement/Services/Commands.Utilities/WAPackIaaS/WebClient/Subscription.cs b/src/ServiceManagement/Services/Commands.Utilities/WAPackIaaS/WebClient/Subscription.cs index f33e2b1afa0d..c8b00a60b2f0 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/WAPackIaaS/WebClient/Subscription.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/WAPackIaaS/WebClient/Subscription.cs @@ -17,8 +17,9 @@ using System.Security; using System.Security.Cryptography.X509Certificates; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.WAPackIaaS.WebClient { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/KuduRemoteClientBase.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/KuduRemoteClientBase.cs index 6443c16e7204..d01d08427868 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/KuduRemoteClientBase.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/KuduRemoteClientBase.cs @@ -16,8 +16,9 @@ using System.Net; using System.Net.Http; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Factories; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Factories; namespace Microsoft.WindowsAzure.Commands.Utilities.Websites { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/RemoteLogStreamManager.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/RemoteLogStreamManager.cs index 72e84b42ff81..db9701c0cc22 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/RemoteLogStreamManager.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/RemoteLogStreamManager.cs @@ -18,6 +18,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.Utilities.Websites { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Cache.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Cache.cs index 74cf334bcdee..b5c18f3badee 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Cache.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Cache.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.Websites.Services { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs index 6895ef105b6c..2a9b78ac97af 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs @@ -17,6 +17,7 @@ using System.Linq; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Utilities.Websites.Services { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/WebsitesClient.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/WebsitesClient.cs index a11fc02974d4..8dc3a6897bc1 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/WebsitesClient.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/WebsitesClient.cs @@ -27,7 +27,7 @@ using Microsoft.Build.Logging; using Microsoft.Web.Deployment; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.Utilities.CloudService; using Microsoft.WindowsAzure.Commands.Utilities.Common; @@ -47,6 +47,8 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.Websites { using Utilities = Services.WebEntities; + using Microsoft.Azure.Common.Extensions.Models; + using Microsoft.Azure.Common.Extensions; public class WebsitesClient : IWebsitesClient { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/EnableAzureMemcacheRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/EnableAzureMemcacheRole.cs index e28a437e4eb0..8c4fda353f15 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/EnableAzureMemcacheRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/EnableAzureMemcacheRole.cs @@ -32,6 +32,7 @@ namespace Microsoft.WindowsAzure.Commands.CloudService.Development { using ConfigConfigurationSetting = Utilities.Common.XmlSchema.ServiceConfigurationSchema.ConfigurationSetting; using DefinitionConfigurationSetting = Utilities.Common.XmlSchema.ServiceDefinitionSchema.ConfigurationSetting; + using Microsoft.WindowsAzure.Commands.Common; /// /// Enables memcache for specific role. diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/EnableAzureRemoteDesktop.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/EnableAzureRemoteDesktop.cs index 2f7d9865e3c9..cf1eb84ce317 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/EnableAzureRemoteDesktop.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/EnableAzureRemoteDesktop.cs @@ -30,6 +30,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Certificate = Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema.Certificate; using ConfigurationSetting = Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema.ConfigurationSetting; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/SaveAzureServiceProjectPackage.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/SaveAzureServiceProjectPackage.cs index 9b87d6cdbcfd..44776a935b79 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/SaveAzureServiceProjectPackage.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/SaveAzureServiceProjectPackage.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureCacheWorkerRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureCacheWorkerRole.cs index e9194c082ca0..bf88da4f4c45 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureCacheWorkerRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureCacheWorkerRole.cs @@ -21,6 +21,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureDjangoWebRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureDjangoWebRole.cs index e23145fdf384..03fc10eb49c8 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureDjangoWebRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureDjangoWebRole.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureNodeWebRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureNodeWebRole.cs index 14bff8bd55a2..1a858fa26df9 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureNodeWebRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureNodeWebRole.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureNodeWorkerRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureNodeWorkerRole.cs index ff6cf0b50a7d..7ba23f1d3683 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureNodeWorkerRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureNodeWorkerRole.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzurePHPWebRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzurePHPWebRole.cs index 1ad9bdc7e4bf..61984d0b30ce 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzurePHPWebRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzurePHPWebRole.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzurePHPWorkerRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzurePHPWorkerRole.cs index d68c2f8b9a3f..07e5dae3b05b 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzurePHPWorkerRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzurePHPWorkerRole.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureWebRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureWebRole.cs index ae68a1ddabbe..b61c7ce13f61 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureWebRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureWebRole.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureWorkerRole.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureWorkerRole.cs index 0dfd9eba9228..bb52897a934b 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureWorkerRole.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/AddAzureWorkerRole.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common.XmlSchema.ServiceConfigurationSchema; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/NewAzureRoleTemplate.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/NewAzureRoleTemplate.cs index 0b3616e50565..18fe8452fa07 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/NewAzureRoleTemplate.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/NewAzureRoleTemplate.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.CloudService; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/StartAzureEmulator.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/StartAzureEmulator.cs index c30480f3a02c..24685533648b 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/StartAzureEmulator.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/StartAzureEmulator.cs @@ -21,6 +21,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands/CloudService/TestAzureName.cs b/src/ServiceManagement/Services/Commands/CloudService/TestAzureName.cs index 9d9a8c088b56..1c8f38e2ebc9 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/TestAzureName.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/TestAzureName.cs @@ -14,11 +14,12 @@ using System.IO; using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.CloudService; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.ServiceBus; using Microsoft.WindowsAzure.Commands.Utilities.Websites; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.CloudService { diff --git a/src/ServiceManagement/Services/Commands/Commands.csproj b/src/ServiceManagement/Services/Commands/Commands.csproj index c72ef1b612a9..b5623d3a7518 100644 --- a/src/ServiceManagement/Services/Commands/Commands.csproj +++ b/src/ServiceManagement/Services/Commands/Commands.csproj @@ -335,6 +335,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {4900ec4e-8deb-4412-9108-0bc52f81d457} Commands.Utilities diff --git a/src/ServiceManagement/Services/Commands/MediaServices/AzureMediaServicesHttpClientCommandBase.cs b/src/ServiceManagement/Services/Commands/MediaServices/AzureMediaServicesHttpClientCommandBase.cs index de42618d3072..9f32f435bd8d 100644 --- a/src/ServiceManagement/Services/Commands/MediaServices/AzureMediaServicesHttpClientCommandBase.cs +++ b/src/ServiceManagement/Services/Commands/MediaServices/AzureMediaServicesHttpClientCommandBase.cs @@ -14,6 +14,7 @@ using System; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.MediaServices { diff --git a/src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDiagnostic.cs b/src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDiagnostic.cs index 105ddd37a2c2..503cc72e53c5 100644 --- a/src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDiagnostic.cs +++ b/src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDiagnostic.cs @@ -14,7 +14,7 @@ using System.Collections.Generic; using System.Management.Automation; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Websites; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Common; using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.DeploymentEntities; diff --git a/src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs b/src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs index 12c7b2baee7e..f3a1ad735844 100644 --- a/src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs +++ b/src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs @@ -32,6 +32,7 @@ namespace Microsoft.WindowsAzure.Commands.Websites { using GitClass = Utilities.Websites.Services.Git; + using Microsoft.Azure.Common.Extensions; /// /// Creates a new azure website. diff --git a/src/ServiceManagement/Services/Commands/Websites/ShowAzurePortal.cs b/src/ServiceManagement/Services/Commands/Websites/ShowAzurePortal.cs index 0f05ce9d378b..38c49306e520 100644 --- a/src/ServiceManagement/Services/Commands/Websites/ShowAzurePortal.cs +++ b/src/ServiceManagement/Services/Commands/Websites/ShowAzurePortal.cs @@ -14,10 +14,10 @@ using System.Management.Automation; using System.Security.Permissions; -using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Properties; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Websites { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj index 9219943795cb..0480193a3d80 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj @@ -196,6 +196,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {DDF5D225-C9C5-42B7-BDB5-2C3646E479AA} Commands.SqlDatabase diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/FunctionalTests/OutputFormatValidator.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/FunctionalTests/OutputFormatValidator.cs index 361a3282f3c4..f95acb7f8976 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/FunctionalTests/OutputFormatValidator.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/FunctionalTests/OutputFormatValidator.cs @@ -16,6 +16,7 @@ using System.IO; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.FunctionalTests { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCertAuthTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCertAuthTests.cs index 3f63e1ff8b87..cd558de05ad8 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCertAuthTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCertAuthTests.cs @@ -19,13 +19,14 @@ using System.Linq; using System.Management.Automation; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.MockServer; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Server.Cmdlet; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.Utilities; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCopyCertAuthTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCopyCertAuthTests.cs index 760d9835189b..7a08975a3d90 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCopyCertAuthTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCopyCertAuthTests.cs @@ -18,12 +18,13 @@ using System.Management.Automation; using System.Threading; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Model; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.MockServer; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Server.Cmdlet; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRecoverableDatabaseTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRecoverableDatabaseTests.cs index 5238f23ab686..791ec090cc93 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRecoverableDatabaseTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRecoverableDatabaseTests.cs @@ -24,6 +24,7 @@ using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Sql.Models; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRestorableDroppedDatabaseCertAuthTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRestorableDroppedDatabaseCertAuthTests.cs index f153fc4f99b4..ad8846138cd9 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRestorableDroppedDatabaseCertAuthTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRestorableDroppedDatabaseCertAuthTests.cs @@ -19,7 +19,7 @@ using System.Management.Automation; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Common; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/ImportExportCmdletTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/ImportExportCmdletTests.cs index 433dc8ecb49d..bf559a0278bc 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/ImportExportCmdletTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/ImportExportCmdletTests.cs @@ -18,7 +18,7 @@ using System.Text.RegularExpressions; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.MockServer; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Server.Cmdlet; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.Utilities; diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseServerContextTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseServerContextTests.cs index 9d81af0d8211..0d7a63866b9f 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseServerContextTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseServerContextTests.cs @@ -18,7 +18,7 @@ using System.Linq; using System.Management.Automation; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet; using Microsoft.WindowsAzure.Commands.SqlDatabase.Properties; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseTests.cs index f8af47f323ce..6062fec13dc8 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseTests.cs @@ -21,6 +21,7 @@ using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Server.Cmdlet; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RecoverDatabaseTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RecoverDatabaseTests.cs index 04dbe805a74a..e2fb1fd30a70 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RecoverDatabaseTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RecoverDatabaseTests.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Sql.Models; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RestoreDatabaseTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RestoreDatabaseTests.cs index e67f388989ab..53728462dc1d 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RestoreDatabaseTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RestoreDatabaseTests.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.Utilities; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Firewall/Cmdlet/FirewallCmdletTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Firewall/Cmdlet/FirewallCmdletTests.cs index f14722b820f9..3e4ceeac3e8d 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Firewall/Cmdlet/FirewallCmdletTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Firewall/Cmdlet/FirewallCmdletTests.cs @@ -17,13 +17,14 @@ using System.Linq; using System.Management.Automation; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Model; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.MockServer; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Server.Cmdlet; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.Utilities; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Firewall.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/MockServer/MockHttpServer.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/MockServer/MockHttpServer.cs index 3f75a9aed0db..a03bd2d3594f 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/MockServer/MockHttpServer.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/MockServer/MockHttpServer.cs @@ -22,10 +22,11 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Test.Common; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.MockServer { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Server/Cmdlet/ServerCmdletTests.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Server/Cmdlet/ServerCmdletTests.cs index 0bea995f575e..b2ae923598ba 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Server/Cmdlet/ServerCmdletTests.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Server/Cmdlet/ServerCmdletTests.cs @@ -17,7 +17,7 @@ using System.Linq; using System.Management.Automation; using Microsoft.VisualStudio.TestTools.UnitTesting; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Model; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Database.Cmdlet; @@ -26,6 +26,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using System.Management.Automation.Runspaces; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.Utilities; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.Server.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs index 5129e1576b9f..e41c6ebb79cf 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs @@ -23,8 +23,9 @@ using System.Security.Cryptography.X509Certificates; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests.MockServer; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.UnitTests { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj b/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj index f09283a2d85e..dc647c7c8b1b 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj @@ -203,6 +203,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabase.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabase.cs index 1436c4b268d7..9c6deb7746cb 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabase.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabase.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseCopy.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseCopy.cs index 752965e10077..aaefb6e0c3b6 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseCopy.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseCopy.cs @@ -22,6 +22,7 @@ namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { using DatabaseCopyModel = Model.DatabaseCopy; + using Microsoft.Azure.Common.Extensions; /// /// Retrieves a list of all ongoing Microsoft Azure SQL Database copy operations in the given diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseImportExportStatus.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseImportExportStatus.cs index 840dad9d4162..34067c97e70b 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseImportExportStatus.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseImportExportStatus.cs @@ -19,6 +19,8 @@ using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport; using Microsoft.WindowsAzure.Management.Sql; using Microsoft.WindowsAzure.Management.Sql.Models; +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { @@ -172,7 +174,7 @@ public override void ExecuteCmdlet() var status = this.GetAzureSqlDatabaseImportExportStatusProcess( serverName, - serverName + AzureSession.CurrentContext.Environment.GetEndpoint(Common.Models.AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix), + serverName + AzureSession.CurrentContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix), userName, password, requestId); diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseOperation.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseOperation.cs index c787ece705c0..68d9769792f4 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseOperation.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseOperation.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseServiceObjective.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseServiceObjective.cs index 244fff6c081c..1c644705ad7e 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseServiceObjective.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/GetAzureSqlDatabaseServiceObjective.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/NewAzureSqlDatabase.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/NewAzureSqlDatabase.cs index 8f2e8c97345f..cf085ab42159 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/NewAzureSqlDatabase.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/NewAzureSqlDatabase.cs @@ -15,11 +15,12 @@ using System; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Properties; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/NewAzureSqlDatabaseServerContext.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/NewAzureSqlDatabaseServerContext.cs index f9ff613afc93..2a1e399592c5 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/NewAzureSqlDatabaseServerContext.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/NewAzureSqlDatabaseServerContext.cs @@ -18,11 +18,12 @@ using System.Management.Automation; using System.Xml.Linq; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Properties; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/RemoveAzureSqlDatabase.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/RemoveAzureSqlDatabase.cs index 9cb81fb3b67e..68bb1ccdc563 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/RemoveAzureSqlDatabase.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/RemoveAzureSqlDatabase.cs @@ -16,11 +16,12 @@ using System.Globalization; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Properties; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/SetAzureSqlDatabase.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/SetAzureSqlDatabase.cs index 350125beec5b..7292204dabe6 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/SetAzureSqlDatabase.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/SetAzureSqlDatabase.cs @@ -16,11 +16,12 @@ using System.Globalization; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Properties; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseCopy.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseCopy.cs index 1bf549c626cf..5fa5166b8d68 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseCopy.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseCopy.cs @@ -24,6 +24,7 @@ namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { using DatabaseCopyModel = Model.DatabaseCopy; + using Microsoft.Azure.Common.Extensions; /// /// Start a copy operation for a Microsoft Azure SQL Database in the given server context. diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseExport.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseExport.cs index 5522462dd9d3..f9fec0f80808 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseExport.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseExport.cs @@ -14,7 +14,7 @@ using System; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport; @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel; using Microsoft.WindowsAzure.Management.Sql; using Microsoft.WindowsAzure.Management.Sql.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseImport.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseImport.cs index d0c8a9f8f736..b0736940ef05 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseImport.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseImport.cs @@ -14,7 +14,7 @@ using System; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport; @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel; using Microsoft.WindowsAzure.Management.Sql; using Microsoft.WindowsAzure.Management.Sql.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseRestore.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseRestore.cs index 3f5d52ecbc4a..ceea8020e6ab 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseRestore.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseRestore.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StopAzureSqlDatabaseCopy.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StopAzureSqlDatabaseCopy.cs index 0b199ba31c78..f838ec05af79 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StopAzureSqlDatabaseCopy.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StopAzureSqlDatabaseCopy.cs @@ -25,6 +25,7 @@ namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet { using DatabaseCopyModel = Model.DatabaseCopy; + using Microsoft.Azure.Common.Extensions; /// /// Stop an ongoing copy operation for a Microsoft Azure SQL Database in the given server context. diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Common/DataServiceAccess.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Common/DataServiceAccess.cs index dede374f2e69..087f06cb21e9 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Common/DataServiceAccess.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Common/DataServiceAccess.cs @@ -19,6 +19,7 @@ using System.Text; using System.Xml.Linq; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Common; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common { diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceCertAuth.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceCertAuth.cs index dab0383ecdb3..54201c04b680 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceCertAuth.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceCertAuth.cs @@ -17,7 +17,7 @@ using System.Globalization; using System.Linq; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Properties; using Microsoft.WindowsAzure.Management.Sql; using Microsoft.WindowsAzure.Management.Sql.Models; @@ -26,6 +26,7 @@ namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server { using DatabaseCopyModel = Model.DatabaseCopy; using WamlDatabaseCopy = Management.Sql.Models.DatabaseCopy; + using Microsoft.Azure.Common.Extensions; /// /// Implementation of the with Certificate authentication. diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceSqlAuth.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceSqlAuth.cs index a4cd18328169..255fc38fb6b7 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceSqlAuth.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataServiceSqlAuth.cs @@ -26,6 +26,7 @@ namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server { using DatabaseCopyModel = Model.DatabaseCopy; + using Microsoft.WindowsAzure.Commands.Common; /// /// Implementation of the with Sql Authentication. diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/SqlDatabaseCmdletBase.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/SqlDatabaseCmdletBase.cs index cc2a15ab2b1f..709b58ed2f66 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/SqlDatabaseCmdletBase.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/SqlDatabaseCmdletBase.cs @@ -15,11 +15,12 @@ using System; using System.Globalization; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services; using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Sql; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase { diff --git a/src/ServiceManagement/Storage/Commands.Storage.Test/Blob/StorageBlobTestBase.cs b/src/ServiceManagement/Storage/Commands.Storage.Test/Blob/StorageBlobTestBase.cs index 6e631d36e44d..4c57942c8b2e 100644 --- a/src/ServiceManagement/Storage/Commands.Storage.Test/Blob/StorageBlobTestBase.cs +++ b/src/ServiceManagement/Storage/Commands.Storage.Test/Blob/StorageBlobTestBase.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.Storage.Test.Service; using Microsoft.WindowsAzure.Storage.Blob; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Storage.Test.Blob { diff --git a/src/ServiceManagement/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj b/src/ServiceManagement/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj index 86a42117de77..d8d4d86fd765 100644 --- a/src/ServiceManagement/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj +++ b/src/ServiceManagement/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj @@ -177,6 +177,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {3b48a77b-5956-4a62-9081-92ba04b02b27} Commands.Common.Test diff --git a/src/ServiceManagement/Storage/Commands.Storage/Commands.Storage.csproj b/src/ServiceManagement/Storage/Commands.Storage/Commands.Storage.csproj index f896296bf24c..c756c2077035 100644 --- a/src/ServiceManagement/Storage/Commands.Storage/Commands.Storage.csproj +++ b/src/ServiceManagement/Storage/Commands.Storage/Commands.Storage.csproj @@ -203,6 +203,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage diff --git a/src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs b/src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs index 843b572dbc50..c311e9108c65 100644 --- a/src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs +++ b/src/ServiceManagement/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs @@ -17,11 +17,12 @@ using System.Management.Automation; using System.Security.Permissions; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Storage; using Microsoft.WindowsAzure.Storage.Auth; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.Storage.Common.Cmdlet { diff --git a/src/ServiceManagement/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs b/src/ServiceManagement/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs index 974838008dc5..3effb41d97c6 100644 --- a/src/ServiceManagement/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs +++ b/src/ServiceManagement/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs @@ -20,7 +20,7 @@ using System.Net; using System.Threading; using System.Threading.Tasks; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.Common.Storage; using Microsoft.WindowsAzure.Commands.Storage.File; using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel; diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj index 86ea75d0aa0a..6eae3bc8d116 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj @@ -143,6 +143,10 @@ + + {b95c489c-8cb7-4dcf-8d5f-b9aebdbbaf89} + Common.Extensions + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/TestAzureTrafficManagerDomainName.cs b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/TestAzureTrafficManagerDomainName.cs index 0e45eff67cc7..ddf18d9ca57c 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/TestAzureTrafficManagerDomainName.cs +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/TestAzureTrafficManagerDomainName.cs @@ -16,6 +16,8 @@ using Microsoft.WindowsAzure.Commands.TrafficManager.Utilities; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Common.Extensions; +using Microsoft.Azure.Common.Extensions.Models; namespace Microsoft.WindowsAzure.Commands.TrafficManager { @@ -34,8 +36,8 @@ public override void ExecuteCmdlet() private string GetDomainNameToCheck(string domainName) { - string TrafficManagerSuffix = !string.IsNullOrEmpty(AzureSession.CurrentContext.Environment.GetEndpoint(Common.Models.AzureEnvironment.Endpoint.TrafficManagerDnsSuffix)) ? - AzureSession.CurrentContext.Environment.GetEndpoint(Common.Models.AzureEnvironment.Endpoint.TrafficManagerDnsSuffix) : + string TrafficManagerSuffix = !string.IsNullOrEmpty(AzureSession.CurrentContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.TrafficManagerDnsSuffix)) ? + AzureSession.CurrentContext.Environment.GetEndpoint(AzureEnvironment.Endpoint.TrafficManagerDnsSuffix) : AzureEnvironmentConstants.AzureTrafficManagerDnsSuffix; if (!string.IsNullOrEmpty(domainName) && !domainName.ToLower().EndsWith(TrafficManagerSuffix)) diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Utilities/TrafficManagerClient.cs b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Utilities/TrafficManagerClient.cs index 5b6ab8b92890..5c25d4a1eefd 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Utilities/TrafficManagerClient.cs +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Utilities/TrafficManagerClient.cs @@ -16,10 +16,11 @@ using System.Collections.Generic; using System.Linq; using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.WindowsAzure.Commands.Common.Models; +using Microsoft.Azure.Common.Extensions.Models; using Microsoft.WindowsAzure.Commands.TrafficManager.Models; using Microsoft.WindowsAzure.Management.TrafficManager; using Microsoft.WindowsAzure.Management.TrafficManager.Models; +using Microsoft.Azure.Common.Extensions; namespace Microsoft.WindowsAzure.Commands.TrafficManager.Utilities {