From fd1727b9cdd88b95e2150818a76e19c00deb014e Mon Sep 17 00:00:00 2001 From: markcowl Date: Fri, 7 Dec 2018 16:46:18 -0800 Subject: [PATCH 1/4] Removing ServiceManagemenet misspellings --- src/Common.Test/Common/ConversionUtilitiesTests.cs | 2 +- src/Common.Test/Common/GeneralTests.cs | 2 +- src/Common.Test/Common/IdnUtilitiesTests.cs | 2 +- src/Common.Test/Common/JsonUtilitiesTests.cs | 2 +- src/Common.Test/Common/PSCmdletTests.cs | 2 +- src/Common.Test/Common/ProfileClientTests.cs | 4 ++-- src/Common.Test/Common/ServicePrincipalStoreTests.cs | 2 +- src/Common/AzurePSCmdlet.cs | 2 +- src/Common/RecordingTracingInterceptor.cs | 2 +- src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs | 2 +- src/ScenarioTest.ResourceManager/PowerShellExtensions.cs | 2 +- src/ScenarioTest.ResourceManager/XunitTracingInterceptor.cs | 2 +- src/ScenarioTest/EnvironmentSetupHelper.cs | 4 ++-- src/ScenarioTest/Mocks/MockClientFactory.cs | 2 +- src/ScenarioTest/PowerShellExtensions.cs | 2 +- src/ScenarioTest/XunitTracingInterceptor.cs | 2 +- src/ServiceManagement/AzureSMCmdlet.cs | 2 +- src/ServiceManagement/PSAzureAccount.cs | 2 +- src/ServiceManagement/ProfileClient.cs | 2 +- src/ServiceManagement/ProfileClientExtensions.cs | 2 +- src/ServiceManagement/PublishSettingsImporter.cs | 2 +- src/ServiceManagement/RPRegistrationAction.cs | 2 +- src/ServiceManagement/RequiredResourceLookup.cs | 2 +- src/ServiceManagement/SubscriptionCmdletBase.cs | 2 +- src/TestFx/TestManager.cs | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Common.Test/Common/ConversionUtilitiesTests.cs b/src/Common.Test/Common/ConversionUtilitiesTests.cs index 16e30d7227..cf81ce1aa3 100644 --- a/src/Common.Test/Common/ConversionUtilitiesTests.cs +++ b/src/Common.Test/Common/ConversionUtilitiesTests.cs @@ -18,7 +18,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit.Abstractions; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; namespace Microsoft.WindowsAzure.Commands.Common.Test { diff --git a/src/Common.Test/Common/GeneralTests.cs b/src/Common.Test/Common/GeneralTests.cs index 1c4c009b99..3ac1286072 100644 --- a/src/Common.Test/Common/GeneralTests.cs +++ b/src/Common.Test/Common/GeneralTests.cs @@ -19,7 +19,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit.Abstractions; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common diff --git a/src/Common.Test/Common/IdnUtilitiesTests.cs b/src/Common.Test/Common/IdnUtilitiesTests.cs index 0496279b02..61eb0940c8 100644 --- a/src/Common.Test/Common/IdnUtilitiesTests.cs +++ b/src/Common.Test/Common/IdnUtilitiesTests.cs @@ -14,7 +14,7 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; using Xunit; using Xunit.Abstractions; diff --git a/src/Common.Test/Common/JsonUtilitiesTests.cs b/src/Common.Test/Common/JsonUtilitiesTests.cs index fb067a1f59..1ab4bd3351 100644 --- a/src/Common.Test/Common/JsonUtilitiesTests.cs +++ b/src/Common.Test/Common/JsonUtilitiesTests.cs @@ -22,7 +22,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit.Abstractions; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common { diff --git a/src/Common.Test/Common/PSCmdletTests.cs b/src/Common.Test/Common/PSCmdletTests.cs index e38d3fc86e..15e90c9b21 100644 --- a/src/Common.Test/Common/PSCmdletTests.cs +++ b/src/Common.Test/Common/PSCmdletTests.cs @@ -29,7 +29,7 @@ using Microsoft.Azure.Commands.Common.Authentication.Factories; using System.Net.Http; using Xunit.Abstractions; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common { diff --git a/src/Common.Test/Common/ProfileClientTests.cs b/src/Common.Test/Common/ProfileClientTests.cs index becac461a7..cca3f7087b 100644 --- a/src/Common.Test/Common/ProfileClientTests.cs +++ b/src/Common.Test/Common/ProfileClientTests.cs @@ -21,13 +21,13 @@ using System.IO; using System.Linq; using System.Security.Cryptography.X509Certificates; -using Microsoft.Azure.ServiceManagemenet.Common; +using Microsoft.Azure.ServiceManagement.Common; using Xunit; using CSMSubscription = Microsoft.Azure.Subscriptions.Models.Subscription; using RDFESubscription = Microsoft.WindowsAzure.Subscriptions.Models.SubscriptionListOperationResponse.Subscription; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit.Abstractions; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Common; diff --git a/src/Common.Test/Common/ServicePrincipalStoreTests.cs b/src/Common.Test/Common/ServicePrincipalStoreTests.cs index 3fd44d2fca..bb4b9eb68d 100644 --- a/src/Common.Test/Common/ServicePrincipalStoreTests.cs +++ b/src/Common.Test/Common/ServicePrincipalStoreTests.cs @@ -15,7 +15,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Commands.ResourceManager.Common; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; using System; using System.Runtime.InteropServices; using System.Security; diff --git a/src/Common/AzurePSCmdlet.cs b/src/Common/AzurePSCmdlet.cs index a957df41be..8e04fab8b1 100644 --- a/src/Common/AzurePSCmdlet.cs +++ b/src/Common/AzurePSCmdlet.cs @@ -16,7 +16,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.WindowsAzure.Commands.Common.CustomAttributes; -using Microsoft.Azure.ServiceManagemenet.Common.Models; +using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using System; diff --git a/src/Common/RecordingTracingInterceptor.cs b/src/Common/RecordingTracingInterceptor.cs index fa2e00167f..c368d1b721 100644 --- a/src/Common/RecordingTracingInterceptor.cs +++ b/src/Common/RecordingTracingInterceptor.cs @@ -20,7 +20,7 @@ using System.Collections.Generic; using System.Net.Http; -namespace Microsoft.Azure.ServiceManagemenet.Common.Models +namespace Microsoft.Azure.ServiceManagement.Common.Models { public class RecordingTracingInterceptor : Hyak.Common.ICloudTracingInterceptor { diff --git a/src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs b/src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs index 26393efdcc..01d8604699 100644 --- a/src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs +++ b/src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs @@ -16,7 +16,7 @@ using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Common.Authentication.Models; using Microsoft.Azure.Commands.ScenarioTest; -using Microsoft.Azure.ServiceManagemenet.Common.Models; +using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Azure.Test; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.Common; diff --git a/src/ScenarioTest.ResourceManager/PowerShellExtensions.cs b/src/ScenarioTest.ResourceManager/PowerShellExtensions.cs index f4c3aceba9..c94fe4bda2 100644 --- a/src/ScenarioTest.ResourceManager/PowerShellExtensions.cs +++ b/src/ScenarioTest.ResourceManager/PowerShellExtensions.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagemenet.Common.Models; +using Microsoft.Azure.ServiceManagement.Common.Models; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/ScenarioTest.ResourceManager/XunitTracingInterceptor.cs b/src/ScenarioTest.ResourceManager/XunitTracingInterceptor.cs index 2bf6ca8e9c..bfafd8e77a 100644 --- a/src/ScenarioTest.ResourceManager/XunitTracingInterceptor.cs +++ b/src/ScenarioTest.ResourceManager/XunitTracingInterceptor.cs @@ -21,7 +21,7 @@ using System.Reflection; using Xunit.Abstractions; -namespace Microsoft.Azure.ServiceManagemenet.Common.Models +namespace Microsoft.Azure.ServiceManagement.Common.Models { public class XunitTracingInterceptor : Hyak.Common.ICloudTracingInterceptor { diff --git a/src/ScenarioTest/EnvironmentSetupHelper.cs b/src/ScenarioTest/EnvironmentSetupHelper.cs index 3c27da3051..33ee3934ef 100644 --- a/src/ScenarioTest/EnvironmentSetupHelper.cs +++ b/src/ScenarioTest/EnvironmentSetupHelper.cs @@ -26,9 +26,9 @@ using System.IO; using System.Management.Automation; using System.Security.Cryptography.X509Certificates; -using Microsoft.Azure.ServiceManagemenet.Common; +using Microsoft.Azure.ServiceManagement.Common; using System.Text; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; using System.Net.Http; using System.Threading; using Microsoft.Azure.Commands.Common.Authentication.Abstractions; diff --git a/src/ScenarioTest/Mocks/MockClientFactory.cs b/src/ScenarioTest/Mocks/MockClientFactory.cs index d6f44b542a..3c4e989f94 100644 --- a/src/ScenarioTest/Mocks/MockClientFactory.cs +++ b/src/ScenarioTest/Mocks/MockClientFactory.cs @@ -29,7 +29,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure; using System.IO; -using Microsoft.Azure.ServiceManagemenet.Common; +using Microsoft.Azure.ServiceManagement.Common; using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.WindowsAzure.Commands.Utilities.Common; #if NETSTANDARD diff --git a/src/ScenarioTest/PowerShellExtensions.cs b/src/ScenarioTest/PowerShellExtensions.cs index eec31318ec..23a2642014 100644 --- a/src/ScenarioTest/PowerShellExtensions.cs +++ b/src/ScenarioTest/PowerShellExtensions.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/src/ScenarioTest/XunitTracingInterceptor.cs b/src/ScenarioTest/XunitTracingInterceptor.cs index ccd3b03545..64b37e85ab 100644 --- a/src/ScenarioTest/XunitTracingInterceptor.cs +++ b/src/ScenarioTest/XunitTracingInterceptor.cs @@ -23,7 +23,7 @@ using System.IO; using System.Reflection; -namespace Microsoft.WindowsAzure.ServiceManagemenet.Common.Models +namespace Microsoft.WindowsAzure.ServiceManagement.Common.Models { public class XunitTracingInterceptor : Hyak.Common.ICloudTracingInterceptor { diff --git a/src/ServiceManagement/AzureSMCmdlet.cs b/src/ServiceManagement/AzureSMCmdlet.cs index 5b4b63e1a2..e0308aba8e 100644 --- a/src/ServiceManagement/AzureSMCmdlet.cs +++ b/src/ServiceManagement/AzureSMCmdlet.cs @@ -15,7 +15,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Common.Authentication.Models; -using Microsoft.Azure.ServiceManagemenet.Common.Models; +using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Common.Properties; using Newtonsoft.Json; diff --git a/src/ServiceManagement/PSAzureAccount.cs b/src/ServiceManagement/PSAzureAccount.cs index ceb865b912..0800b29122 100644 --- a/src/ServiceManagement/PSAzureAccount.cs +++ b/src/ServiceManagement/PSAzureAccount.cs @@ -15,7 +15,7 @@ using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using System.Collections.Generic; -namespace Microsoft.Azure.ServiceManagemenet.Common.Models +namespace Microsoft.Azure.ServiceManagement.Common.Models { public class PSAzureAccount { diff --git a/src/ServiceManagement/ProfileClient.cs b/src/ServiceManagement/ProfileClient.cs index 8152f87bb3..b7b04a7749 100644 --- a/src/ServiceManagement/ProfileClient.cs +++ b/src/ServiceManagement/ProfileClient.cs @@ -27,7 +27,7 @@ using System.Security; using System.Security.Cryptography.X509Certificates; -namespace Microsoft.Azure.ServiceManagemenet.Common +namespace Microsoft.Azure.ServiceManagement.Common { /// /// Convenience client for azure profile and subscriptions. diff --git a/src/ServiceManagement/ProfileClientExtensions.cs b/src/ServiceManagement/ProfileClientExtensions.cs index f20f24e5e0..e02da90af3 100644 --- a/src/ServiceManagement/ProfileClientExtensions.cs +++ b/src/ServiceManagement/ProfileClientExtensions.cs @@ -13,7 +13,7 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Common.Authentication.Abstractions; -using Microsoft.Azure.ServiceManagemenet.Common.Models; +using Microsoft.Azure.ServiceManagement.Common.Models; using System; using System.Collections.Generic; diff --git a/src/ServiceManagement/PublishSettingsImporter.cs b/src/ServiceManagement/PublishSettingsImporter.cs index b73b9ed3e8..726c2b1590 100644 --- a/src/ServiceManagement/PublishSettingsImporter.cs +++ b/src/ServiceManagement/PublishSettingsImporter.cs @@ -23,7 +23,7 @@ using System.Security.Cryptography.X509Certificates; using System.Xml.Serialization; -namespace Microsoft.Azure.ServiceManagemenet.Common +namespace Microsoft.Azure.ServiceManagement.Common { /// /// Class that handles loading publishsettings files diff --git a/src/ServiceManagement/RPRegistrationAction.cs b/src/ServiceManagement/RPRegistrationAction.cs index 4a7a0bcab1..567b4df8f0 100644 --- a/src/ServiceManagement/RPRegistrationAction.cs +++ b/src/ServiceManagement/RPRegistrationAction.cs @@ -27,7 +27,7 @@ using System.Linq; using System.Net; -namespace Microsoft.Azure.ServiceManagemenet.Common.Models +namespace Microsoft.Azure.ServiceManagement.Common.Models { public class RPRegistrationAction : IClientAction { diff --git a/src/ServiceManagement/RequiredResourceLookup.cs b/src/ServiceManagement/RequiredResourceLookup.cs index 7f286e3ef8..82d20f038f 100644 --- a/src/ServiceManagement/RequiredResourceLookup.cs +++ b/src/ServiceManagement/RequiredResourceLookup.cs @@ -14,7 +14,7 @@ using System.Collections.Generic; -namespace Microsoft.Azure.ServiceManagemenet.Common +namespace Microsoft.Azure.ServiceManagement.Common { /// /// This class handles mapping management client types diff --git a/src/ServiceManagement/SubscriptionCmdletBase.cs b/src/ServiceManagement/SubscriptionCmdletBase.cs index 03c213081f..2f2e6ca894 100644 --- a/src/ServiceManagement/SubscriptionCmdletBase.cs +++ b/src/ServiceManagement/SubscriptionCmdletBase.cs @@ -12,7 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.ServiceManagemenet.Common; +using Microsoft.Azure.ServiceManagement.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; namespace Microsoft.WindowsAzure.Commands.Utilities.Profile diff --git a/src/TestFx/TestManager.cs b/src/TestFx/TestManager.cs index bd976eeed3..d4d419be30 100644 --- a/src/TestFx/TestManager.cs +++ b/src/TestFx/TestManager.cs @@ -22,7 +22,7 @@ using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Common.Authentication.Models; using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.ServiceManagemenet.Common.Models; +using Microsoft.Azure.ServiceManagement.Common.Models; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.Rest.ClientRuntime.Azure.TestFramework; using Microsoft.WindowsAzure.Commands.ScenarioTest; From 7691b93a109cdc4fcbbc154647f349a6f30d9948 Mon Sep 17 00:00:00 2001 From: markcowl Date: Fri, 7 Dec 2018 17:02:05 -0800 Subject: [PATCH 2/4] Fixing one final typo --- src/Common.Test/Common/AuthenticationFactoryTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Common.Test/Common/AuthenticationFactoryTests.cs b/src/Common.Test/Common/AuthenticationFactoryTests.cs index 67595b557f..3035aaecf8 100644 --- a/src/Common.Test/Common/AuthenticationFactoryTests.cs +++ b/src/Common.Test/Common/AuthenticationFactoryTests.cs @@ -21,7 +21,7 @@ using Microsoft.Azure.Commands.Common.Authentication.Models; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit.Abstractions; -using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.WindowsAzure.ServiceManagement.Common.Models; using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common From 88880d4ff81249ae139e9605bfb72592c1d34100 Mon Sep 17 00:00:00 2001 From: markcowl Date: Fri, 7 Dec 2018 17:30:41 -0800 Subject: [PATCH 3/4] Updating user agent string for Az --- src/Common/AzurePowerShell.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Common/AzurePowerShell.cs b/src/Common/AzurePowerShell.cs index b28607eb5a..06556cff1d 100644 --- a/src/Common/AzurePowerShell.cs +++ b/src/Common/AzurePowerShell.cs @@ -26,9 +26,9 @@ public class AzurePowerShell public const string AssemblyCopyright = "Copyright © Microsoft"; - public const string AssemblyVersion = "6.9.0"; + public const string AssemblyVersion = "1.0.0"; - public const string AssemblyFileVersion = "6.9.0"; + public const string AssemblyFileVersion = "1.0.0"; public const string ProfileFile = "AzureProfile.json"; @@ -40,7 +40,7 @@ public class AzurePowerShell public static ProductInfoHeaderValue UserAgentValue = new ProductInfoHeaderValue( "AzurePowershell", - string.Format("v{0}", AzurePowerShell.AssemblyVersion)); + string.Format("Az{0}", AzurePowerShell.AssemblyVersion)); public static string ProfileDirectory = Path.Combine( #if NETSTANDARD From 5fc12c0d343536974e2061191987da0542813aca Mon Sep 17 00:00:00 2001 From: markcowl Date: Sun, 9 Dec 2018 16:55:53 -0800 Subject: [PATCH 4/4] Update PowerShell.StandardLibrary reference --- src/Dependencies.Netcore.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dependencies.Netcore.targets b/src/Dependencies.Netcore.targets index fad08bba14..2655ade8f3 100644 --- a/src/Dependencies.Netcore.targets +++ b/src/Dependencies.Netcore.targets @@ -12,7 +12,7 @@ - +