Azure · markcowl · Dec 10, 2018 · Dec 8, 2018
diff --git a/...anager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetProfileTests.ps1 b/...anager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetProfileTests.ps1
@@ -113,8 +113,6 @@ function Test-VirtualMachineScaleSetProfile
     Assert-AreEqual 2 $vmss.Identity.UserAssignedIdentities.Keys.Count;
     Assert-True { $vmss.Identity.UserAssignedIdentities.ContainsKey($newUserId1) };
     Assert-True { $vmss.Identity.UserAssignedIdentities.ContainsKey($newUserId2) };
-    Assert-AreEqual $newUserId1 $vmss.Identity.IdentityIds[0];
-    Assert-AreEqual $newUserId2 $vmss.Identity.IdentityIds[1];
 
     # AdditionalCapabilities
     Assert-Null $vmss.VirtualMachineProfile.AdditionalCapabilities;

diff --git a/src/ResourceManager/Compute/Commands.Compute/ChangeLog.md b/src/ResourceManager/Compute/Commands.Compute/ChangeLog.md
@@ -18,4 +18,10 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-## Current Release
+## Current Release
+* Breaking changes
+    - IdentityIds are removed from Identity property in PSVirtualMachine and PSVirtualMachineScaleSet object.
+    - The type of InstanceView property of PSVirtualMachineScaleSetVM object is changed from VirtualMachineInstanceView to VirtualMachineScaleSetVMInstanceView.
+    - AutoOSUpgradePolicy and AutomaticOSUpgrade properties are removed from UpgradePolicy property.
+    - The type of Sku property in PSSnapshotUpdate object is changed from DiskSku to SnapshotSku.
+    - VmScaleSetVMParameterSet is removed from Add-AzVMDataDisk.
diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
@@ -213,7 +213,6 @@
     <Compile Include="Models\PSAvailabilitySet.cs" />
     <Compile Include="Models\PSVirtualMachineImageResource.cs" />
     <Compile Include="Models\PSVirtualMachineInstanceView.cs" />
-    <Compile Include="Models\PSVirtualMachineIdentity.cs" />
     <Compile Include="Models\PSVirtualMachineList.cs" />
     <Compile Include="Models\PSVirtualMachineListStatus.cs" />
     <Compile Include="Models\PSVirtualMachineScaleSetExtension.cs" />

diff --git a/src/ResourceManager/Compute/Commands.Compute/Common/ComputeAutoMapperProfile.cs b/src/ResourceManager/Compute/Commands.Compute/Common/ComputeAutoMapperProfile.cs
@@ -188,18 +188,6 @@ private static void Initialize()
                 // PSVmssDiskEncryptionStatusContext <=> PSVmssDiskEncryptionStatusContextList
                 cfg.CreateMap<TO.PSVmssDiskEncryptionStatusContext, TO.PSVmssDiskEncryptionStatusContextList>();
                 cfg.CreateMap<TO.PSVmssVMDiskEncryptionStatusContext, TO.PSVmssVMDiskEncryptionStatusContextList>();
-
-                // PSVirtualMachineIdentity <=> VirtualMachineIdentity
-                cfg.CreateMap<FROM.VirtualMachineIdentity, TO.PSVirtualMachineIdentity>()
-                    .AfterMap((src, dest) =>
-                    {
-                        if (src.UserAssignedIdentities == null) dest.UserAssignedIdentities = null;
-                    });
-                cfg.CreateMap<TO.PSVirtualMachineIdentity, FROM.VirtualMachineIdentity>()
-                    .AfterMap((src, dest) =>
-                    {
-                        if (src.UserAssignedIdentities == null) dest.UserAssignedIdentities = null;
-                    });
             });
 
             _mapper = config.CreateMapper();

