Skip to content

Commit d47ebfe

Browse files
MiYanniMiYanni
authored
Merge pull request Azure#7081 from wastoresh/oauth-preview2
[Storage] Support Oauth/StaticWeb in Powershell official release
2 parents a8d21ee + 83ba8d1 commit d47ebfe

File tree

81 files changed

+861
-129
lines changed

Some content is hidden

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

81 files changed

+861
-129
lines changed

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<ItemGroup>
3131
<PackageReference Include="AutoMapper" Version="6.2.2" />
3232
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.4-preview" />
33-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
33+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3434
</ItemGroup>
3535

3636
<ItemGroup>

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<PackageReference Include="Azure.Batch" Version="8.1.1" />
2828
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
2929
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
30-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
30+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageReference Include="Azure.Batch" Version="8.1.1" />
3232
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
3333
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.1.0" />
34-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
34+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="21.0.0" />
3333
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
3434
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
35-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
35+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

‎src/ResourceManager/Profile/Commands.Profile/packages.config

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
13-
<package id="Microsoft.Azure.PowerShell.Aks" version="1.0.94-preview" targetFramework="net452" />
14-
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.94-preview" targetFramework="net452" />
15-
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.94-preview" targetFramework="net452" />
16-
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
17-
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.94-preview" targetFramework="net452" />
18-
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.94-preview" targetFramework="net452" />
19-
<package id="Microsoft.Azure.PowerShell.Compute" version="1.0.94-preview" targetFramework="net452" />
20-
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.94-preview" targetFramework="net452" />
21-
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.94-preview" targetFramework="net452" />
22-
<package id="Microsoft.Azure.PowerShell.Network" version="1.0.94-preview" targetFramework="net452" />
23-
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
24-
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.94-preview" targetFramework="net452" />
25-
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.94-preview" targetFramework="net452" />
26-
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.94-preview" targetFramework="net452" />
27-
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.94-preview" targetFramework="net452" />
28-
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.94-preview" targetFramework="net452" />
29-
<package id="Microsoft.Azure.PowerShell.Websites" version="1.0.94-preview" targetFramework="net452" />
13+
<package id="Microsoft.Azure.PowerShell.Aks" version="1.0.96-preview" targetFramework="net452" />
14+
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
15+
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
16+
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
17+
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
18+
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
19+
<package id="Microsoft.Azure.PowerShell.Compute" version="1.0.96-preview" targetFramework="net452" />
20+
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.96-preview" targetFramework="net452" />
21+
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.96-preview" targetFramework="net452" />
22+
<package id="Microsoft.Azure.PowerShell.Network" version="1.0.96-preview" targetFramework="net452" />
23+
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
24+
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.96-preview" targetFramework="net452" />
25+
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
26+
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
27+
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
28+
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.96-preview" targetFramework="net452" />
29+
<package id="Microsoft.Azure.PowerShell.Websites" version="1.0.96-preview" targetFramework="net452" />
3030
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
3131
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
3232
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />

‎src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.0-preview" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
24-
<package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" />
24+
<package id="WindowsAzure.Storage" version="9.3.0" targetFramework="net452" />
2525
<package id="xunit" version="2.1.0" targetFramework="net45" />
2626
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
2727
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

‎src/ResourceManager/Storage/Commands.Management.Storage/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Upgrade to Azure Storage Client Library 9.3.0
2122

2223
## Version 5.0.4
2324
* Fixed issue with default resource groups not being set.

‎src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<ItemGroup>
3636
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
37-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
37+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
3838
</ItemGroup>
3939

4040
<ItemGroup>

‎src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@
6464
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\..\packages\WindowsAzure.Storage.9.0.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
69-
<Private>True</Private>
67+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\..\..\packages\WindowsAzure.Storage.9.3.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
7069
</Reference>
7170
<Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7271
<HintPath>..\..\..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>

