Skip to content

Decouple Sql project with Storage in ASM; #1965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markcowl merged 25 commits into from
Mar 23, 2016
Merged

Decouple Sql project with Storage in ASM; #1965

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
83e7ee8
Merge branch 'dev' of https://github.com/azure/azure-powershell into …
EmmaZhu Feb 24, 2016
78b8c94
Fix the issue that there are useless syntax in file cmdlets.
EmmaZhu Feb 24, 2016
0c73afe
Add CheckMd5 option in cmdlet to download file content. If the option…
EmmaZhu Feb 24, 2016
24fe230
Merge branch 'dev' of https://github.com/wastoresh/azure-powershell i…
EmmaZhu Feb 25, 2016
0b248c3
Merge branch 'syntaxissue' into next
EmmaZhu Feb 26, 2016
3ace6df
Provide user from only specifying AccountName paramter in Get-AzureRm…
EmmaZhu Feb 29, 2016
abc8d02
Merge branch 'next' of https://github.com/wastoresh/azure-powershell-…
EmmaZhu Mar 7, 2016
b57e776
Merge branch 'dev' of https://github.com/azure/azure-powershell into dev
EmmaZhu Mar 9, 2016
d05b2ad
Fix several inconsistant issues.
EmmaZhu Mar 14, 2016
0925732
Revert change for storage account type.
EmmaZhu Mar 15, 2016
ba81733
Decouple Commands.SqlDatabase project with Commands.Storage project.
EmmaZhu Mar 16, 2016
6b1c034
Merge branch 'dev' of https://github.com/wastoresh/azure-powershell i…
EmmaZhu Mar 17, 2016
29c0914
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
EmmaZhu Mar 18, 2016
6e09d3c
Fix issue that always set value to an optional parameter of protocol …
EmmaZhu Mar 18, 2016
a16c230
Change help for behavior change of cmdlets to generate sas token.
EmmaZhu Mar 18, 2016
ea86c0f
Merge branch 'master' of https://github.com/wastoresh/azure-powershel…
EmmaZhu Mar 18, 2016
e8dc8cb
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
EmmaZhu Mar 19, 2016
edbe071
Update referenced DataMovement library to the published one.
EmmaZhu Mar 21, 2016
1671bfb
Permission of cmdlets to generate SAS token is not mandatory.
EmmaZhu Mar 21, 2016
a4f4c20
Merge branch 'master' of https://github.com/wastoresh/azure-powershel…
EmmaZhu Mar 21, 2016
3b4053b
Removing the unnecessary reference to ConfirationManager.
EmmaZhu Mar 21, 2016
c2c997e
Update Sql database help and fix storage test failure.
EmmaZhu Mar 22, 2016
cfe358a
Publish Azure.Storage module from the new output directory.
EmmaZhu Mar 22, 2016
5f27e2f
Move AzureStorage... classes to common storage project.
EmmaZhu Mar 23, 2016
6ff09fd
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
EmmaZhu Mar 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions setup/azurecmdfiles.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4397,12 +4397,6 @@
<Component Id="cmp221C334CE6510BD95538F285D482251F" Guid="*">
<File Id="fil0CA12B2E4C52E4FBA985D8D4F838390D" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Azure.psd1" />
</Component>
<Component Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" Guid="*">
<File Id="filD84EC14AB325E2924B8FFE3A4D3D018A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Azure.Storage.psd1" />
</Component>
<Component Id="cmp572CBAA060A870457B636480C182F6E3" Guid="*">
<File Id="filA870DB1BA05E5465BDE158B5DC54FD4F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\AzureStorageStartup.ps1" />
</Component>
<Component Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" Guid="*">
<File Id="filA1C13EA190ADD849F77BDADF0A1A0638" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Hyak.Common.dll" />
</Component>
Expand Down Expand Up @@ -4490,18 +4484,6 @@
<Component Id="cmpD017719071884CE7DFF67453A22683A2" Guid="*">
<File Id="filF177A73C4C606380D6125980B86E51AC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.Types.ps1xml" />
</Component>
<Component Id="cmpFAD94D1001808F6A0312DF8DF0D72A5C" Guid="*">
<File Id="fil681F19CA5C5A56909A6D04F030A002D9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.dll" />
</Component>
<Component Id="cmp2103BDFB92495235F57C1975F3E23093" Guid="*">
<File Id="filEC116C854DE0FC2BE1ABF57F5F86692C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml" />
</Component>
<Component Id="cmp5D2A04E733C2324A249F18F641F2F593" Guid="*">
<File Id="fil4F5290658A463ED8944C26B35C4E470A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml" />
</Component>
<Component Id="cmp51E42C3F30F8F7927DEB13C8A2A6436E" Guid="*">
<File Id="fil57181F99D0B643E1F08D55628508A561" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Storage.types.ps1xml" />
</Component>
<Component Id="cmp2E468077C73CFDDC9DAE16AA2E46CCA4" Guid="*">
<File Id="fil89020D4DEB7938824ABCBF4D5AAA02C7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Commands.Store.format.ps1xml" />
</Component>
Expand Down Expand Up @@ -4544,9 +4526,6 @@
<Component Id="cmp040AE53B216B629F70731A3F324DE5A5" Guid="*">
<File Id="filB99C1F2E3BE7968A23849AECB2BB2A82" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Management.WebSites.dll" />
</Component>
<Component Id="cmpB559FF7BECE247BF0FB2DEE533E5A820" Guid="*">
<File Id="fil4F8DE0942438BAD0C298FD8A89445201" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Storage.DataMovement.dll" />
</Component>
<Component Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" Guid="*">
<File Id="filC19927285F3206791C423E6553D4C137" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Microsoft.WindowsAzure.Storage.dll" />
</Component>
Expand Down Expand Up @@ -6266,8 +6245,6 @@
<ComponentRef Id="cmpAC5F70011A33DAC18EE39F5D5BB9840B" />
<ComponentRef Id="cmp5C3F4FE4E92F090F22B371444CEFA7FB" />
<ComponentRef Id="cmp221C334CE6510BD95538F285D482251F" />
<ComponentRef Id="cmp74B0B7D2461EE67BC1B2C706CD41372F" />
<ComponentRef Id="cmp572CBAA060A870457B636480C182F6E3" />
<ComponentRef Id="cmpD8BD7D4C976FE7FE527348B4E7F85B8D" />
<ComponentRef Id="cmpD5A2C7B5CF9A37015F3B71F2DC61EC0B" />
<ComponentRef Id="cmp33B1D8F375238B9F828BCE9F9EF759BD" />
Expand Down Expand Up @@ -6297,10 +6274,6 @@
<ComponentRef Id="cmp6015156A00F944A12A8D05D0ED9FFBAA" />
<ComponentRef Id="cmpD18A799B47DEC4A144D024E0784C15DC" />
<ComponentRef Id="cmpD017719071884CE7DFF67453A22683A2" />
<ComponentRef Id="cmpFAD94D1001808F6A0312DF8DF0D72A5C" />
<ComponentRef Id="cmp2103BDFB92495235F57C1975F3E23093" />
<ComponentRef Id="cmp5D2A04E733C2324A249F18F641F2F593" />
<ComponentRef Id="cmp51E42C3F30F8F7927DEB13C8A2A6436E" />
<ComponentRef Id="cmp2E468077C73CFDDC9DAE16AA2E46CCA4" />
<ComponentRef Id="cmpF0F44F9927627E08832F9007D488B28A" />
<ComponentRef Id="cmpE67D327E10F48E745B67280068880B6C" />
Expand All @@ -6315,7 +6288,6 @@
<ComponentRef Id="cmp0D7DB3D62819B7BB0DA2287E2D20B6D6" />
<ComponentRef Id="cmpA2D5C92B41BADB59D66D65AC24DB3F9E" />
<ComponentRef Id="cmp040AE53B216B629F70731A3F324DE5A5" />
<ComponentRef Id="cmpB559FF7BECE247BF0FB2DEE533E5A820" />
<ComponentRef Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" />
<ComponentRef Id="cmpA10291DA4F33CEBFB790A935E68C763C" />
<ComponentRef Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" />
Expand Down
17 changes: 14 additions & 3 deletions ...ourceManager/Storage/Commands.Management.Storage/StorageAccount/GetAzureStorageAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,30 @@ namespace Microsoft.Azure.Commands.Management.Storage
[Cmdlet(VerbsCommon.Get, StorageAccountNounStr), OutputType(typeof(PSStorageAccount))]
public class GetAzureStorageAccountCommand : StorageAccountBaseCmdlet
{
protected const string ResourceGroupParameterSet = "ResourceGroupParameterSet";
protected const string AccountNameParameterSet = "AccountNameParameterSet";

[Parameter(
Position = 0,
Mandatory = false,
ParameterSetName = ResourceGroupParameterSet,
ValueFromPipelineByPropertyName = true,
HelpMessage = "Resource Group StorageAccountName.")]
HelpMessage = "Resource Group Name.")]
[Parameter(
Position = 0,
Mandatory = true,
ParameterSetName = AccountNameParameterSet,
ValueFromPipelineByPropertyName = true,
HelpMessage = "Resource Group Name.")]
[ValidateNotNullOrEmpty]
public string ResourceGroupName { get; set; }