diff --git a/...ager/Compute/Commands.Compute/Extension/Diagnostics/AddAzureRmVmssDiagnosticsExtension.cs b/...ager/Compute/Commands.Compute/Extension/Diagnostics/AddAzureRmVmssDiagnosticsExtension.cs
@@ -27,12 +27,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Extension.Diagnostics
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssDiagnosticsExtension",SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public class AddAzureRmVmssDiagnosticsExtension : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...r/Compute/Commands.Compute/Extension/Diagnostics/RemoveAzureRmVmssDiagnosticsExtension.cs b/...r/Compute/Commands.Compute/Extension/Diagnostics/RemoveAzureRmVmssDiagnosticsExtension.cs
@@ -22,12 +22,6 @@
 
 namespace Microsoft.Azure.Commands.Compute
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssDiagnosticsExtension",SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public class RemoveAzureRmVmssDiagnosticsExtension : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...r/Compute/Commands.Compute/Extension/VmssDiskEncryption/DisableAzureVmssDiskEncryption.cs b/...r/Compute/Commands.Compute/Extension/VmssDiskEncryption/DisableAzureVmssDiskEncryption.cs
@@ -25,12 +25,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Extension.AzureDiskEncryption
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet("Disable", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssDiskEncryption",SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public class RemoveAzureVmssDiskEncryptionCommand : VirtualMachineScaleSetExtensionBaseCmdlet

diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Models/ComputeAutoMapperProfile.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Models/ComputeAutoMapperProfile.cs
@@ -80,8 +80,6 @@ private static void Initialize()
                 cfg.CreateMap<FROM.Snapshot, TO.PSSnapshotList>();
                 cfg.CreateMap<TO.PSSnapshotList, TO.PSSnapshot>();
                 cfg.CreateMap<TO.PSSnapshot, TO.PSSnapshotList>();
-                cfg.CreateMap<FROM.UpgradePolicy, TO.PSUpgradePolicy>();
-                cfg.CreateMap<TO.PSUpgradePolicy, FROM.UpgradePolicy>();
                 cfg.CreateMap<FROM.VirtualMachineScaleSet, TO.PSVirtualMachineScaleSetList>()
                     .ForMember(c => c.Zones, o => o.Condition(r => (r.Zones != null)));
                 cfg.CreateMap<TO.PSVirtualMachineScaleSetList, TO.PSVirtualMachineScaleSet>()
@@ -137,16 +135,6 @@ private static void Initialize()
                 cfg.CreateMap<TO.PSRunCommandDocumentBase, FROM.RunCommandDocumentBase>();
                 cfg.CreateMap<FROM.RollingUpgradeStatusInfo, TO.PSRollingUpgradeStatusInfo>();
                 cfg.CreateMap<TO.PSRollingUpgradeStatusInfo, FROM.RollingUpgradeStatusInfo>();
-                cfg.CreateMap<FROM.VirtualMachineScaleSetIdentity, TO.PSVirtualMachineScaleSetIdentity>()
-                    .AfterMap((src, dest) =>
-                    {
-                        if (src.UserAssignedIdentities == null) dest.UserAssignedIdentities = null;
-                    });
-                cfg.CreateMap<TO.PSVirtualMachineScaleSetIdentity, FROM.VirtualMachineScaleSetIdentity>()
-                    .AfterMap((src, dest) =>
-                    {
-                        if (src.UserAssignedIdentities == null) dest.UserAssignedIdentities = null;
-                    });
                 cfg.CreateMap<FROM.VirtualMachineScaleSet, TO.PSVirtualMachineScaleSet>()
                     .ForMember(c => c.Zones, o => o.Condition(r => (r.Zones != null)));
                 cfg.CreateMap<TO.PSVirtualMachineScaleSet, FROM.VirtualMachineScaleSet>()

diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Models/PSSnapshotUpdate.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Models/PSSnapshotUpdate.cs
@@ -31,6 +31,6 @@ public partial class PSSnapshotUpdate
         public int? DiskSizeGB { get; set; }
         public EncryptionSettings EncryptionSettings { get; set; }
         public IDictionary<string, string> Tags { get; set; }
-        //public SnapshotSku Sku { get; set; }
+        public SnapshotSku Sku { get; set; }
     }
 }
diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Models/PSVirtualMachineScaleSet.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Models/PSVirtualMachineScaleSet.cs
@@ -43,15 +43,15 @@ public string ResourceGroupName
 
         public Sku Sku { get; set; }
         public Plan Plan { get; set; }
-        public PSUpgradePolicy UpgradePolicy { get; set; }
+        public UpgradePolicy UpgradePolicy { get; set; }
         public VirtualMachineScaleSetVMProfile VirtualMachineProfile { get; set; }
         public string ProvisioningState { get; set; }
         public bool? Overprovision { get; set; }
         public string UniqueId { get; set; }
         public bool? SinglePlacementGroup { get; set; }
         public bool? ZoneBalance { get; set; }
         public int? PlatformFaultDomainCount { get; set; }
