Merge pull request #878 from ogail/psget

Remove Commands.Common dependency from Common.Storage

Author: ogail

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

@@ -142,6 +142,8 @@
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Channels" />
     <Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
@@ -153,6 +155,21 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\commands.common\AzurePowerShell.cs">
+      <Link>Common\AzurePowerShell.cs</Link>
+    </Compile>
+    <Compile Include="..\commands.common\ConversionUtilities.cs">
+      <Link>Common\ConversionUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\commands.common\DebugStreamTraceListener.cs">
+      <Link>Common\DebugStreamTraceListener.cs</Link>
+    </Compile>
+    <Compile Include="..\commands.common\GeneralUtilities.cs">
+      <Link>Common\GeneralUtilities.cs</Link>
+    </Compile>
+    <Compile Include="..\commands.common\RecordingTracingInterceptor.cs">
+      <Link>Common\RecordingTracingInterceptor.cs</Link>
+    </Compile>
     <Compile Include="AzureStorageContext.cs" />
     <Compile Include="BlobUploadParameters.cs" />
     <Compile Include="IStorageClientWrapper.cs" />
@@ -175,12 +192,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Commands.Common\Commands.Common.csproj">
-      <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
-      <Name>Commands.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

src/Common/Commands.Common.Storage/Properties/Resources.Designer.cs

@@ -120,6 +120,9 @@
   <data name="AnonymousAccountName" xml:space="preserve">
     <value>[Anonymous]</value>
   </data>
+  <data name="BlobAlreadyExistsInTheAccount" xml:space="preserve">
+    <value>Blob with the name {0} already exists in the account.</value>
+  </data>
   <data name="SasTokenAccountName" xml:space="preserve">
     <value>[SasToken]</value>
   </data>

src/Common/Commands.Common.Storage/Properties/Resources.resx

@@ -17,6 +17,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage
     using System;
     using System.Globalization;
     using System.IO;
+    using Properties;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
     using Microsoft.WindowsAzure.Management.Storage;
     using Microsoft.WindowsAzure.Management.Storage.Models;
@@ -97,7 +98,7 @@ private Uri UploadFile(string storageName, Uri blobEndpointUri, string storageKe
                 else
                 {
                     throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,
-                        Commands.Common.Properties.Resources.BlobAlreadyExistsInTheAccount, blobName));
+                        Resources.BlobAlreadyExistsInTheAccount, blobName));
                 }
             }