Skip to content

Commit

Permalink
Update Compute SDK Package (#19352)
Browse files Browse the repository at this point in the history 
* Fix ps730previewbug (#19351)

* update sdk package

* suppress breaking change

Co-authored-by: Theodore Chang <theodore.l.chang@gmail.com>

* Update src/RecoveryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj

Co-authored-by: Theodore Chang <theodore.l.chang@gmail.com>
Co-authored-by: Yeming Liu <11371776+isra-fel@users.noreply.github.com>
  • Loading branch information
@grizzlytheodore @isra-fel
3 people authored Aug 30, 2022
1 parent b173372 commit f6d0d8c
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 32 deletions.
2 changes: 1 addition & 1 deletion src/Compute/Compute.Test/Compute.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="56.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="57.0.0" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="4.0.0-preview.1" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="23.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Compute/Compute/Compute.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="56.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="57.0.0" />
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
Expand Down
6 changes: 3 additions & 3 deletions ...te/Compute/Generated/DiskEncryptionSet/Config/NewAzureRmDiskEncryptionSetConfigCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,20 @@ private void Run()
}
if (vIdentity.UserAssignedIdentities == null)
{
vIdentity.UserAssignedIdentities = new Dictionary<string, EncryptionSetIdentityUserAssignedIdentitiesValue>();
vIdentity.UserAssignedIdentities = new Dictionary<string, UserAssignedIdentitiesValue>();
}

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));
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/Compute/Compute/Generated/DiskEncryptionSet/DiskEncryptionSetUpdateMethod.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,20 +209,20 @@ private void BuildPatchObject()
}
if (this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities == null)
{
this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities = new Dictionary<string, EncryptionSetIdentityUserAssignedIdentitiesValue>();
this.DiskEncryptionSetUpdate.Identity.UserAssignedIdentities = new Dictionary<string, UserAssignedIdentitiesValue>();
}

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));
}
}
}
Expand Down Expand Up @@ -275,20 +275,20 @@ private void BuildPutObject()
}
if (this.InputObject.Identity.UserAssignedIdentities == null)
{
this.InputObject.Identity.UserAssignedIdentities = new Dictionary<string, EncryptionSetIdentityUserAssignedIdentitiesValue>();
this.InputObject.Identity.UserAssignedIdentities = new Dictionary<string, UserAssignedIdentitiesValue>();
}

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));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,11 +674,11 @@ private void Run()
vIdentity = new VirtualMachineScaleSetIdentity();
}

vIdentity.UserAssignedIdentities = new Dictionary<string, VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue>();
vIdentity.UserAssignedIdentities = new Dictionary<string, UserAssignedIdentitiesValue>();

foreach (var id in this.IdentityId)
{
vIdentity.UserAssignedIdentities.Add(id, new VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue());
vIdentity.UserAssignedIdentities.Add(id, new UserAssignedIdentitiesValue());
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/Compute/Compute/Generated/VirtualMachineScaleSet/VirtualMachineScaleSetUpdateMethod.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,13 @@ private void BuildPatchObject()
this.VirtualMachineScaleSetUpdate.Identity = new VirtualMachineScaleSetIdentity();
}

this.VirtualMachineScaleSetUpdate.Identity.UserAssignedIdentities = new Dictionary<string, VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue>();
this.VirtualMachineScaleSetUpdate.Identity.UserAssignedIdentities = new Dictionary<string, UserAssignedIdentitiesValue>();

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());
}
}
}
Expand Down Expand Up @@ -1363,13 +1363,13 @@ private void BuildPutObject()
this.VirtualMachineScaleSet.Identity = new VirtualMachineScaleSetIdentity();
}