-        //public VirtualMachineScaleSetIdentity Identity { get; set; }
+        public VirtualMachineScaleSetIdentity Identity { get; set; }
         public System.Collections.Generic.IList<string> Zones { get; set; }
         public string Id { get; set; }
         public string Name { get; set; }

diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/Models/PSVirtualMachineScaleSetVM.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/Models/PSVirtualMachineScaleSetVM.cs
@@ -44,7 +44,7 @@ public string ResourceGroupName
         public Sku Sku { get; set; }
         public bool? LatestModelApplied { get; set; }
         public string VmId { get; set; }
-        //public VirtualMachineScaleSetVMInstanceView InstanceView { get; set; }
+        public VirtualMachineScaleSetVMInstanceView InstanceView { get; set; }
         public HardwareProfile HardwareProfile { get; set; }
         public StorageProfile StorageProfile { get; set; }
         public AdditionalCapabilities AdditionalCapabilities { get; set; }

diff --git a/...mpute/Commands.Compute/Generated/Snapshot/Config/NewAzureRmSnapshotUpdateConfigCommand.cs b/...mpute/Commands.Compute/Generated/Snapshot/Config/NewAzureRmSnapshotUpdateConfigCommand.cs
@@ -31,9 +31,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(DiskSku), ReplacementCmdletOutputTypeName = "SnapshotSku")]
-#endif
     [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SnapshotUpdateConfig", SupportsShouldProcess = true)]
     [OutputType(typeof(PSSnapshotUpdate))]
     public partial class NewAzureRmSnapshotUpdateConfigCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet
@@ -137,10 +134,7 @@ private void Run()
                 DiskSizeGB = this.MyInvocation.BoundParameters.ContainsKey("DiskSizeGB") ? this.DiskSizeGB : (int?)null,
                 Tags = this.MyInvocation.BoundParameters.ContainsKey("Tag") ? this.Tag.Cast<DictionaryEntry>().ToDictionary(ht => (string)ht.Key, ht => (string)ht.Value) : null,
                 EncryptionSettings = vEncryptionSettings,
-                Sku = new DiskSku
-                {
-                    Name = vSku.Name.ToString()
-                }
+                Sku = vSku
             };
 
             WriteObject(vSnapshotUpdate);

diff --git a/...nds.Compute/Generated/Snapshot/Config/SetAzureRmSnapshotUpdateDiskEncryptionKeyCommand.cs b/...nds.Compute/Generated/Snapshot/Config/SetAzureRmSnapshotUpdateDiskEncryptionKeyCommand.cs
@@ -30,9 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(DiskSku), ReplacementCmdletOutputTypeName = "SnapshotSku")]
-#endif
     [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SnapshotUpdateDiskEncryptionKey", SupportsShouldProcess = true)]
     [OutputType(typeof(PSSnapshotUpdate))]
     public partial class SetAzureRmSnapshotUpdateDiskEncryptionKeyCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...ands.Compute/Generated/Snapshot/Config/SetAzureRmSnapshotUpdateKeyEncryptionKeyCommand.cs b/...ands.Compute/Generated/Snapshot/Config/SetAzureRmSnapshotUpdateKeyEncryptionKeyCommand.cs
@@ -30,9 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(DiskSku), ReplacementCmdletOutputTypeName = "SnapshotSku")]
-#endif
     [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "SnapshotUpdateKeyEncryptionKey", SupportsShouldProcess = true)]
     [OutputType(typeof(PSSnapshotUpdate))]
     public partial class SetAzureRmSnapshotUpdateKeyEncryptionKeyCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssAdditionalUnattendContentCommand.cs b/...Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssAdditionalUnattendContentCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Add, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssAdditionalUnattendContent", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class AddAzureRmVmssAdditionalUnattendContentCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...Commands.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssDataDiskCommand.cs b/...Commands.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssDataDiskCommand.cs
