From f6d0d8cb3f6ee60862098fc2660048d90881ad55 Mon Sep 17 00:00:00 2001 From: Theodore Chang Date: Tue, 30 Aug 2022 00:40:11 -0400 Subject: [PATCH] Update Compute SDK Package (#19352) * Fix ps730previewbug (#19351) * update sdk package * suppress breaking change Co-authored-by: Theodore Chang * Update src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj Co-authored-by: Theodore Chang Co-authored-by: Yeming Liu <11371776+isra-fel@users.noreply.github.com> --- src/Compute/Compute.Test/Compute.Test.csproj | 2 +- src/Compute/Compute/Compute.csproj | 2 +- .../NewAzureRmDiskEncryptionSetConfigCommand.cs | 6 +++--- .../DiskEncryptionSetUpdateMethod.cs | 12 ++++++------ .../Config/NewAzureRmVmssConfigCommand.cs | 4 ++-- .../VirtualMachineScaleSetUpdateMethod.cs | 8 ++++---- .../VirtualMachineScaleSetCreateOrUpdateMethod.cs | 4 ++-- .../VirtualMachine/Config/NewAzureVMConfigCommand.cs | 4 ++-- .../VirtualMachine/Operation/NewAzureVMCommand.cs | 4 ++-- .../VirtualMachine/Operation/UpdateAzureVMCommand.cs | 4 ++-- src/Network/Network.Test/Network.Test.csproj | 2 +- .../RecoveryServices.Backup.Test.csproj | 2 +- .../RecoveryServices.SiteRecovery.Test.csproj | 5 +++-- src/Security/Security.Test/Security.Test.csproj | 2 +- .../SqlVirtualMachine.Test.csproj | 2 +- .../Exceptions/Az.Compute/BreakingChangeIssues.csv | 6 +++++- 16 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/Compute/Compute.Test/Compute.Test.csproj b/src/Compute/Compute.Test/Compute.Test.csproj index 70b9eca20dee..e7c01a0c6dd2 100644 --- a/src/Compute/Compute.Test/Compute.Test.csproj +++ b/src/Compute/Compute.Test/Compute.Test.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Compute/Compute/Compute.csproj b/src/Compute/Compute/Compute.csproj index 2b692f98a093..f83be0febace 100644 --- a/src/Compute/Compute/Compute.csproj +++ b/src/Compute/Compute/Compute.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Compute/Compute/Generated/DiskEncryptionSet/Config/NewAzureRmDiskEncryptionSetConfigCommand.cs b/src/Compute/Compute/Generated/DiskEncryptionSet/Config/NewAzureRmDiskEncryptionSetConfigCommand.cs index b4a859295bd5..91fce7c787f5 100644 --- a/src/Compute/Compute/Generated/DiskEncryptionSet/Config/NewAzureRmDiskEncryptionSetConfigCommand.cs +++ b/src/Compute/Compute/Generated/DiskEncryptionSet/Config/NewAzureRmDiskEncryptionSetConfigCommand.cs @@ -146,20 +146,20 @@ private void Run() } if (vIdentity.UserAssignedIdentities == null) { - vIdentity.UserAssignedIdentities = new Dictionary(); + vIdentity.UserAssignedIdentities = new Dictionary(); } foreach (DictionaryEntry de in this.UserAssignedIdentity) { if (((Hashtable)de.Value).Count == 0) { - vIdentity.UserAssignedIdentities.Add(de.Key.ToString(), new EncryptionSetIdentityUserAssignedIdentitiesValue()); + vIdentity.UserAssignedIdentities.Add(de.Key.ToString(), new UserAssignedIdentitiesValue()); } else { string principalId = ((Hashtable)de.Value)["principalId"]?.ToString(); string clientId = ((Hashtable)de.Value)["clientId"]?.ToString(); - vIdentity.UserAssignedIdentities.Add(de.Key.ToString(), new EncryptionSetIdentityUserAssignedIdentitiesValue(principalId, clientId)); + vIdentity.UserAssignedIdentities.Add(de.Key.ToString(), new UserAssignedIdentitiesValue(principalId, clientId)); } } } diff --git a/src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs b/src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs index 2ea4c589e058..6aa2e881e453 100644 --- a/src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs +++ b/src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs @@ -209,20 +209,20 @@ private void BuildPatchObject() } if (this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities == null) { - this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities = new Dictionary(); + this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities = new Dictionary(); } foreach (DictionaryEntry de in this.UserAssignedIdentity) { if (((Hashtable)de.Value).Count == 0) { - this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities.Add(de.Key.ToString(), new EncryptionSetIdentityUserAssignedIdentitiesValue()); + this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities.Add(de.Key.ToString(), new UserAssignedIdentitiesValue()); } else { string principalId = ((Hashtable)de.Value)["principalId"]?.ToString(); string clientId = ((Hashtable)de.Value)["clientId"]?.ToString(); - this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities.Add(de.Key.ToString(), new EncryptionSetIdentityUserAssignedIdentitiesValue(principalId, clientId)); + this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities.Add(de.Key.ToString(), new UserAssignedIdentitiesValue(principalId, clientId)); } } } @@ -275,20 +275,20 @@ private void BuildPutObject() } if (this.InputObject.Identity.UserAssignedIdentities == null) { - this.InputObject.Identity.UserAssignedIdentities = new Dictionary(); + this.InputObject.Identity.UserAssignedIdentities = new Dictionary(); } foreach (DictionaryEntry de in this.UserAssignedIdentity) { if (((Hashtable)de.Value).Count == 0) { - this.InputObject.Identity.UserAssignedIdentities.Add(de.Key.ToString(), new EncryptionSetIdentityUserAssignedIdentitiesValue()); + this.InputObject.Identity.UserAssignedIdentities.Add(de.Key.ToString(), new UserAssignedIdentitiesValue()); } else { string principalId = ((Hashtable)de.Value)["principalId"]?.ToString(); string clientId = ((Hashtable)de.Value)["clientId"]?.ToString(); - this.InputObject.Identity.UserAssignedIdentities.Add(de.Key.ToString(), new EncryptionSetIdentityUserAssignedIdentitiesValue(principalId, clientId)); + this.InputObject.Identity.UserAssignedIdentities.Add(de.Key.ToString(), new UserAssignedIdentitiesValue(principalId, clientId)); } } } diff --git a/src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs b/src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs index fb35adc9cf79..028945de7a8f 100644 --- a/src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs +++ b/src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs @@ -674,11 +674,11 @@ private void Run() vIdentity = new VirtualMachineScaleSetIdentity(); } - vIdentity.UserAssignedIdentities = new Dictionary(); + vIdentity.UserAssignedIdentities = new Dictionary(); foreach (var id in this.IdentityId) { - vIdentity.UserAssignedIdentities.Add(id, new VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue()); + vIdentity.UserAssignedIdentities.Add(id, new UserAssignedIdentitiesValue()); } } diff --git a/src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs b/src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs index e176ba946e7e..1952943f7b22 100644 --- a/src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs +++ b/src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs @@ -533,13 +533,13 @@ private void BuildPatchObject() this.VirtualMachineScaleSetUpdate.Identity = new VirtualMachineScaleSetIdentity(); } - this.VirtualMachineScaleSetUpdate.Identity.UserAssignedIdentities = new Dictionary(); + this.VirtualMachineScaleSetUpdate.Identity.UserAssignedIdentities = new Dictionary(); foreach (var id in this.IdentityId) { if (!this.VirtualMachineScaleSetUpdate.Identity.UserAssignedIdentities.ContainsKey(id)) { - this.VirtualMachineScaleSetUpdate.Identity.UserAssignedIdentities.Add(id, new VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue()); + this.VirtualMachineScaleSetUpdate.Identity.UserAssignedIdentities.Add(id, new UserAssignedIdentitiesValue()); } } } @@ -1363,13 +1363,13 @@ private void BuildPutObject() this.VirtualMachineScaleSet.Identity = new VirtualMachineScaleSetIdentity(); } - this.VirtualMachineScaleSet.Identity.UserAssignedIdentities = new Dictionary(); + this.VirtualMachineScaleSet.Identity.UserAssignedIdentities = new Dictionary(); foreach (var id in this.IdentityId) { if (!this.VirtualMachineScaleSet.Identity.UserAssignedIdentities.ContainsKey(id)) { - this.VirtualMachineScaleSet.Identity.UserAssignedIdentities.Add(id, new VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue()); + this.VirtualMachineScaleSet.Identity.UserAssignedIdentities.Add(id, new UserAssignedIdentitiesValue()); } } } diff --git a/src/Compute/Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs b/src/Compute/Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs index a7da57675373..98f09e19a526 100644 --- a/src/Compute/Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs +++ b/src/Compute/Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs @@ -629,9 +629,9 @@ private VirtualMachineScaleSetIdentity GetVmssIdentityFromArgs() ResourceIdentityType.SystemAssigned : (SystemAssignedIdentity.IsPresent ? ResourceIdentityType.SystemAssignedUserAssigned : ResourceIdentityType.UserAssigned), UserAssignedIdentities = isUserAssignedEnabled - ? new Dictionary() + ? new Dictionary() { - { UserAssignedIdentity, new VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue()} + { UserAssignedIdentity, new UserAssignedIdentitiesValue()} } : null, } diff --git a/src/Compute/Compute/VirtualMachine/Config/NewAzureVMConfigCommand.cs b/src/Compute/Compute/VirtualMachine/Config/NewAzureVMConfigCommand.cs index 52e7112feb43..f7fdab12f73a 100644 --- a/src/Compute/Compute/VirtualMachine/Config/NewAzureVMConfigCommand.cs +++ b/src/Compute/Compute/VirtualMachine/Config/NewAzureVMConfigCommand.cs @@ -208,11 +208,11 @@ public override void ExecuteCmdlet() vm.Identity = new VirtualMachineIdentity(); } - vm.Identity.UserAssignedIdentities = new Dictionary(); + vm.Identity.UserAssignedIdentities = new Dictionary(); foreach (var id in this.IdentityId) { - vm.Identity.UserAssignedIdentities.Add(id, new VirtualMachineIdentityUserAssignedIdentitiesValue()); + vm.Identity.UserAssignedIdentities.Add(id, new UserAssignedIdentitiesValue()); } } diff --git a/src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs b/src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs index b04f79879987..112036a4970e 100644 --- a/src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs +++ b/src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs @@ -1028,9 +1028,9 @@ private VirtualMachineIdentity GetVMIdentityFromArgs() (SystemAssignedIdentity.IsPresent ? CM.ResourceIdentityType.SystemAssignedUserAssigned : CM.ResourceIdentityType.UserAssigned), UserAssignedIdentities = isUserAssignedEnabled - ? new Dictionary() + ? new Dictionary() { - { UserAssignedIdentity, new VirtualMachineIdentityUserAssignedIdentitiesValue() } + { UserAssignedIdentity, new UserAssignedIdentitiesValue() } } : null, } diff --git a/src/Compute/Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs b/src/Compute/Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs index f7af344bd089..3e4bfe8f56f4 100644 --- a/src/Compute/Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs +++ b/src/Compute/Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs @@ -235,11 +235,11 @@ public override void ExecuteCmdlet() } - parameters.Identity.UserAssignedIdentities = new Dictionary(); + parameters.Identity.UserAssignedIdentities = new Dictionary(); foreach (var id in this.IdentityId) { - parameters.Identity.UserAssignedIdentities.Add(id, new VirtualMachineIdentityUserAssignedIdentitiesValue()); + parameters.Identity.UserAssignedIdentities.Add(id, new UserAssignedIdentitiesValue()); } } diff --git a/src/Network/Network.Test/Network.Test.csproj b/src/Network/Network.Test/Network.Test.csproj index 5c7d2e5959b6..75cba064a295 100644 --- a/src/Network/Network.Test/Network.Test.csproj +++ b/src/Network/Network.Test/Network.Test.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj b/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj index e13f48f7a8a8..f47fa3fdefbc 100644 --- a/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj +++ b/src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj index 617505b3b37b..eb0afd50363b 100644 --- a/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj +++ b/src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj @@ -13,8 +13,9 @@ - - + + + diff --git a/src/Security/Security.Test/Security.Test.csproj b/src/Security/Security.Test/Security.Test.csproj index a6b57a9ceeb2..da20aca627d4 100644 --- a/src/Security/Security.Test/Security.Test.csproj +++ b/src/Security/Security.Test/Security.Test.csproj @@ -42,7 +42,7 @@ Always - + \ No newline at end of file diff --git a/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj b/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj index 7f626ac7cdeb..5b4590a62d6d 100644 --- a/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj +++ b/src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj @@ -16,7 +16,7 @@ - + diff --git a/tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv b/tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv index 2b670377166b..38b344a0bfbc 100644 --- a/tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv +++ b/tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv @@ -25,4 +25,8 @@ "Az.Compute","Get-AzVMRunCommand","Get-AzVMRunCommand","0","1050","The parameter set '__AllParameterSets' for cmdlet 'Get-AzVMRunCommand' has been removed.","Add parameter set '__AllParameterSets' back to cmdlet 'Get-AzVMRunCommand'." "Az.Compute","Get-AzVMRunCommand","Get-AzVMRunCommand","0","1020","The cmdlet 'Get-AzVMRunCommand' no longer has output type 'Microsoft.Azure.PowerShell.Cmdlets.Compute.Models.Api20210701.IRunCommandDocument'.","Make cmdlet 'Get-AzVMRunCommand' return type 'Microsoft.Azure.PowerShell.Cmdlets.Compute.Models.Api20210701.IRunCommandDocument'." "Az.Compute","Get-AzVMRunCommand","Get-AzVMRunCommand","0","1020","The cmdlet 'Get-AzVMRunCommand' no longer has output type 'Microsoft.Azure.PowerShell.Cmdlets.Compute.Models.Api20210701.IVirtualMachineRunCommand'.","Make cmdlet 'Get-AzVMRunCommand' return type 'Microsoft.Azure.PowerShell.Cmdlets.Compute.Models.Api20210701.IVirtualMachineRunCommand'." -"Az.Compute","Get-AzVMRunCommand","Get-AzVMRunCommand","0","1020","The cmdlet 'Get-AzVMRunCommand' no longer has output type 'Microsoft.Azure.PowerShell.Cmdlets.Compute.Models.Api20210701.IRunCommandDocumentBase'.","Make cmdlet 'Get-AzVMRunCommand' return type 'Microsoft.Azure.PowerShell.Cmdlets.Compute.Models.Api20210701.IRunCommandDocumentBase'." \ No newline at end of file +"Az.Compute","Get-AzVMRunCommand","Get-AzVMRunCommand","0","1020","The cmdlet 'Get-AzVMRunCommand' no longer has output type 'Microsoft.Azure.PowerShell.Cmdlets.Compute.Models.Api20210701.IRunCommandDocumentBase'.","Make cmdlet 'Get-AzVMRunCommand' return type 'Microsoft.Azure.PowerShell.Cmdlets.Compute.Models.Api20210701.IRunCommandDocumentBase'." +"Az.Compute","Microsoft.Azure.Commands.Compute.UpdateAzureVMCommand","Update-AzVM","0","2090","The ValidateNotNullOrEmpty attribute has been added to parameter 'IdentityId' for cmdlet 'Update-AzVM'.","Remove the ValidateNotNullOrEmpty attribute from parameter 'IdentityId'." +"Az.Compute","Microsoft.Azure.Commands.Compute.NewAzureAdditionalUnattendContentCommand","Add-AzVMAdditionalUnattendContent","0","3030","The generic type for 'property UserAssignedIdentities' has been changed from 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.VirtualMachineIdentityUserAssignedIdentitiesValue]' to 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.UserAssignedIdentitiesValue]'. ","Change the generic type for 'property UserAssignedIdentities' back to 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.VirtualMachineIdentityUserAssignedIdentitiesValue]'." +"Az.Compute","Microsoft.Azure.Commands.Compute.Automation.AddAzureRmVmssAdditionalUnattendContentCommand","Add-AzVmssAdditionalUnattendContent","0","3030","The generic type for 'property UserAssignedIdentities' has been changed from 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue]' to 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.UserAssignedIdentitiesValue]'. ","Change the generic type for 'property UserAssignedIdentities' back to 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue]'." +"Az.Compute","Microsoft.Azure.Commands.Compute.Automation.GetAzureRmDiskEncryptionSet","Get-AzDiskEncryptionSet","0","3030","The generic type for 'property UserAssignedIdentities' has been changed from 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.EncryptionSetIdentityUserAssignedIdentitiesValue]' to 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.UserAssignedIdentitiesValue]'. ","Change the generic type for 'property UserAssignedIdentities' back to 'System.Collections.Generic.IDictionary`2[System.String,Microsoft.Azure.Management.Compute.Models.EncryptionSetIdentityUserAssignedIdentitiesValue]'." \ No newline at end of file