Merge pull request Azure#225 from markcowl/resignite

Update resource manager changes with wix file

Author: markcowl

setup/azurecmdfiles.wxi

@@ -1168,9 +1168,6 @@
                         <Component Id="cmp2FD81A9625D5F45C5D43F9E652B2339A" Guid="*">
                             <File Id="fil09B3DFE6A5A254D5C6D3FFE82A3B983C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ResourceManager\Microsoft.Azure.Common.dll" />
                         </Component>
-                        <Component Id="cmpC8E793E8A0FC8495F4D0B048C79C87D6" Guid="*">
-                            <File Id="fil4E9576440A38C61E9C1466D4D1443C32" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ResourceManager\Microsoft.Azure.ResourceManager.dll" />
-                        </Component>
                         <Component Id="cmp3857DCE0607C8535A39A94AFF3669FDD" Guid="*">
                             <File Id="fil6EDB7A010C5A716040764517B31E3C47" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\ResourceManager\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
                         </Component>
@@ -4067,7 +4064,6 @@
             <ComponentRef Id="cmp4A9CBE6913BD99499757EDE83E2A85C9" />
             <ComponentRef Id="cmp1D90870460C08DCCAF6043A718F03174" />
             <ComponentRef Id="cmp2FD81A9625D5F45C5D43F9E652B2339A" />
-            <ComponentRef Id="cmpC8E793E8A0FC8495F4D0B048C79C87D6" />
             <ComponentRef Id="cmp3857DCE0607C8535A39A94AFF3669FDD" />
             <ComponentRef Id="cmp38E4FE537642B1CB7AF32F78EEA5F2ED" />
             <ComponentRef Id="cmp624341A24005E593C3CA7C692181BC03" />

src/ResourceManager/ResourceManager/Commands.ResourceManager/Clients/Commands.ResourceManager.Clients.csproj

@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Collections
 {
     using System;
     using System.Collections.Generic;
-    using Cmdlets.Json;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Json;
 
     /// <summary>
     /// The insensitive version of dictionary.

src/ResourceManager/ResourceManager/Commands.ResourceManager/Clients/MSSharedLibKey.snk

@@ -58,10 +58,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.21-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.ResourceManager">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\packages\Microsoft.Azure.Management.Resources.2.14.1-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.16.204221202\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -135,7 +131,6 @@
     <Compile Include="Implementation\RemoveAzureResourceCmdlet.cs" />
     <Compile Include="Implementation\RemoveAzureResourceLockCmdlet.cs" />
     <Compile Include="Implementation\ResourceLockManagementCmdletBase.cs" />
-    <Compile Include="Implementation\ResourceLockManipulationCmdletBase.cs" />
     <Compile Include="Implementation\SetAzureResourceCmdlet.cs" />
     <Compile Include="Implementation\NewAzureResourceCmdlet.cs" />
     <Compile Include="Implementation\ResourceManipulationCmdletBase.cs" />

src/ResourceManager/ResourceManager/Commands.ResourceManager/Clients/Properties/AssemblyInfo.cs

@@ -20,12 +20,10 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
     using System.Runtime.Caching;
     using System.Threading;
     using System.Threading.Tasks;
-    using Microsoft.Azure.Commands.ResourceManager.Clients.Components;
-    using Cmdlets.Extensions;
-    using Cmdlets.Entities.Providers;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Providers;
     using Microsoft.Azure.Common.Authentication;
     using Microsoft.Azure.Common.Authentication.Models;
-    using Microsoft.Azure.Management.Resources;
 
     /// <summary>
     /// Helper class for determining the API version
@@ -130,14 +128,6 @@ private static string[] GetApiVersionsForResourceType(AzureProfile profile, stri
                 .FirstOrDefault();
         }
 
-        /// <summary>
-        /// Gets an instance of the <see cref="IResourceManagementClient"/> client.
-        /// </summary>
-        private static IResourceManagementClient GetResourceManagementClient(AzureProfile profile)
-        {
-            return AzureSession.ClientFactory.CreateClient<ResourceManagementClient>(profile, AzureEnvironment.Endpoint.ResourceManager);
-        }
-
         /// <summary>
         /// A singleton instance of the <see cref="ApiVersionCache"/>
         /// </summary>

src/ResourceManager/ResourceManager/Commands.ResourceManager/Clients/packages.config

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Clients.Components
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
 {
     /// <summary>
     /// Class for holding constants

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Collections/InsensitiveDictionary.cs

@@ -12,14 +12,14 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Clients.Components
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
 {
     using System.Collections.Generic;
     using System.Linq;
     using System.Net.Http;
     using System.Net.Http.Headers;
-    using Microsoft.Azure.Commands.ResourceManager.Clients.Handlers;
-    using Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Handlers;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
 
     /// <summary>
     /// Factory class for creating <see cref="HttpClient"/> objects with custom headers.
@@ -58,7 +58,7 @@ public virtual HttpClient CreateHttpClient(params DelegatingHandler[] primaryHan
                 new AuthenticationHandler(cloudCredentials: credentials),
                 new UserAgentHandler(headerValues: headerValues),
                 new TracingHandler(),
-                new Microsoft.Azure.Commands.ResourceManager.Clients.Handlers.RetryHandler(),
+                new RetryHandler(),
             };
 
             var pipeline = (HttpMessageHandler)(new HttpClientHandler());

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Commands.ResourceManager.Cmdlets.csproj

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Clients.Components
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
 {
     using System.Collections.Generic;
     using System.Net.Http.Headers;

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/ApiVersionHelper.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Clients.Components
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
 {
     using System.Net.Http;
 

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/Constants.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Clients.Components
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
 {
     using System.Net;
 

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/HttpClientHelper.cs

@@ -19,14 +19,13 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
     using System.Net;
     using System.Threading;
     using System.Threading.Tasks;
-    using Clients.Components;
-    using Microsoft.Azure.Commands.ResourceManager.Client.Components;
-    using Cmdlets.Collections;
-    using Cmdlets.Extensions;
-    using Cmdlets.Utilities;
-    using Cmdlets.Entities.Resources;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Collections;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Resources;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.RestClients;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
     using Newtonsoft.Json.Linq;
-    using ResourceManager.Clients.RestClients;
 
     /// <summary>
     /// A helper class for tracking long running operations.

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Components/HttpClientHelperFactory.cs

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.ResourceManager.Client.Components
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components
 {
     using System;
     using System.Net;