[Parameter(
Position = 1,
Mandatory = false,
Mandatory = true,
ValueFromPipelineByPropertyName = true,
HelpMessage = "Storage Account StorageAccountName.")]
ParameterSetName = AccountNameParameterSet,
HelpMessage = "Storage Account Name.")]
[Alias(StorageAccountNameAlias, AccountNameAlias)]
[ValidateNotNullOrEmpty]
public string Name { get; set; }
Expand Down
7 changes: 4 additions & 3 deletions ...ger/Storage/Commands.Management.Storage/StorageAccount/SetAzureRmCurrentStorageAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ public class SetAzureRmCurrentStorageAccount : StorageAccountBaseCmdlet
[ValidateNotNullOrEmpty]
public string ResourceGroupName { get; set; }

[Parameter(Mandatory=true, ParameterSetName=ResourceNameParameterSet,
[Parameter(Mandatory=true, ParameterSetName=ResourceNameParameterSet,
ValueFromPipelineByPropertyName = true)]
[Alias(StorageAccountNameAlias, AccountNameAlias)]
[ValidateNotNullOrEmpty]
public string StorageAccountName { get; set; }
public string Name { get; set; }

public override void ExecuteCmdlet()
{
Expand All @@ -52,7 +53,7 @@ public override void ExecuteCmdlet()
}
else
{
account = StorageUtilities.GenerateCloudStorageAccount(new ARMStorageProvider(StorageClient), ResourceGroupName, StorageAccountName);
account = StorageUtilities.GenerateCloudStorageAccount(new ARMStorageProvider(StorageClient), ResourceGroupName, Name);
}

// Clear the current storage account for both SM and RM
Expand Down
10 changes: 5 additions & 5 deletions ...rceManager/Storage/Commands.Management.Storage/StorageAccount/StorageAccountBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,23 @@ public string SubscriptionId

protected static AccountType ParseAccountType(string accountType)
{
if ("Standard_LRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
if (AccountTypeString.StandardLRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
{
return AccountType.StandardLRS;
}
if ("Standard_ZRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
if (AccountTypeString.StandardZRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
{
return AccountType.StandardZRS;
}
if ("Standard_GRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
if (AccountTypeString.StandardGRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
{
return AccountType.StandardGRS;
}
if ("Standard_RAGRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
if (AccountTypeString.StandardRAGRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
{
return AccountType.StandardRAGRS;
}
if ("Premium_LRS".Equals(accountType, StringComparison.OrdinalIgnoreCase))
if (AccountTypeString.PremiumLRS.Equals(accountType, StringComparison.OrdinalIgnoreCase))
{
return AccountType.PremiumLRS;
}
Expand Down
1 change: 0 additions & 1 deletion src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.11" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />
<package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
</packages>
6 changes: 1 addition & 5 deletions src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,6 @@
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
<Name>Commands.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Storage\Commands.Storage\Commands.Storage.csproj">
<Project>{08cf7da7-0392-4a19-b79b-e1ff67cdb81a}</Project>
<Name>Commands.Storage</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Microsoft.WindowsAzure.Commands.SqlDatabase.dll-Help.xml">
Expand All @@ -275,4 +271,4 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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')" />
</Project>
</Project>
21 changes: 7 additions & 14 deletions ...ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseExport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@

using System;
using System.Management.Automation;
using Microsoft.WindowsAzure.Commands.Common;
using Microsoft.Azure.Commands.Common.Authentication.Models;
using Microsoft.WindowsAzure.Commands.Common.Storage;
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common;
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport;
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server;
using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
using Microsoft.WindowsAzure.Management.Sql;
using Microsoft.WindowsAzure.Management.Sql.Models;
using Microsoft.Azure.Commands.Common.Authentication;
using Microsoft.WindowsAzure.Storage.Blob;

namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet
{
Expand Down Expand Up @@ -66,7 +64,7 @@ public class StartAzureSqlDatabaseExport : SqlDatabaseCmdletBase
ParameterSetName = ByContainerObjectParameterSet,
HelpMessage = "The Azure Storage Container to place the blob in.")]
[ValidateNotNull]
public AzureStorageContainer StorageContainer { get; set; }
public CloudBlobContainer StorageContainer { get; set; }
Copy link
Member

@markcowl markcowl Mar 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be a breaking change - I'm concerned about the differences between creating an AzureStorageConatiner and a CloudBlobContainer. Does this break any piping scenarios? What does it look like for a customer to create this parameter?

Copy link
Member Author

@EmmaZhu EmmaZhu Mar 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is. I've confirmed with Sql team and they've agreed with this change. Current, this parameter doesn't support pipeline, so the change won't break any piping scenarios. CloudBlobContainer can be got with Get-AzureStorageContainer cmdlet too, I've updated examples in help.


/// <summary>
/// Gets or sets the storage context
Expand Down Expand Up @@ -181,7 +179,7 @@ public override void ExecuteCmdlet()
try
{
// Obtain the Blob Uri and Access Key
string blobUri = null;
Uri blobUri = null;
string accessKey = null;
switch (this.ParameterSetName)
{
Expand All @@ -190,19 +188,14 @@ public override void ExecuteCmdlet()
this.StorageContext.StorageAccount.Credentials.ExportKey());

blobUri =
this.StorageContext.BlobEndPoint +
this.StorageContainerName + "/" +
this.BlobName;
this.StorageContext.StorageAccount.CreateCloudBlobClient().GetContainerReference(this.StorageContainerName).GetBlobReference(this.BlobName).SnapshotQualifiedUri;
break;

case ByContainerObjectParameterSet:
accessKey = Convert.ToBase64String(
this.StorageContainer.CloudBlobContainer.ServiceClient.Credentials.ExportKey());
this.StorageContainer.ServiceClient.Credentials.ExportKey());

blobUri =
this.StorageContainer.Context.BlobEndPoint +
this.StorageContainer.Name + "/" +
this.BlobName;
blobUri = this.StorageContainer.GetBlobReference(this.BlobName).SnapshotQualifiedUri;
break;

default:
Expand All @@ -216,7 +209,7 @@ public override void ExecuteCmdlet()
// Issue the request
ImportExportRequest context = this.ExportSqlAzureDatabaseProcess(
this.SqlConnectionContext.ServerName,
new Uri(blobUri),
blobUri,
accessKey,
fullyQualifiedServerName,
this.DatabaseName,
Expand Down
21 changes: 7 additions & 14 deletions ...ServiceManagement/Sql/Commands.SqlDatabase/Database/Cmdlet/StartAzureSqlDatabaseImport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,14 @@

using System;
using System.Management.Automation;
using Microsoft.WindowsAzure.Commands.Common;
using Microsoft.Azure.Commands.Common.Authentication.Models;
using Microsoft.WindowsAzure.Commands.Common.Storage;
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Common;
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.ImportExport;
using Microsoft.WindowsAzure.Commands.SqlDatabase.Services.Server;
using Microsoft.WindowsAzure.Commands.Storage.Model.ResourceModel;
using Microsoft.WindowsAzure.Management.Sql;
using Microsoft.WindowsAzure.Management.Sql.Models;
using Microsoft.Azure.Commands.Common.Authentication;
using Microsoft.WindowsAzure.Storage.Blob;

namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Database.Cmdlet
{
Expand Down Expand Up @@ -66,7 +64,7 @@ public class StartAzureSqlDatabaseImport : SqlDatabaseCmdletBase
ParameterSetName = ByContainerObjectParameterSet,
HelpMessage = "The Azure Storage Container to place the blob in.")]
[ValidateNotNull]
public AzureStorageContainer StorageContainer { get; set; }
public CloudBlobContainer StorageContainer { get; set; }
Copy link
Member

@markcowl markcowl Mar 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be a breaking change for this cmdlet. What are the differences in creating a CloudBlobContainer versus an AzureStorageContainer?

Copy link
Member Author

@EmmaZhu EmmaZhu Mar 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is. I've confirmed with Sql team and they've agreed with this change. Current, this parameter doesn't support pipeline, so the change won't break any piping scenarios. CloudBlobContainer can be got with Get-AzureStorageContainer cmdlet too, I've updated examples in help.


/// <summary>
/// Gets or sets the storage context
Expand Down Expand Up @@ -202,7 +200,7 @@ public override void ExecuteCmdlet()
try
{
// Obtain the Blob Uri and Access Key
string blobUri = null;
Uri blobUri = null;
string accessKey = null;
switch (this.ParameterSetName)
{
Expand All @@ -212,20 +210,15 @@ public override void ExecuteCmdlet()
this.StorageContext.StorageAccount.Credentials.ExportKey());

blobUri =
this.StorageContext.BlobEndPoint +
this.StorageContainerName + "/" +
this.BlobName;
this.StorageContext.StorageAccount.CreateCloudBlobClient().GetContainerReference(this.StorageContainerName).GetBlobReference(this.BlobName).SnapshotQualifiedUri;
break;

case ByContainerObjectParameterSet:
accessKey =
System.Convert.ToBase64String(
this.StorageContainer.CloudBlobContainer.ServiceClient.Credentials.ExportKey());
this.StorageContainer.ServiceClient.Credentials.ExportKey());

blobUri =
this.StorageContainer.Context.BlobEndPoint +
this.StorageContainer.Name + "/" +
this.BlobName;
blobUri = this.StorageContainer.GetBlobReference(this.BlobName).SnapshotQualifiedUri;
break;

default:
Expand All @@ -239,7 +232,7 @@ public override void ExecuteCmdlet()
// Issue the request
ImportExportRequest context = this.ImportSqlAzureDatabaseProcess(
this.SqlConnectionContext.ServerName,
new Uri(blobUri),
blobUri,
accessKey,
fullyQualifiedServerName,
this.DatabaseName,
Expand Down
6 changes: 3 additions & 3 deletions src/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@
<Reference Include="Microsoft.WindowsAzure.Storage">
<HintPath>..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=5.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement">
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.2.0\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Commands.Storage.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<packages>
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />

<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Storage.DataMovement" version="0.2.0" targetFramework="net45" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5896.19355-prerelease" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
Expand All @@ -29,4 +29,4 @@
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
</packages>
</packages>
Loading