From e282839154634b7aa81b062384671b6ad21014ea Mon Sep 17 00:00:00 2001 From: Wei Wei Date: Sat, 9 May 2020 18:08:50 +0800 Subject: [PATCH 1/2] [Storage] Update get copy status cmdlet output type in help --- .../Storage.Management/help/Get-AzStorageBlobCopyState.md | 2 +- .../Storage.Management/help/Get-AzStorageFileCopyState.md | 2 +- .../Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs | 2 +- .../Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Storage/Storage.Management/help/Get-AzStorageBlobCopyState.md b/src/Storage/Storage.Management/help/Get-AzStorageBlobCopyState.md index b1ba5935de83..e449f237928b 100644 --- a/src/Storage/Storage.Management/help/Get-AzStorageBlobCopyState.md +++ b/src/Storage/Storage.Management/help/Get-AzStorageBlobCopyState.md @@ -252,7 +252,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable ## OUTPUTS -### Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.AzureStorageBlob +### Microsoft.Azure.Storage.Blob.CopyState ## NOTES diff --git a/src/Storage/Storage.Management/help/Get-AzStorageFileCopyState.md b/src/Storage/Storage.Management/help/Get-AzStorageFileCopyState.md index d48991aac996..f181b9c39663 100644 --- a/src/Storage/Storage.Management/help/Get-AzStorageFileCopyState.md +++ b/src/Storage/Storage.Management/help/Get-AzStorageFileCopyState.md @@ -207,7 +207,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable ## OUTPUTS -### Microsoft.Azure.Storage.File.CloudFile +### Microsoft.Azure.Storage.File.CopyState ## NOTES diff --git a/src/Storage/Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs b/src/Storage/Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs index 21e088582e64..126598d4f1f3 100644 --- a/src/Storage/Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs +++ b/src/Storage/Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs @@ -25,7 +25,7 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet using System.Threading; using System.Threading.Tasks; - [Cmdlet("Get", Azure.Commands.ResourceManager.Common.AzureRMConstants.AzurePrefix + "StorageBlobCopyState", DefaultParameterSetName = NameParameterSet),OutputType(typeof(AzureStorageBlob))] + [Cmdlet("Get", Azure.Commands.ResourceManager.Common.AzureRMConstants.AzurePrefix + "StorageBlobCopyState", DefaultParameterSetName = NameParameterSet),OutputType(typeof(CopyState))] public class GetAzureStorageBlobCopyState : StorageCloudBlobCmdletBase { /// diff --git a/src/Storage/Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs b/src/Storage/Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs index 34febcfdeea4..8dc03ec2d4cf 100644 --- a/src/Storage/Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs +++ b/src/Storage/Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs @@ -13,7 +13,6 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Storage; -using Microsoft.Azure.Storage.Blob; using XFile = Microsoft.Azure.Storage.File; using Microsoft.Azure.Storage.File; using System; @@ -27,8 +26,7 @@ namespace Microsoft.WindowsAzure.Commands.Storage.File.Cmdlet { [Cmdlet("Get", Azure.Commands.ResourceManager.Common.AzureRMConstants.AzurePrefix + "StorageFileCopyState")] - [OutputType(typeof(CloudFile))] - [CmdletOutputBreakingChange(typeof(CloudFile), ChangeDescription = "The output type will change from CloudFile to ShareFileCopyInfo in a future release.")] + [OutputType(typeof(CopyState))] public class GetAzureStorageFileCopyStateCommand : AzureStorageFileCmdletBase { [Parameter( From de9e971aeefa2ad4a0071bf509f333cf95b2ef8d Mon Sep 17 00:00:00 2001 From: Wei Wei Date: Mon, 11 May 2020 17:16:32 +0800 Subject: [PATCH 2/2] fix CI failure --- .../Exceptions/Az.Storage/BreakingChangeIssues.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv b/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv index 8bc25b2baace..ea11387ee74c 100644 --- a/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv +++ b/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv @@ -166,3 +166,4 @@ "Microsoft.Azure.PowerShell.Cmdlets.Storage.dll","Microsoft.WindowsAzure.Commands.Storage.Table.Cmdlet.GetAzureStorageTableCommand","Get-AzStorageTable","0","3010","The property 'ConnectionPolicy' of type 'Microsoft.Azure.Cosmos.Table.CloudTableClient' has been removed.","Add the property 'ConnectionPolicy' back to type 'Microsoft.Azure.Cosmos.Table.CloudTableClient'." "Microsoft.Azure.PowerShell.Cmdlets.Storage.dll","Microsoft.WindowsAzure.Commands.Storage.Table.Cmdlet.GetAzureStorageTableCommand","Get-AzStorageTable","0","3010","The property 'ConsistencyLevel' of type 'Microsoft.Azure.Cosmos.Table.CloudTableClient' has been removed.","Add the property 'ConsistencyLevel' back to type 'Microsoft.Azure.Cosmos.Table.CloudTableClient'." "Microsoft.Azure.PowerShell.Cmdlets.Storage.dll","Microsoft.WindowsAzure.Commands.Storage.File.Cmdlet.SetAzureStorageShareQuota","Set-AzStorageShareQuota","0","1020","The cmdlet 'Set-AzStorageShareQuota' no longer has output type 'Microsoft.Azure.Storage.File.FileShareProperties'.","Make cmdlet 'Set-AzStorageShareQuota' return type 'Microsoft.Azure.Storage.File.FileShareProperties'." +"Microsoft.Azure.PowerShell.Cmdlets.Storage.dll","Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet.GetAzureStorageBlobCopyState","Get-AzStorageBlobCopyState","0","1020","The cmdlet 'Get-AzStorageBlobCopyState' no longer has output type 'Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.AzureStorageBlob'.","Make cmdlet 'Get-AzStorageBlobCopyState' return type 'Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.AzureStorageBlob'."