Skip to content

[Storage] Support Oauth/StaticWeb in Powershell official release #7081

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
merged 12 commits into from
Sep 5, 2018
Merged

[Storage] Support Oauth/StaticWeb in Powershell official release #7081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
38ba017
[Storage] Support Oauth
blueww Aug 28, 2018
476e7f7
Upgrade XSCL tp 9.3.0 to align with storage project and make build pass
blueww Aug 29, 2018
a7afbeb
[Stroage] revert the breaking change for new-azurestoragecontext
blueww Aug 31, 2018
757a27a
Fix a merge error
blueww Aug 31, 2018
f863878
Update the Microsoft.Azure.PowerShell.Storage for XSCL upgrade
blueww Aug 31, 2018
861e5a5
Update all 1.0.94 packages to 1.0.96 with XSCL upgrade to 9.3
blueww Sep 4, 2018
c4f61ca
Update common version to 1.0.96
MiYanni Sep 4, 2018
559dd18
Merge branch 'preview' into oauth-preview2
MiYanni Sep 4, 2018
4ce8571
Additional 1.0.94 to 1.0.96 changes after preview merge
MiYanni Sep 4, 2018
4bb32a3
Add StaticWebSite Dataplane Support
blueww Jun 5, 2018
0f64f34
Update the changelog of Azure.Storage
blueww Sep 5, 2018
83ba8d1
Changes based on review comments.
MiYanni Sep 5, 2018
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
2 changes: 1 addition & 1 deletion ...esourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ItemGroup>
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.4-preview" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PackageReference Include="Azure.Batch" Version="8.1.1" />
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<PackageReference Include="Azure.Batch" Version="8.1.1" />
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
34 changes: 17 additions & 17 deletions src/ResourceManager/Profile/Commands.Profile/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Aks" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Compute" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Network" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Websites" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Aks" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Compute" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Network" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Websites" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.0-preview" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
<package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" />
<package id="WindowsAzure.Storage" version="9.3.0" targetFramework="net452" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
Expand Down
1 change: 1 addition & 0 deletions src/ResourceManager/Storage/Commands.Management.Storage/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Current Release
* Upgrade to Azure Storage Client Library 9.3.0

## Version 5.0.4
* Fixed issue with default resource groups not being set.
Expand Down
2 changes: 1 addition & 1 deletion ...rceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WindowsAzure.Storage.9.0.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
<Private>True</Private>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WindowsAzure.Storage.9.3.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
</Reference>
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Storage/Commands.Management.Storage/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net452" />
<package id="System.Net.Requests" version="4.0.11" targetFramework="net452" />
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
<package id="WindowsAzure.Storage" version="9.0.0" targetFramework="net452" />
<package id="WindowsAzure.Storage" version="9.3.0" targetFramework="net452" />
</packages>
16 changes: 8 additions & 8 deletions src/ServiceManagement/Services/Commands.Utilities/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<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.20.1-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.94-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Commands.Storage.Test/Commands.Storage.Test.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.7.1" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.8.1" />
<PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
<PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 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 @@ -56,12 +56,12 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\WindowsAzure.Storage.9.0.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\WindowsAzure.Storage.9.3.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.7.1\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.8.1\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand Down
10 changes: 10 additions & 0 deletions src/Storage/Commands.Storage.Test/Common/PSServicePropertiesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ public void ValidateParseServicePropertiesTest()
serviceProperties.DeleteRetentionPolicy = new DeleteRetentionPolicy();
serviceProperties.DeleteRetentionPolicy.Enabled = true;
serviceProperties.DeleteRetentionPolicy.RetentionDays = 5;
serviceProperties.StaticWebsite = new StaticWebsiteProperties();
serviceProperties.StaticWebsite.Enabled = true;
serviceProperties.StaticWebsite.IndexDocument = "IndexDocument";
serviceProperties.StaticWebsite.ErrorDocument404Path = "ErrorDocument404Path";
PSSeriviceProperties pSSeriviceProperties = new PSSeriviceProperties(serviceProperties);
CompareServiceProperties(pSSeriviceProperties, serviceProperties);