‎src/ResourceManager/Storage/Commands.Management.Storage/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net452" />
1212
<package id="System.Net.Requests" version="4.0.11" targetFramework="net452" />
1313
<package id="System.Spatial" version="5.8.2" targetFramework="net452" />
14-
<package id="WindowsAzure.Storage" version="9.0.0" targetFramework="net452" />
14+
<package id="WindowsAzure.Storage" version="9.3.0" targetFramework="net452" />
1515
</packages>

‎src/ServiceManagement/Services/Commands.Utilities/packages.config

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.94-preview" targetFramework="net452" />
12-
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.94-preview" targetFramework="net452" />
13-
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.94-preview" targetFramework="net452" />
14-
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.94-preview" targetFramework="net452" />
15-
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.94-preview" targetFramework="net452" />
16-
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.94-preview" targetFramework="net452" />
17-
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.94-preview" targetFramework="net452" />
18-
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.94-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.96-preview" targetFramework="net452" />
12+
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.96-preview" targetFramework="net452" />
13+
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.96-preview" targetFramework="net452" />
14+
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.96-preview" targetFramework="net452" />
15+
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.96-preview" targetFramework="net452" />
16+
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.96-preview" targetFramework="net452" />
17+
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.96-preview" targetFramework="net452" />
18+
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.96-preview" targetFramework="net452" />
1919
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net452" />
2020
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
2121
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
28-
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.7.1" />
27+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
28+
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.8.1" />
2929
<PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
3030
<PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
3131
</ItemGroup>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@
5656
<Prefer32Bit>false</Prefer32Bit>
5757
</PropertyGroup>
5858
<ItemGroup>
59-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\WindowsAzure.Storage.9.0.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
59+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=9.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<HintPath>..\..\packages\WindowsAzure.Storage.9.3.0\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
63-
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.7.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.7.1\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
63+
<Reference Include="Microsoft.WindowsAzure.Storage.DataMovement, Version=0.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\..\packages\Microsoft.Azure.Storage.DataMovement.0.8.1\lib\net45\Microsoft.WindowsAzure.Storage.DataMovement.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6767
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ public void ValidateParseServicePropertiesTest()
7171
serviceProperties.DeleteRetentionPolicy = new DeleteRetentionPolicy();
7272
serviceProperties.DeleteRetentionPolicy.Enabled = true;
7373
serviceProperties.DeleteRetentionPolicy.RetentionDays = 5;
74+
serviceProperties.StaticWebsite = new StaticWebsiteProperties();
75+
serviceProperties.StaticWebsite.Enabled = true;
76+
serviceProperties.StaticWebsite.IndexDocument = "IndexDocument";
77+
serviceProperties.StaticWebsite.ErrorDocument404Path = "ErrorDocument404Path";
7478
PSSeriviceProperties pSSeriviceProperties = new PSSeriviceProperties(serviceProperties);
7579
CompareServiceProperties(pSSeriviceProperties, serviceProperties);
7680

@@ -119,6 +123,12 @@ static private void CompareServiceProperties(PSSeriviceProperties pSSeriviceProp
119123
Assert.AreEqual(serviceProperties.DeleteRetentionPolicy.Enabled, pSSeriviceProperties.DeleteRetentionPolicy.Enabled);
120124
Assert.AreEqual(serviceProperties.DeleteRetentionPolicy.RetentionDays, pSSeriviceProperties.DeleteRetentionPolicy.RetentionDays);
121125
}
126+
if ((pSSeriviceProperties != null && pSSeriviceProperties.StaticWebsite != null) || (serviceProperties != null && serviceProperties.StaticWebsite != null))
127+
{
128+
Assert.AreEqual(serviceProperties.StaticWebsite.Enabled, pSSeriviceProperties.StaticWebsite.Enabled);
129+
Assert.AreEqual(serviceProperties.StaticWebsite.IndexDocument, pSSeriviceProperties.StaticWebsite.IndexDocument);
130+
Assert.AreEqual(serviceProperties.StaticWebsite.ErrorDocument404Path, pSSeriviceProperties.StaticWebsite.ErrorDocument404Path);
131+
}
122132
}
123133

