Skip to content

Commit d00cb1d

Browse files
markcowlmarkcowl
committed
Merge pull request Azure#1965 from wastoresh/dev
Decouple Sql project with Storage in ASM;
2 parents 954ec40 + 6ff09fd commit d00cb1d

File tree

53 files changed

+727
-1925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+727
-1925
lines changed

‎AzurePowershell.Test.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
3030
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
3131
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
32-
<StorageTestDebug>.\src\Common\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
32+
<StorageTestDebug>.\src\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
3333
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
3434
<DataLakeAnalyticsTestDebug>.\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll</DataLakeAnalyticsTestDebug>
3535
<DataLakeStoreTestDebug>.\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeStore.Test.dll</DataLakeStoreTestDebug>

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4471,12 +4471,6 @@
44714471
<Component Id="cmp221C334CE6510BD95538F285D482251F" Guid="*">
44724472
<File Id="fil0CA12B2E4C52E4FBA985D8D4F838390D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Azure.psd1" />
44734473
</Component>
4474-
<Component Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" Guid="*">
4475-
<File Id="filD84EC14AB325E2924B8FFE3A4D3D018A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Azure.Storage.psd1" />
4476-
</Component>
4477-
<Component Id="cmp572CBAA060A870457B636480C182F6E3" Guid="*">
4478-
<File Id="filA870DB1BA05E5465BDE158B5DC54FD4F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\AzureStorageStartup.ps1" />
4479-
</Component>
44804474
<Component Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" Guid="*">
44814475
<File Id="filA1C13EA190ADD849F77BDADF0A1A0638" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Hyak.Common.dll" />
44824476
</Component>
@@ -4564,18 +4558,6 @@
45644558
<Component Id="cmpD017719071884CE7DFF67453A22683A2" Guid="*">
45654559
<File Id="filF177A73C4C606380D6125980B86E51AC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.Types.ps1xml" />
45664560
</Component>
4567-
<Component Id="cmpFAD94D1001808F6A0312DF8DF0D72A5C" Guid="*">
4568-
<File Id="fil681F19CA5C5A56909A6D04F030A002D9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.dll" />
4569-
</Component>
4570-
<Component Id="cmp2103BDFB92495235F57C1975F3E23093" Guid="*">
4571-
<File Id="filEC116C854DE0FC2BE1ABF57F5F86692C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml" />
4572-
</Component>
4573-
<Component Id="cmp5D2A04E733C2324A249F18F641F2F593" Guid="*">
4574-
<File Id="fil4F5290658A463ED8944C26B35C4E470A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml" />
4575-
</Component>
4576-
<Component Id="cmp51E42C3F30F8F7927DEB13C8A2A6436E" Guid="*">
4577-
<File Id="fil57181F99D0B643E1F08D55628508A561" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.types.ps1xml" />
4578-
</Component>
45794561
<Component Id="cmp2E468077C73CFDDC9DAE16AA2E46CCA4" Guid="*">
45804562
<File Id="fil89020D4DEB7938824ABCBF4D5AAA02C7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Store.format.ps1xml" />
45814563
</Component>
@@ -4618,9 +4600,6 @@
46184600
<Component Id="cmp040AE53B216B629F70731A3F324DE5A5" Guid="*">
46194601
<File Id="filB99C1F2E3BE7968A23849AECB2BB2A82" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Management.WebSites.dll" />
46204602
</Component>
4621-
<Component Id="cmpB559FF7BECE247BF0FB2DEE533E5A820" Guid="*">
4622-
<File Id="fil4F8DE0942438BAD0C298FD8A89445201" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Storage.DataMovement.dll" />
4623-
</Component>
46244603
<Component Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" Guid="*">
46254604
<File Id="filC19927285F3206791C423E6553D4C137" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Storage.dll" />
46264605
</Component>
@@ -6364,8 +6343,6 @@
63646343
<ComponentRef Id="cmpAC5F70011A33DAC18EE39F5D5BB9840B" />
63656344
<ComponentRef Id="cmp5C3F4FE4E92F090F22B371444CEFA7FB" />
63666345
<ComponentRef Id="cmp221C334CE6510BD95538F285D482251F" />
6367-
<ComponentRef Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" />
6368-
<ComponentRef Id="cmp572CBAA060A870457B636480C182F6E3" />
63696346
<ComponentRef Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" />
63706347
<ComponentRef Id="cmpD5A2C7B5CF9A37015F3B71F2DC61EC0B" />
63716348
<ComponentRef Id="cmp33B1D8F375238B9F828BCE9F9EF759BD" />
@@ -6395,10 +6372,6 @@
63956372
<ComponentRef Id="cmp6015156A00F944A12A8D05D0ED9FFBAA" />
63966373
<ComponentRef Id="cmpD18A799B47DEC4A144D024E0784C15DC" />
63976374
<ComponentRef Id="cmpD017719071884CE7DFF67453A22683A2" />
6398-
<ComponentRef Id="cmpFAD94D1001808F6A0312DF8DF0D72A5C" />
6399-
<ComponentRef Id="cmp2103BDFB92495235F57C1975F3E23093" />
6400-
<ComponentRef Id="cmp5D2A04E733C2324A249F18F641F2F593" />
6401-
<ComponentRef Id="cmp51E42C3F30F8F7927DEB13C8A2A6436E" />
64026375
<ComponentRef Id="cmp2E468077C73CFDDC9DAE16AA2E46CCA4" />
64036376
<ComponentRef Id="cmpF0F44F9927627E08832F9007D488B28A" />
64046377
<ComponentRef Id="cmpE67D327E10F48E745B67280068880B6C" />
@@ -6413,7 +6386,6 @@
64136386
<ComponentRef Id="cmp0D7DB3D62819B7BB0DA2287E2D20B6D6" />
64146387
<ComponentRef Id="cmpA2D5C92B41BADB59D66D65AC24DB3F9E" />
64156388
<ComponentRef Id="cmp040AE53B216B629F70731A3F324DE5A5" />
6416-
<ComponentRef Id="cmpB559FF7BECE247BF0FB2DEE533E5A820" />
64176389
<ComponentRef Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" />
64186390
<ComponentRef Id="cmpA10291DA4F33CEBFB790A935E68C763C" />
64196391
<ComponentRef Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" />

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@
165165
<DesignTime>True</DesignTime>
166166
<DependentUpon>Resources.resx</DependentUpon>
167167
</Compile>
168+
<Compile Include="ResourceModel\AzureStorageBase.cs" />
169+
<Compile Include="ResourceModel\AzureStorageBlob.cs" />
170+
<Compile Include="ResourceModel\AzureStorageContainer.cs" />
171+
<Compile Include="ResourceModel\AzureStorageQueue.cs" />
172+
<Compile Include="ResourceModel\AzureStorageTable.cs" />
168173
<Compile Include="StorageClientWrapper.cs" />
169174
<Compile Include="Properties\AssemblyInfo.cs" />
170175
<Compile Include="StorageIdentity.cs" />

‎src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBase.cs renamed to ‎src/Common/Commands.Common.Storage/ResourceModel/AzureStorageBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ----------------------------------------------------------------------------------
1+
// ----------------------------------------------------------------------------------
22
//
33
// Copyright Microsoft Corporation
44
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
15+
namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
1616
{
1717
using System;
1818
using Microsoft.WindowsAzure.Commands.Common.Storage;

‎src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBlob.cs renamed to ‎src/Common/Commands.Common.Storage/ResourceModel/AzureStorageBlob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ---------------------------------------------------------------------------------
1414

15-
namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
15+
namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
1616
{
1717
using System;
1818
using Microsoft.WindowsAzure.Storage.Blob;

‎src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageContainer.cs renamed to ‎src/Common/Commands.Common.Storage/ResourceModel/AzureStorageContainer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
15+
namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
1616
{
1717
using System;
1818
using Microsoft.WindowsAzure.Storage.Blob;

‎src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageQueue.cs renamed to ‎src/Common/Commands.Common.Storage/ResourceModel/AzureStorageQueue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
15+
namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
1616
{
1717
using System;
1818
using Microsoft.WindowsAzure.Storage.Queue;

‎src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageTable.cs renamed to ‎src/Common/Commands.Common.Storage/ResourceModel/AzureStorageTable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// limitations under the License.
1313
// ---------------------------------------------------------------------------------
1414

15-
namespace Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel
15+
namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
1616
{
1717
using System;
1818
using Microsoft.WindowsAzure.Storage.Table;

‎src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/GetAzureStorageAccount.cs

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,30 @@ namespace Microsoft.Azure.Commands.Management.Storage
2222
[Cmdlet(VerbsCommon.Get, StorageAccountNounStr), OutputType(typeof(PSStorageAccount))]
2323
public class GetAzureStorageAccountCommand : StorageAccountBaseCmdlet
2424
{
25+
protected const string ResourceGroupParameterSet = "ResourceGroupParameterSet";
26+
protected const string AccountNameParameterSet = "AccountNameParameterSet";
27+
2528
[Parameter(
2629
Position = 0,
2730
Mandatory = false,
31+
ParameterSetName = ResourceGroupParameterSet,
2832
ValueFromPipelineByPropertyName = true,
29-
HelpMessage = "Resource Group StorageAccountName.")]
33+
HelpMessage = "Resource Group Name.")]
34+
[Parameter(
35+
Position = 0,
36+
Mandatory = true,
37+
ParameterSetName = AccountNameParameterSet,
38+
ValueFromPipelineByPropertyName = true,
39+
HelpMessage = "Resource Group Name.")]
3040
[ValidateNotNullOrEmpty]
3141
public string ResourceGroupName { get; set; }
3242

3343
[Parameter(
3444
Position = 1,
35-
Mandatory = false,
45+
Mandatory = true,
3646
ValueFromPipelineByPropertyName = true,
37-
HelpMessage = "Storage Account StorageAccountName.")]
47+
ParameterSetName = AccountNameParameterSet,
48+
HelpMessage = "Storage Account Name.")]
3849
[Alias(StorageAccountNameAlias, AccountNameAlias)]
3950
[ValidateNotNullOrEmpty]
4051
public string Name { get; set; }

‎src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/SetAzureRmCurrentStorageAccount.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ public class SetAzureRmCurrentStorageAccount : StorageAccountBaseCmdlet
3838
[ValidateNotNullOrEmpty]
3939
public string ResourceGroupName { get; set; }
4040

41-
[Parameter(Mandatory=true, ParameterSetName=ResourceNameParameterSet,
41+
[Parameter(Mandatory=true, ParameterSetName=ResourceNameParameterSet,
4242
ValueFromPipelineByPropertyName = true)]
43+
[Alias(StorageAccountNameAlias, AccountNameAlias)]
4344
[ValidateNotNullOrEmpty]
44-
public string StorageAccountName { get; set; }
45+
public string Name { get; set; }
4546

4647
public override void ExecuteCmdlet()
4748
{
@@ -52,7 +53,7 @@ public override void ExecuteCmdlet()
5253
}
5354
else
5455
{
55-
account = StorageUtilities.GenerateCloudStorageAccount(new ARMStorageProvider(StorageClient), ResourceGroupName, StorageAccountName);
56+
account = StorageUtilities.GenerateCloudStorageAccount(new ARMStorageProvider(StorageClient), ResourceGroupName, Name);
5657
}
5758

5859
// Clear the current storage account for both SM and RM

‎src/ResourceManager/Storage/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,23 @@ public string SubscriptionId
7878

7979
protected static AccountType ParseAccountType(string accountType)
8080
{
81-
if ("Standard_LRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
81+
if (AccountTypeString.StandardLRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
8282
{
8383
return AccountType.StandardLRS;
8484
}
85-
if ("Standard_ZRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
85+
if (AccountTypeString.StandardZRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
8686
{
8787
return AccountType.StandardZRS;
8888
}
89-
if ("Standard_GRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
89+
if (AccountTypeString.StandardGRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
9090
{
9191
return AccountType.StandardGRS;
9292
}
93-
if ("Standard_RAGRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
93+
if (AccountTypeString.StandardRAGRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
9494
{
9595
return AccountType.StandardRAGRS;
9696
}
97-
if ("Premium_LRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
97+
if (AccountTypeString.PremiumLRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
9898
{
9999
return AccountType.PremiumLRS;
100100
}

‎src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@
2121
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.11" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
24-
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />
2524
<package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
2625
</packages>

‎src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,6 @@
255255
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
256256
<Name>Commands.Common</Name>
257257
</ProjectReference>
258-
<ProjectReference Include="..\..\..\Storage\Commands.Storage\Commands.Storage.csproj">
259-
<Project>{08cf7da7-0392-4a19-b79b-e1ff67cdb81a}</Project>
260-
<Name>Commands.Storage</Name>
261-
</ProjectReference>
262258
</ItemGroup>
263259
<ItemGroup>
264260
<Content Include="Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.xml">
@@ -275,4 +271,4 @@
275271
<ItemGroup />
276272
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
277273
<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')" />
278-
</Project>
274+
</Project>

‎src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseExport.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313

1414
using System;
1515
using System.Management.Automation;
16-
using Microsoft.WindowsAzure.Commands.Common;
1716
using Microsoft.Azure.Commands.Common.Authentication.Models;
1817
using Microsoft.WindowsAzure.Commands.Common.Storage;
18+
using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
1919
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common;
2020
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport;
2121
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server;
22-
using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
2322
using Microsoft.WindowsAzure.Management.Sql;
2423
using Microsoft.WindowsAzure.Management.Sql.Models;
25-
using Microsoft.Azure.Commands.Common.Authentication;
2624

2725
namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet
2826
{

‎src/ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseImport.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313

1414
using System;
1515
using System.Management.Automation;
16-
using Microsoft.WindowsAzure.Commands.Common;
1716
using Microsoft.Azure.Commands.Common.Authentication.Models;
1817
using Microsoft.WindowsAzure.Commands.Common.Storage;
18+
using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
1919
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common;
2020
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport;
2121
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server;
22-
using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
2322
using Microsoft.WindowsAzure.Management.Sql;
2423
using Microsoft.WindowsAzure.Management.Sql.Models;
25-
using Microsoft.Azure.Commands.Common.Authentication;
2624

2725
namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet
2826
{

‎src/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ----------------------------------------------------------------------------------
1+
// ----------------------------------------------------------------------------------
22
//
33
// Copyright Microsoft Corporation
44
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,7 @@
1515
using System;
1616
using System.Linq;
1717
using Microsoft.VisualStudio.TestTools.UnitTesting;
18+
using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
1819
using Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet;
1920
using Microsoft.WindowsAzure.Commands.Storage.Common;
2021
using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;

‎src/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageContainerAclTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ----------------------------------------------------------------------------------
1+
// ----------------------------------------------------------------------------------
22
//
33
// Copyright Microsoft Corporation
44
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,9 @@
1515
using System;
1616
using System.Linq;
1717
using Microsoft.VisualStudio.TestTools.UnitTesting;
18+
using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
1819
using Microsoft.WindowsAzure.Commands.Storage.Cmdlet;
1920
using Microsoft.WindowsAzure.Commands.Storage.Common;
20-
using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
2121
using Microsoft.WindowsAzure.Storage.Blob;
2222

2323
namespace Microsoft.WindowsAzure.Commands.Storage.Test.Blob

‎src/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@
122122
<Reference Include="Microsoft.WindowsAzure.Storage">
123123
<HintPath>..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
124124
</Reference>
125-
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=5.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126-
<SpecificVersion>False</SpecificVersion>
127-
<HintPath>..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
125+
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement">
126+
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.2.0\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
127+
<Private>True</Private>
128128
</Reference>
129129
<Reference Include="Newtonsoft.Json">
130130
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

‎src/Storage/Commands.Storage.Test/Common/StorageCloudCmdletBaseTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ----------------------------------------------------------------------------------
1+
// ----------------------------------------------------------------------------------
22
//
33
// Copyright Microsoft Corporation
44
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
1616
using System.Linq;
1717
using Microsoft.VisualStudio.TestTools.UnitTesting;
1818
using Microsoft.WindowsAzure.Commands.Common.Storage;
19+
using Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel;
1920
using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
2021
using Microsoft.WindowsAzure.Commands.Storage.Common;
21-
using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
2222
using Microsoft.WindowsAzure.Storage;
2323

2424
namespace Microsoft.WindowsAzure.Commands.Storage.Test.Common

0 commit comments

Comments
 (0)