Merge pull request #7224 from MiYanni/6952-fix

Removed Microsoft.Azure.ResourceManager.dll from Azure.Storage.psd1

Author: Maddie Clayton

src/Storage/Commands.Storage/Azure.Storage.psd1

@@ -58,7 +58,6 @@ RequiredAssemblies = '.\Microsoft.WindowsAzure.Storage.dll',
                '.\Microsoft.WindowsAzure.Storage.DataMovement.dll', 
                '.\Microsoft.Azure.KeyVault.Core.dll', 
                '.\Microsoft.WindowsAzure.Management.dll', 
-               '.\Microsoft.Azure.ResourceManager.dll', 
                '.\Microsoft.Data.Edm.dll', '.\Microsoft.Data.OData.dll', 
                '.\System.Net.Http.Formatting.dll', 
                '.\System.Spatial.dll'

src/Storage/Commands.Storage/Commands.Storage.csproj

@@ -5,6 +5,7 @@
     <UseWebDeployment>false</UseWebDeployment>
     <UseNewtonsoftJson>false</UseNewtonsoftJson>
     <UseWindowsAzureStorage>false</UseWindowsAzureStorage>
+    <UseServiceManagementCommon>false</UseServiceManagementCommon>
   </PropertyGroup>
   <Import Project="..\..\..\tools\Common.ServiceManagement.Dependencies.targets" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

tools/Common.ServiceManagement.Dependencies.targets

@@ -201,7 +201,7 @@
       <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Common.1.1.0-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Commands.ServiceManagement.Common, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Commands.ServiceManagement.Common, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" Condition="'$(UseServiceManagementCommon)' != 'false'">
       <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ServiceManagement.1.1.0-preview\lib\net452\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>