this.VirtualMachineScaleSet.Identity.UserAssignedIdentities = new Dictionary<string, VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue>();
this.VirtualMachineScaleSet.Identity.UserAssignedIdentities = new Dictionary<string, UserAssignedIdentitiesValue>();

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());
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Compute/Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,9 +629,9 @@ private VirtualMachineScaleSetIdentity GetVmssIdentityFromArgs()
ResourceIdentityType.SystemAssigned :
(SystemAssignedIdentity.IsPresent ? ResourceIdentityType.SystemAssignedUserAssigned : ResourceIdentityType.UserAssigned),
UserAssignedIdentities = isUserAssignedEnabled
? new Dictionary<string, VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue>()
? new Dictionary<string, UserAssignedIdentitiesValue>()
{
{ UserAssignedIdentity, new VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue()}
{ UserAssignedIdentity, new UserAssignedIdentitiesValue()}
}
: null,
}
Expand Down
4 changes: 2 additions & 2 deletions src/Compute/Compute/VirtualMachine/Config/NewAzureVMConfigCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,11 @@ public override void ExecuteCmdlet()
vm.Identity = new VirtualMachineIdentity();
}

vm.Identity.UserAssignedIdentities = new Dictionary<string, VirtualMachineIdentityUserAssignedIdentitiesValue>();
vm.Identity.UserAssignedIdentities = new Dictionary<string, UserAssignedIdentitiesValue>();

foreach (var id in this.IdentityId)
{
vm.Identity.UserAssignedIdentities.Add(id, new VirtualMachineIdentityUserAssignedIdentitiesValue());
vm.Identity.UserAssignedIdentities.Add(id, new UserAssignedIdentitiesValue());
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Compute/Compute/VirtualMachine/Operation/NewAzureVMCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,9 +1028,9 @@ private VirtualMachineIdentity GetVMIdentityFromArgs()
(SystemAssignedIdentity.IsPresent ? CM.ResourceIdentityType.SystemAssignedUserAssigned : CM.ResourceIdentityType.UserAssigned),

UserAssignedIdentities = isUserAssignedEnabled
? new Dictionary<string, VirtualMachineIdentityUserAssignedIdentitiesValue>()
? new Dictionary<string, UserAssignedIdentitiesValue>()
{
{ UserAssignedIdentity, new VirtualMachineIdentityUserAssignedIdentitiesValue() }
{ UserAssignedIdentity, new UserAssignedIdentitiesValue() }
}
: null,
}
Expand Down
4 changes: 2 additions & 2 deletions src/Compute/Compute/VirtualMachine/Operation/UpdateAzureVMCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ public override void ExecuteCmdlet()
}
parameters.Identity.UserAssignedIdentities = new Dictionary<string, VirtualMachineIdentityUserAssignedIdentitiesValue>();
parameters.Identity.UserAssignedIdentities = new Dictionary<string, UserAssignedIdentitiesValue>();
foreach (var id in this.IdentityId)
{
parameters.Identity.UserAssignedIdentities.Add(id, new VirtualMachineIdentityUserAssignedIdentitiesValue());
parameters.Identity.UserAssignedIdentities.Add(id, new UserAssignedIdentitiesValue());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Network.Test/Network.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="4.0.0-preview.1" />
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="56.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="57.0.0" />
<PackageReference Include="Microsoft.Azure.Management.PrivateDns" Version="1.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Redis" Version="4.4.1" />
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.25.0-preview" />
Expand Down
2 changes: 1 addition & 1 deletion src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Network" Version="23.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="56.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="57.0.0" />
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.3-preview" />
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="5.0.0-preview" />
</ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions ...veryServices/RecoveryServices.SiteRecovery.Test/RecoveryServices.SiteRecovery.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.3-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="23.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="56.0.0" />
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="5.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="57.0.0" />
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.3.3-preview" />
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="5.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.3.0" />
<PackageReference Include="Microsoft.Azure.Management.RecoveryServices.SiteRecovery" Version="2.2.0-preview" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Security/Security.Test/Security.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<PackageReference Include="Microsoft.Azure.Management.SecurityCenter" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="56.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="57.0.0" />
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.25.0-preview" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/SqlVirtualMachine/SqlVirtualMachine.Test/SqlVirtualMachine.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Network" Version="23.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="56.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="57.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.1.0" />
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.3-preview" />
</ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion tools/StaticAnalysis/Exceptions/Az.Compute/BreakingChangeIssues.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'."
"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]'."

0 comments on commit f6d0d8c

Please sign in to comment.