Merge pull request #142 from Azure/dev

.

Author: huangpf

setup/azurecmdfiles.wxi

@@ -34,7 +34,7 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.Common
     /// </summary>
     public abstract class AzurePSCmdlet : PSCmdlet, IDisposable
     {
-        private readonly ConcurrentQueue<string> _debugMessages;
+        protected readonly ConcurrentQueue<string> _debugMessages;
 
         private RecordingTracingInterceptor _httpTracingInterceptor;
 

src/Common/Commands.Common/AzurePSCmdlet.cs

@@ -5,7 +5,6 @@
   <package id="Microsoft.Azure.Common.Authentication" version="1.3.3-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.ApiManagement" version="1.0.2-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5715.36130-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config

@@ -18,5 +18,4 @@
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="xunit" version="1.9.2" targetFramework="net45" />
   <package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />
 </packages>

src/ResourceManager/Automation/Commands.Automation.Test/packages.config

@@ -1,9 +1,6 @@
-using Microsoft.Azure.Common.Authentication;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.Azure.Common.Authentication;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Common
 {

src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.Designer.cs

@@ -12,17 +12,18 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
+using System.IO;
 using System.Management.Automation;
+using System.Management.Automation.Host;
+using System.Threading;
+using Microsoft.Azure.Commands.ResourceManager.Common.Properties;
 using Microsoft.Azure.Common.Authentication;
 using Microsoft.Azure.Common.Authentication.Models;
+using Microsoft.Azure.Management.Internal.Resources;
+using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using System.IO;
 using Newtonsoft.Json;
-using Microsoft.Azure.Commands.ResourceManager.Common.Properties;
-using System;
-using System.Threading;
-using System.Management.Automation.Host;
-using Microsoft.WindowsAzure.Commands.Common;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Common
 {
@@ -42,6 +43,14 @@ static AzureRMCmdlet()
             }
         }
 
+        public AzureRMCmdlet()
+        {
+            AzureSession.ClientFactory.RemoveHandler(typeof(RPRegistrationDelegatingHandler));
+            AzureSession.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
+                () => AzureSession.ClientFactory.CreateClient<ResourceManagementClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager),
+                s => _debugMessages.Enqueue(s)));
+        }
+
         /// <summary>
         /// Gets or sets the global profile for ARM cmdlets.
         /// </summary>

src/ResourceManager/Common/Commands.ResourceManager.Common/AccessTokenExtensions.cs

@@ -68,10 +68,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -142,14 +138,143 @@
   <ItemGroup>
     <Compile Include="AccessTokenExtensions.cs" />
     <Compile Include="AzureRmCmdlet.cs" />
-    <Compile Include="ModelExtensions.cs" />
+    <Compile Include="Generated\AuthorizationClient.cs" />
+    <Compile Include="Generated\AuthorizationClientExtensions.cs" />
+    <Compile Include="Generated\DeploymentOperationOperations.cs" />
+    <Compile Include="Generated\DeploymentOperationOperationsExtensions.cs" />
+    <Compile Include="Generated\DeploymentOperations.cs" />
+    <Compile Include="Generated\DeploymentOperationsExtensions.cs" />
+    <Compile Include="Generated\FeatureClient.cs" />
+    <Compile Include="Generated\FeatureClientExtensions.cs" />
+    <Compile Include="Generated\Features.cs" />
+    <Compile Include="Generated\FeaturesExtensions.cs" />
+    <Compile Include="Generated\IAuthorizationClient.cs" />
+    <Compile Include="Generated\IDeploymentOperationOperations.cs" />
+    <Compile Include="Generated\IDeploymentOperations.cs" />
+    <Compile Include="Generated\IFeatureClient.cs" />
+    <Compile Include="Generated\IFeatures.cs" />
+    <Compile Include="Generated\IManagementLockOperations.cs" />
+    <Compile Include="Generated\IProviderOperations.cs" />
+    <Compile Include="Generated\IProviderOperationsMetadataOperations.cs" />
+    <Compile Include="Generated\IResourceGroupOperations.cs" />
+    <Compile Include="Generated\IResourceManagementClient.cs" />
+    <Compile Include="Generated\IResourceOperations.cs" />
+    <Compile Include="Generated\IResourceProviderOperationDetailsOperations.cs" />
+    <Compile Include="Generated\ISubscriptionClient.cs" />
+    <Compile Include="Generated\ISubscriptionOperations.cs" />
+    <Compile Include="Generated\ITagOperations.cs" />
+    <Compile Include="Generated\ITenantOperations.cs" />
+    <Compile Include="Generated\ManagementLockOperations.cs" />
+    <Compile Include="Generated\ManagementLockOperationsExtensions.cs" />
+    <Compile Include="Generated\Models\BasicDependency.cs" />
+    <Compile Include="Generated\Models\Dependency.cs" />
+    <Compile Include="Generated\Models\Deployment.cs" />
+    <Compile Include="Generated\Models\DeploymentExistsResult.cs" />
+    <Compile Include="Generated\Models\DeploymentExtended.cs" />
+    <Compile Include="Generated\Models\DeploymentGetResult.cs" />
+    <Compile Include="Generated\Models\DeploymentListParameters.cs" />
+    <Compile Include="Generated\Models\DeploymentListResult.cs" />
+    <Compile Include="Generated\Models\DeploymentMode.cs" />
+    <Compile Include="Generated\Models\DeploymentOperation.cs" />
+    <Compile Include="Generated\Models\DeploymentOperationProperties.cs" />
+    <Compile Include="Generated\Models\DeploymentOperationsCreateResult.cs" />
+    <Compile Include="Generated\Models\DeploymentOperationsGetResult.cs" />
+    <Compile Include="Generated\Models\DeploymentOperationsListParameters.cs" />
+    <Compile Include="Generated\Models\DeploymentOperationsListResult.cs" />
+    <Compile Include="Generated\Models\DeploymentProperties.cs" />
+    <Compile Include="Generated\Models\DeploymentPropertiesExtended.cs" />
+    <Compile Include="Generated\Models\DeploymentValidateResponse.cs" />
+    <Compile Include="Generated\Models\FeatureOperationsListResult.cs" />
+    <Compile Include="Generated\Models\FeatureProperties.cs" />
+    <Compile Include="Generated\Models\FeatureResponse.cs" />
+    <Compile Include="Generated\Models\GenericResource.cs" />
+    <Compile Include="Generated\Models\GenericResourceExtended.cs" />
+    <Compile Include="Generated\Models\GetSubscriptionResult.cs" />
+    <Compile Include="Generated\Models\Location.cs" />
+    <Compile Include="Generated\Models\LocationListResult.cs" />
+    <Compile Include="Generated\Models\LockLevel.cs" />
+    <Compile Include="Generated\Models\LongRunningOperationResponse.cs" />
+    <Compile Include="Generated\Models\ManagementLockGetQueryParameter.cs" />
+    <Compile Include="Generated\Models\ManagementLockListResult.cs" />
+    <Compile Include="Generated\Models\ManagementLockObject.cs" />
+    <Compile Include="Generated\Models\ManagementLockProperties.cs" />
+    <Compile Include="Generated\Models\ManagementLockReturnResult.cs" />
+    <Compile Include="Generated\Models\Operation.cs" />
+    <Compile Include="Generated\Models\ParametersLink.cs" />
+    <Compile Include="Generated\Models\Plan.cs" />
+    <Compile Include="Generated\Models\Provider.cs" />
+    <Compile Include="Generated\Models\ProviderGetResult.cs" />
+    <Compile Include="Generated\Models\ProviderListParameters.cs" />
+    <Compile Include="Generated\Models\ProviderListResult.cs" />
+    <Compile Include="Generated\Models\ProviderOperationsMetadata.cs" />
+    <Compile Include="Generated\Models\ProviderOperationsMetadataGetResult.cs" />
+    <Compile Include="Generated\Models\ProviderOperationsMetadataListResult.cs" />
+    <Compile Include="Generated\Models\ProviderRegistionResult.cs" />
+    <Compile Include="Generated\Models\ProviderRegistrationState.cs" />
+    <Compile Include="Generated\Models\ProviderResourceType.cs" />
+    <Compile Include="Generated\Models\ProviderUnregistionResult.cs" />
+    <Compile Include="Generated\Models\ProvisioningState.cs" />
+    <Compile Include="Generated\Models\RegistrationState.cs" />
+    <Compile Include="Generated\Models\ResourceCreateOrUpdateResult.cs" />
+    <Compile Include="Generated\Models\ResourceExistsResult.cs" />
+    <Compile Include="Generated\Models\ResourceGetResult.cs" />
+    <Compile Include="Generated\Models\ResourceGroup.cs" />
+    <Compile Include="Generated\Models\ResourceGroupCreateOrUpdateResult.cs" />
+    <Compile Include="Generated\Models\ResourceGroupExistsResult.cs" />
+    <Compile Include="Generated\Models\ResourceGroupExtended.cs" />
+    <Compile Include="Generated\Models\ResourceGroupGetResult.cs" />
+    <Compile Include="Generated\Models\ResourceGroupListParameters.cs" />
+    <Compile Include="Generated\Models\ResourceGroupListResult.cs" />
+    <Compile Include="Generated\Models\ResourceGroupPatchResult.cs" />
+    <Compile Include="Generated\Models\ResourceListParameters.cs" />
+    <Compile Include="Generated\Models\ResourceListResult.cs" />
+    <Compile Include="Generated\Models\ResourceManagementError.cs" />
+    <Compile Include="Generated\Models\ResourceManagementErrorWithDetails.cs" />
+    <Compile Include="Generated\Models\ResourceProviderOperationDefinition.cs" />
+    <Compile Include="Generated\Models\ResourceProviderOperationDetailListResult.cs" />
+    <Compile Include="Generated\Models\ResourceProviderOperationDisplayProperties.cs" />
+    <Compile Include="Generated\Models\ResourcesMoveInfo.cs" />
+    <Compile Include="Generated\Models\ResourceType.cs" />
+    <Compile Include="Generated\Models\Subscription.cs" />
+    <Compile Include="Generated\Models\SubscriptionListResult.cs" />
+    <Compile Include="Generated\Models\TagCount.cs" />
+    <Compile Include="Generated\Models\TagCreateResult.cs" />
+    <Compile Include="Generated\Models\TagCreateValueResult.cs" />
+    <Compile Include="Generated\Models\TagDetails.cs" />
+    <Compile Include="Generated\Models\TagsListResult.cs" />
+    <Compile Include="Generated\Models\TagValue.cs" />
+    <Compile Include="Generated\Models\TargetResource.cs" />
+    <Compile Include="Generated\Models\TemplateLink.cs" />
+    <Compile Include="Generated\Models\TenantIdDescription.cs" />
+    <Compile Include="Generated\Models\TenantListResult.cs" />
+    <Compile Include="Generated\ProviderOperations.cs" />
+    <Compile Include="Generated\ProviderOperationsExtensions.cs" />
+    <Compile Include="Generated\ProviderOperationsMetadataOperations.cs" />
+    <Compile Include="Generated\ProviderOperationsMetadataOperationsExtensions.cs" />
+    <Compile Include="Generated\ResourceGroupOperations.cs" />
+    <Compile Include="Generated\ResourceGroupOperationsExtensions.cs" />
+    <Compile Include="Generated\ResourceManagementClient.cs" />
+    <Compile Include="Generated\ResourceManagementClientExtensions.cs" />
+    <Compile Include="Generated\ResourceOperations.cs" />
+    <Compile Include="Generated\ResourceOperationsExtensions.cs" />
+    <Compile Include="Generated\ResourceProviderOperationDetailsOperations.cs" />
+    <Compile Include="Generated\ResourceProviderOperationDetailsOperationsExtensions.cs" />
+    <Compile Include="Generated\SubscriptionClient.cs" />
+    <Compile Include="Generated\SubscriptionClientExtensions.cs" />
+    <Compile Include="Generated\SubscriptionOperations.cs" />
+    <Compile Include="Generated\SubscriptionOperationsExtensions.cs" />
+    <Compile Include="Generated\TagOperations.cs" />
+    <Compile Include="Generated\TagOperationsExtensions.cs" />
+    <Compile Include="Generated\TenantOperations.cs" />
+    <Compile Include="Generated\TenantOperationsExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="RMProfileClient.cs" />
+    <Compile Include="RPRegistrationDelegatingHandler.cs" />
+    <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>