Merge upstream/dev

ChangeLog.md

@@ -1,3 +1,5 @@
+## 2015.09.03 version 0.9.8
+
 ## 2015.08.17 version 0.9.7
 * Azure Profile cmdlets
   * New-AzureProfile

src/Common/Commands.Common/AzurePowerShell.cs

@@ -12,10 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Common.Authentication.Properties;
 using System;
 using System.IO;
 using System.Net.Http.Headers;
+using Microsoft.Azure.Common.Authentication.Properties;
 
 namespace Microsoft.WindowsAzure.Commands.Common
 {

src/Common/Commands.Common/AzurePSCmdlet.cs → src/Common/Commands.Common/AzureSMCmdlet.cs

@@ -12,20 +12,20 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.IO;
+using System.Management.Automation;
 using Microsoft.Azure.Common.Authentication;
 using Microsoft.Azure.Common.Authentication.Models;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.WindowsAzure.Commands.Common.Properties;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Management.Automation;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common
 {
-    public abstract class AzurePSCmdlet : PSCmdlet
+    public abstract class AzureSMCmdlet : PSCmdlet
     {
         private readonly ConcurrentQueue<string> _debugMessages = new ConcurrentQueue<string>();
         private RecordingTracingInterceptor _httpTracingInterceptor;
@@ -63,7 +63,7 @@ private get
 
         protected static TokenCache DefaultMemoryTokenCache { get; set; }
 
-        static AzurePSCmdlet()
+        static AzureSMCmdlet()
         {
             if (!TestMockSupport.RunningMocked)
             {
@@ -182,7 +182,7 @@ protected  virtual void InitializeProfile()
         {
             if (Profile == null)
             {
-                Profile = AzurePSCmdlet.CurrentProfile;
+                Profile = AzureSMCmdlet.CurrentProfile;
             }
 
             SetTokenCacheForProfile(Profile);

src/Common/Commands.Common/ChannelHelper.cs

@@ -12,8 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.WindowsAzure.Commands.Common;
-using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -29,6 +27,8 @@
 using System.Text;
 using System.Threading;
 using System.Xml;
+using Microsoft.WindowsAzure.Commands.Common;
+using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common
 {

src/Common/Commands.Common/CloudBaseCmdlet.cs

@@ -12,10 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Common.Authentication;
-using Microsoft.Azure.Common.Authentication.Models;
-using Microsoft.WindowsAzure.Commands.Common.Properties;
-using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
 using System;
 using System.Diagnostics;
 using System.Globalization;
@@ -24,10 +20,14 @@
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+using Microsoft.Azure.Common.Authentication;
+using Microsoft.Azure.Common.Authentication.Models;
+using Microsoft.WindowsAzure.Commands.Common.Properties;
+using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common
 {
-    public abstract class CloudBaseCmdlet<T> : AzurePSCmdlet
+    public abstract class CloudBaseCmdlet<T> : AzureSMCmdlet
         where T : class
     {
         private Binding _serviceBinding;

src/Common/Commands.Common/CmdletExtensions.cs

@@ -123,7 +123,7 @@ public static void InvokeEndProcessing(this PSCmdlet cmdlt)
             MethodInfo dynMethod = (typeof(PSCmdlet)).GetMethod("EndProcessing", BindingFlags.NonPublic | BindingFlags.Instance);
             dynMethod.Invoke(cmdlt, null);
         }
-        public static void ExecuteWithProcessing(this AzurePSCmdlet cmdlt)
+        public static void ExecuteWithProcessing(this AzureSMCmdlet cmdlt)
         {
             cmdlt.InvokeBeginProcessing();
             cmdlt.ExecuteCmdlet();

src/Common/Commands.Common/Commands.Common.csproj

@@ -161,7 +161,7 @@
     <Compile Include="ChannelHelper.cs" />
     <Compile Include="ClientCreatedArgs.cs" />
     <Compile Include="CloudBaseCmdlet.cs" />
-    <Compile Include="AzurePSCmdlet.cs" />
+    <Compile Include="AzureSMCmdlet.cs" />
     <Compile Include="CmdletExtensions.cs" />
     <Compile Include="ConfigurationConstants.cs" />
     <Compile Include="DiagnosticsHelper.cs" />

src/Common/Commands.Common/ComputeCloudException.cs

@@ -12,10 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Hyak.Common;
 using System;
 using System.Linq;
 using System.Text;
+using Hyak.Common;
 
 namespace Microsoft.WindowsAzure.Commands.Common
 {

src/Common/Commands.Common/DebugStreamTraceListener.cs

@@ -12,14 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Diagnostics;
-using System.IO;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 
 namespace Microsoft.WindowsAzure.Commands.Common

src/Common/Commands.Common/DiagnosticsHelper.cs

@@ -12,13 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.WindowsAzure.Commands.Common.Properties;
 using System;
 using System.Collections;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Xml;
+using Microsoft.WindowsAzure.Commands.Common.Properties;
 using Newtonsoft.Json;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common

src/Common/Commands.Common/ErrorHelper.cs

@@ -12,12 +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.Common;
+using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common
 {

src/Common/Commands.Common/GeneralUtilities.cs

@@ -12,9 +12,6 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Hyak.Common;
-using Microsoft.Azure.Common.Authentication;
-using Microsoft.WindowsAzure.Commands.Common;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -29,6 +26,9 @@
 using System.ServiceModel.Channels;
 using System.Text;
 using System.Xml;
+using Hyak.Common;
+using Microsoft.Azure.Common.Authentication;
+using Microsoft.WindowsAzure.Commands.Common;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common
 {

src/Common/Commands.Common/HttpClientExtensions.cs

@@ -13,13 +13,13 @@
 // ----------------------------------------------------------------------------------
 
 
-using Microsoft.Azure.Common.Authentication;
-using Microsoft.WindowsAzure.Commands.Common;
-using Newtonsoft.Json;
 using System;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using Microsoft.Azure.Common.Authentication;
+using Microsoft.WindowsAzure.Commands.Common;
+using Newtonsoft.Json;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common
 {

src/Common/Commands.Common/ProfileClient.cs

@@ -12,17 +12,17 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Hyak.Common;
-using Microsoft.Azure.Common.Authentication.Factories;
-using Microsoft.Azure.Common.Authentication.Models;
-using Microsoft.Azure.Common.Authentication.Properties;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security;
 using System.Security.Cryptography.X509Certificates;
+using Hyak.Common;
+using Microsoft.Azure.Common.Authentication.Factories;
+using Microsoft.Azure.Common.Authentication.Models;
+using Microsoft.Azure.Common.Authentication.Properties;
 using Microsoft.WindowsAzure.Subscriptions;
 
 namespace Microsoft.Azure.Common.Authentication

src/Common/Commands.Common/PublishSettingsImporter.cs

@@ -12,14 +12,14 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Common.Authentication.Models;
-using Microsoft.Azure.Common.Authentication.XmlSchema;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Xml.Serialization;
+using Microsoft.Azure.Common.Authentication.Models;
+using Microsoft.Azure.Common.Authentication.XmlSchema;
 
 namespace Microsoft.Azure.Common.Authentication
 {

src/Common/Commands.Common/RPRegistrationAction.cs

@@ -12,11 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Hyak.Common;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Net;
+using Hyak.Common;
 using Microsoft.Azure.Management.Resources;
 using Microsoft.WindowsAzure.Management;
 

src/Common/Commands.Common/RecordingTracingInterceptor.cs

@@ -12,13 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Hyak.Common;
-using Microsoft.WindowsAzure;
-using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Net.Http;
+using Hyak.Common;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Common.Authentication.Models
 {

src/Common/Commands.Common/ServiceManagementTypes.cs

@@ -14,7 +14,6 @@
 
 //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;
@@ -28,6 +27,7 @@
 using System.ServiceModel.Web;
 using System.Text;
 using System.Xml;
+using Microsoft.WindowsAzure.Commands.Common.Properties;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Model
 {

src/Common/Commands.Common/SubscriptionCmdletBase.cs

@@ -22,7 +22,7 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.Profile
     /// azure subscription, provides common support
     /// for the SubscriptionDataFile parameter.
     /// </summary>
-    public abstract class SubscriptionCmdletBase : AzurePSCmdlet
+    public abstract class SubscriptionCmdletBase : AzureSMCmdlet
     {
         private readonly bool _saveProfile;
 

src/Common/Commands.Profile/Profile/NewAzureProfile.cs

@@ -33,7 +33,7 @@ namespace Microsoft.WindowsAzure.Commands.Profile
     /// Creates new Microsoft Azure profile.
     /// </summary>
     [Cmdlet(VerbsCommon.New, "AzureProfile"), OutputType(typeof(AzureSMProfile))]
-    public class NewAzureProfileCommand : AzurePSCmdlet
+    public class NewAzureProfileCommand : AzureSMCmdlet
     {
         internal const string CertificateParameterSet = "Certificate";
         internal const string CredentialsParameterSet = "Credentials";

src/Common/Commands.Profile/Profile/SelectAzureProfile.cs

@@ -33,7 +33,7 @@ namespace Microsoft.WindowsAzure.Commands.Profile
     /// Creates new Microsoft Azure profile.
     /// </summary>
     [Cmdlet(VerbsCommon.Select, "AzureProfile"), OutputType(typeof(AzureSMProfile))]
-    public class SelectAzureProfileCommand : AzurePSCmdlet
+    public class SelectAzureProfileCommand : AzureSMCmdlet
     {
         internal const string NewProfileParameterSet = "NewProfile";
         internal const string DefaultProfileParameterSet = "DefaultProfile";
@@ -54,15 +54,15 @@ public override void ExecuteCmdlet()
         {
             if (ParameterSetName == DefaultProfileParameterSet)
             {
-                Profile = AzurePSCmdlet.InitializeDefaultProfile();
+                Profile = AzureSMCmdlet.InitializeDefaultProfile();
             }
 
             if (Profile == null)
             {
                 throw new ArgumentException(Resources.AzureProfileMustNotBeNull);
             }
 
-            AzurePSCmdlet.CurrentProfile = Profile;
+            AzureSMCmdlet.CurrentProfile = Profile;
             WriteObject(Profile);
         }
     }

src/Common/Commands.Profile/SwitchAzureMode.cs

@@ -24,7 +24,7 @@ namespace Microsoft.WindowsAzure.Commands.Profile
     /// Switches between ServiceManagement and ResourceManager modes.
     /// </summary>
     [Cmdlet(VerbsCommon.Switch, "AzureMode")]
-    public class SwitchAzureMode : AzurePSCmdlet
+    public class SwitchAzureMode : AzureSMCmdlet
     {
         [Parameter(Position = 0, Mandatory = true, HelpMessage = "Name of the mode to switch to. Valid values are AzureServiceManagement and AzureResourceManager")]
         [ValidateSet("AzureServiceManagement", "AzureResourceManager", IgnoreCase = false)]

src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs

@@ -51,7 +51,7 @@ public EnvironmentSetupHelper()
             var datastore = new MemoryDataStore();
             AzureSession.DataStore = datastore;
             var profile = new AzureSMProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile));
-            AzurePSCmdlet.CurrentProfile = profile;
+            AzureSMCmdlet.CurrentProfile = profile;
             AzureSession.DataStore = datastore;
             ProfileClient = new ProfileClient(profile);
 

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/AzureApiManagementCmdletBase.cs

@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
     using Microsoft.Azure.Commands.ApiManagement.ServiceManagement;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
-    abstract public class AzureApiManagementCmdletBase : AzurePSCmdlet
+    abstract public class AzureApiManagementCmdletBase : AzureSMCmdlet
     {
         protected static TimeSpan LongRunningOperationDefaultTimeout = TimeSpan.FromMinutes(1);
 

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/AzureApiManagementCmdletBase.cs

@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.Commands
     using Microsoft.Azure.Commands.ApiManagement.Properties;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
-    public class AzureApiManagementCmdletBase : AzurePSCmdlet
+    public class AzureApiManagementCmdletBase : AzureSMCmdlet
     {
         protected static TimeSpan LongRunningOperationDefaultTimeout = TimeSpan.FromMinutes(1);