Expand Down Expand Up @@ -119,6 +123,12 @@ static private void CompareServiceProperties(PSSeriviceProperties pSSeriviceProp
Assert.AreEqual(serviceProperties.DeleteRetentionPolicy.Enabled, pSSeriviceProperties.DeleteRetentionPolicy.Enabled);
Assert.AreEqual(serviceProperties.DeleteRetentionPolicy.RetentionDays, pSSeriviceProperties.DeleteRetentionPolicy.RetentionDays);
}
if ((pSSeriviceProperties != null && pSSeriviceProperties.StaticWebsite != null) || (serviceProperties != null && serviceProperties.StaticWebsite != null))
{
Assert.AreEqual(serviceProperties.StaticWebsite.Enabled, pSSeriviceProperties.StaticWebsite.Enabled);
Assert.AreEqual(serviceProperties.StaticWebsite.IndexDocument, pSSeriviceProperties.StaticWebsite.IndexDocument);
Assert.AreEqual(serviceProperties.StaticWebsite.ErrorDocument404Path, pSSeriviceProperties.StaticWebsite.ErrorDocument404Path);
}
}

/// <summary>
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 @@ -5,7 +5,7 @@
<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.7.1" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.DataMovement" version="0.8.1" targetFramework="net452" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" 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 @@ -24,7 +24,7 @@
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
<package id="System.Spatial" version="5.8.2" targetFramework="net45" />
<package id="WindowsAzure.Storage" version="9.0.0" targetFramework="net452" />
<package id="WindowsAzure.Storage" version="9.3.0" targetFramework="net452" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
Expand Down
4 changes: 3 additions & 1 deletion src/Storage/Commands.Storage/Azure.Storage.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ CmdletsToExport = 'Get-AzureStorageTable', 'New-AzureStorageTableSASToken',
'Stop-AzureStorageBlobCopy', 'Update-AzureStorageServiceProperty',
'Get-AzureStorageServiceProperty',
'Enable-AzureStorageDeleteRetentionPolicy',
'Disable-AzureStorageDeleteRetentionPolicy'
'Disable-AzureStorageDeleteRetentionPolicy',
'Enable-AzureStorageStaticWebsite',
'Disable-AzureStorageStaticWebsite'

# Variables to export from this module
# VariablesToExport = @()
Expand Down
16 changes: 14 additions & 2 deletions src/Storage/Commands.Storage/Blob/StorageDataMovementCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Blob
using System;
using System.Globalization;
using System.Management.Automation;
using System.Threading.Tasks;

public class StorageDataMovementCmdletBase : StorageCloudBlobCmdletBase, IDisposable
{
Expand Down Expand Up @@ -53,6 +54,17 @@ protected bool ConfirmOverwrite(object source, object destination)
return overwrite || OutputStream.ConfirmAsync(overwriteMessage).Result;
}

/// <summary>
/// Confirm the overwrite operation
/// </summary>
/// <param name="msg">Confirmation message</param>
/// <returns>True if the opeation is confirmed, otherwise return false</returns>
protected async Task<bool> ConfirmOverwriteAsync(object source, object destination)
{
string overwriteMessage = string.Format(CultureInfo.CurrentCulture, Resources.OverwriteConfirmation, Util.ConvertToString(destination));
return overwrite || await OutputStream.ConfirmAsync(overwriteMessage);
}

/// <summary>
/// On Task run successfully
/// </summary>
Expand All @@ -78,11 +90,11 @@ protected SingleTransferContext GetTransferContext(DataMovementUserData userData
transferContext.ClientRequestId = CmdletOperationContext.ClientRequestId;
if (overwrite)
{
transferContext.ShouldOverwriteCallback = TransferContext.ForceOverwrite;
transferContext.ShouldOverwriteCallbackAsync = TransferContext.ForceOverwrite;
}
else
{
transferContext.ShouldOverwriteCallback = ConfirmOverwrite;
transferContext.ShouldOverwriteCallbackAsync = ConfirmOverwriteAsync;
}

transferContext.ProgressHandler = new TransferProgressHandler((transferProgress) =>
Expand Down
6 changes: 6 additions & 0 deletions src/Storage/Commands.Storage/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
- Additional information about change #1
-->
## Current Release
* Upgrade to Azure Storage Client Library 9.3.0 and Azure Storage DataMovement Library 0.8.1
* Support create Storage Context with OAuth.
- New-AzureStorageContext
* Support Static Website configuration
- Enable-AzureStorageStaticWebsite
- Disable-AzureStorageStaticWebsite

## Version 4.5.0
* Remove the 5TB limitation for Azure File Share quota
Expand Down
6 changes: 3 additions & 3 deletions src/Storage/Commands.Storage/Commands.Storage.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

<ItemGroup>
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.7.1" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.8.1" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -72,4 +72,4 @@
<Compile Include="$(StorageToolsPath)Adapters\WindowsAzure.Storage.8\ResourceModel\AzureStorageTable.cs" Link="Common\AzureStorageTable.cs" />
</ItemGroup>

</Project>
</Project>
Loading