124134
/// <summary>

‎src/Storage/Commands.Storage.Test/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Storage.DataMovement" version="0.7.1" targetFramework="net452" />
8+
<package id="Microsoft.Azure.Storage.DataMovement" version="0.8.1" targetFramework="net452" />
99
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
@@ -24,7 +24,7 @@
2424
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
2525
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
2626
<package id="System.Spatial" version="5.8.2" targetFramework="net45" />
27-
<package id="WindowsAzure.Storage" version="9.0.0" targetFramework="net452" />
27+
<package id="WindowsAzure.Storage" version="9.3.0" targetFramework="net452" />
2828
<package id="xunit" version="2.1.0" targetFramework="net45" />
2929
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
3030
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ CmdletsToExport = 'Get-AzureStorageTable', 'New-AzureStorageTableSASToken',
126126
'Stop-AzureStorageBlobCopy', 'Update-AzureStorageServiceProperty',
127127
'Get-AzureStorageServiceProperty',
128128
'Enable-AzureStorageDeleteRetentionPolicy',
129-
'Disable-AzureStorageDeleteRetentionPolicy'
129+
'Disable-AzureStorageDeleteRetentionPolicy',
130+
'Enable-AzureStorageStaticWebsite',
131+
'Disable-AzureStorageStaticWebsite'
130132

131133
# Variables to export from this module
132134
# VariablesToExport = @()

‎src/Storage/Commands.Storage/Blob/StorageDataMovementCmdletBase.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Blob
2121
using System;
2222
using System.Globalization;
2323
using System.Management.Automation;
24+
using System.Threading.Tasks;
2425

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

57+
/// <summary>
58+
/// Confirm the overwrite operation
59+
/// </summary>
60+
/// <param name="msg">Confirmation message</param>
61+
/// <returns>True if the opeation is confirmed, otherwise return false</returns>
62+
protected async Task<bool> ConfirmOverwriteAsync(object source, object destination)
63+
{
64+
string overwriteMessage = string.Format(CultureInfo.CurrentCulture, Resources.OverwriteConfirmation, Util.ConvertToString(destination));
65+
return overwrite || await OutputStream.ConfirmAsync(overwriteMessage);
66+
}
67+
5668
/// <summary>
5769
/// On Task run successfully
5870
/// </summary>
@@ -78,11 +90,11 @@ protected SingleTransferContext GetTransferContext(DataMovementUserData userData
7890
transferContext.ClientRequestId = CmdletOperationContext.ClientRequestId;
7991
if (overwrite)
8092
{
81-
transferContext.ShouldOverwriteCallback = TransferContext.ForceOverwrite;
93+
transferContext.ShouldOverwriteCallbackAsync = TransferContext.ForceOverwrite;
8294
}
8395
else
8496
{
85-
transferContext.ShouldOverwriteCallback = ConfirmOverwrite;
97+
transferContext.ShouldOverwriteCallbackAsync = ConfirmOverwriteAsync;
8698
}
8799

88100
transferContext.ProgressHandler = new TransferProgressHandler((transferProgress) =>

‎src/Storage/Commands.Storage/ChangeLog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Upgrade to Azure Storage Client Library 9.3.0 and Azure Storage DataMovement Library 0.8.1
22+
* Support create Storage Context with OAuth.
23+
- New-AzureStorageContext
24+
* Support Static Website configuration
25+
- Enable-AzureStorageStaticWebsite
26+
- Disable-AzureStorageStaticWebsite
2127

2228
## Version 4.5.0
2329
* Remove the 5TB limitation for Azure File Share quota

‎src/Storage/Commands.Storage/Commands.Storage.Netcore.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
32-
<PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
33-
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.7.1" />
32+
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
33+
<PackageReference Include="Microsoft.Azure.Storage.DataMovement" Version="0.8.1" />
3434
</ItemGroup>
3535

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

75-
</Project>
75+
</Project>

0 commit comments

Comments
 (0)