@@ -31,12 +31,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Add, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssDataDisk", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class AddAzureRmVmssDataDiskCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...ommands.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssExtensionCommand.cs b/...ommands.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssExtensionCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Add, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssExtension", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class AddAzureRmVmssExtensionCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...rated/VirtualMachineScaleSet/Config/AddAzureRmVmssNetworkInterfaceConfigurationCommand.cs b/...rated/VirtualMachineScaleSet/Config/AddAzureRmVmssNetworkInterfaceConfigurationCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Add, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssNetworkInterfaceConfiguration", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class AddAzureRmVmssNetworkInterfaceConfigurationCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...e/Commands.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssSecretCommand.cs b/...e/Commands.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssSecretCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Add, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssSecret", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class AddAzureRmVmssSecretCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...ands.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssSshPublicKeyCommand.cs b/...ands.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssSshPublicKeyCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Add, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssSshPublicKey", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class AddAzureRmVmssSshPublicKeyCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...nds.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssWinRMListenerCommand.cs b/...nds.Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssWinRMListenerCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Add, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssWinRMListener", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class AddAzureRmVmssWinRMListenerCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...e/Commands.Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs b/...e/Commands.Compute/Generated/VirtualMachineScaleSet/Config/NewAzureRmVmssConfigCommand.cs
@@ -31,12 +31,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssConfig", SupportsShouldProcess = true, DefaultParameterSetName = "DefaultParameterSet")]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class NewAzureRmVmssConfigCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet
@@ -490,9 +484,9 @@ private void Run()
                 Tags = this.MyInvocation.BoundParameters.ContainsKey("Tag") ? this.Tag.Cast<DictionaryEntry>().ToDictionary(ht => (string)ht.Key, ht => (string)ht.Value) : null,
                 Sku = vSku,
                 Plan = vPlan,
-                UpgradePolicy = (vUpgradePolicy == null) ? null : new PSUpgradePolicy(vUpgradePolicy),
+                UpgradePolicy = vUpgradePolicy,
                 VirtualMachineProfile = vVirtualMachineProfile,
-                Identity = (vIdentity == null) ? null : new PSVirtualMachineScaleSetIdentity(vIdentity),
+                Identity = vIdentity,
             };
 
             WriteObject(vVirtualMachineScaleSet);

diff --git a/...mands.Compute/Generated/VirtualMachineScaleSet/Config/RemoveAzureRmVmssDataDiskCommand.cs b/...mands.Compute/Generated/VirtualMachineScaleSet/Config/RemoveAzureRmVmssDataDiskCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Remove, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssDataDisk", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class RemoveAzureRmVmssDataDiskCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...ands.Compute/Generated/VirtualMachineScaleSet/Config/RemoveAzureRmVmssExtensionCommand.cs b/...ands.Compute/Generated/VirtualMachineScaleSet/Config/RemoveAzureRmVmssExtensionCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Remove, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssExtension", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class RemoveAzureRmVmssExtensionCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...ed/VirtualMachineScaleSet/Config/RemoveAzureRmVmssNetworkInterfaceConfigurationCommand.cs b/...ed/VirtualMachineScaleSet/Config/RemoveAzureRmVmssNetworkInterfaceConfigurationCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Remove, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssNetworkInterfaceConfiguration", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class RemoveAzureRmVmssNetworkInterfaceConfigurationCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet

diff --git a/...ds.Compute/Generated/VirtualMachineScaleSet/Config/SetAzureRmVmssBootDiagnosticCommand.cs b/...ds.Compute/Generated/VirtualMachineScaleSet/Config/SetAzureRmVmssBootDiagnosticCommand.cs
@@ -30,12 +30,6 @@
 
 namespace Microsoft.Azure.Commands.Compute.Automation
 {
-#if NETSTANDARD
-    [CmdletOutputBreakingChange(typeof(PSUpgradePolicy),
-        DeprecatedOutputProperties = new string[] { "AutomaticOSUpgrade", "AutoOSUpgradePolicy" })]
-    [CmdletOutputBreakingChange(typeof(PSVirtualMachineScaleSetIdentity),
-        DeprecatedOutputProperties = new string[] { "IdentityIds" })]
-#endif
     [Cmdlet(VerbsCommon.Set, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssBootDiagnostic", SupportsShouldProcess = true)]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public partial class SetAzureRmVmssBootDiagnosticCommand : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet