fix conflict

Author: brucelin-511

.azure-pipelines/util/test-steps.yml

@@ -16,6 +16,22 @@ steps:
     custom: msbuild
     arguments: 'build.proj /t:${{ parameters.testTarget }} /p:Configuration=${{ parameters.configuration }};TestFramework=${{ parameters.testFramework }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
 
+- powershell: |
+   Install-Module -Name Pester -RequiredVersion 4.10.1 -Force -SkipPublisherCheck
+   Install-Module -Name Az.Accounts -Scope CurrentUser -Force
+   Get-ChildItem -Directory Az.* | ForEach-Object {if (Test-Path $_/test-module.ps1) {cd $_; ./test-module.ps1}}
+  workingDirectory: 'artifacts/Debug'
+  displayName: Test for AutoGen Modules With Windows PowerShell
+  condition: and(succeeded(), ne('${{ parameters.testTarget }}', 'Test'))
+
+- pwsh: |
+   Install-Module -Name Pester -RequiredVersion 4.10.1 -Force
+   Install-Module -Name Az.Accounts -Scope CurrentUser -Force
+   Get-ChildItem -Directory Az.* | ForEach-Object {if (Test-Path $_/test-module.ps1) {cd $_; ./test-module.ps1}}
+  workingDirectory: 'artifacts/Debug'
+  displayName: 'Test for AutoGen Modules With PowerShell Core'
+  condition: and(succeeded(), eq('${{ parameters.testTarget }}', 'Test'))
+
 - task: PublishTestResults@2
   inputs:
     testRunner: VSTest

.azure-pipelines/windows-powershell.yml

@@ -67,4 +67,4 @@ jobs:
       osName: ${{ variables.WindowsName }}
       testFramework: ${{ variables.TestFramework }}
       testTarget: ${{ variables.TestTarget }}
-      configuration: ${{ variables.Configuration }}
+      configuration: ${{ variables.Configuration }}

documentation/development-docs/help-generation.md

@@ -68,7 +68,7 @@ Whenever the public interface for a cmdlet has changed, the corresponding markdo
 To update all of the markdown files for a single module, use the [`Update-MarkdownHelpModule`](https://github.com/PowerShell/platyPS/blob/master/docs/Update-MarkdownHelpModule.md) cmdlet:
 
 ```powershell
-$PathToModuleManifest = "../../<module.psd1" # Full path to the module manifest that you have updated
+$PathToModuleManifest = "../../<module>.psd1" # Full path to the module manifest that you have updated
 Import-Module -Name $PathToModuleManifest
 
 $PathToHelpFolder = "../../help" # Full path to help folder containing markdown files to be updated

documentation/tooling/static-analysis.md

@@ -91,7 +91,7 @@ The dependency analyzer can be found in the [`DependencyAnalyzer`](https://githu
 The help analyzer can be found in the [`HelpAnalyzer`](https://github.com/Azure/azure-powershell/tree/01a81fbb7ea6c086fff2bc137053168c0fc7728a/tools/StaticAnalysis/HelpAnalyzer) folder. In this folder, you will find the following classes:
 
 - `HelpAnalyzer`
-    - The implementation of the `IStaticAnalyzer` interface; determines which modules to analyze and checks to see which cmdlets within those modules don't have a corresponding markdown help file
+    - The implementation of the `IStaticAnalyzer` interface; determines which modules to analyze and checks to see which cmdlets within those modules don't have a corresponding markdown help file. It also checks the content structure of markdown help conforms to [PlatyPS Schema](https://github.com/PowerShell/platyPS/blob/master/platyPS.schema.md)
 - `HelpIssues`
     - The implementation of the `IReportRecord` interface; defines what a help exception looks like when it's reported in the `HelpIssues.csv` file that is found in the build artifacts of a CI run, as well as how to compare a new record to a record found in the existing `HelpIssues.csv` file used for exception suppressions
 

src/Accounts/Accounts/AzureRmAlias/Mappings.json

@@ -2077,7 +2077,24 @@
     "Get-AzSecurityTask": "Get-AzureRmSecurityTask",
     "Get-AzSecurityWorkspaceSetting": "Get-AzureRmSecurityWorkspaceSetting",
     "Set-AzSecurityWorkspaceSetting": "Set-AzureRmSecurityWorkspaceSetting",
-    "Remove-AzSecurityWorkspaceSetting": "Remove-AzureRmSecurityWorkspaceSetting"
+    "Remove-AzSecurityWorkspaceSetting": "Remove-AzureRmSecurityWorkspaceSetting",
+    "Get-AzSecurityAnalytics": "Get-AzureRmIotSecurityAnalytics",
+    "Disable-AzIotSecurityAnalyticsAggregatedAlert": "Disable-AzureRmIotSecurityAnalyticsAggregatedAlert",
+    "Get-AzIotSecurityAnalyticsAggregatedAlert": "Get-AzureRmIotSecurityAnalyticsAggregatedAlert",
+    "Get-AzIotSecurityAnalyticsAggregatedRecommendation": "Get-AzureRmIotSecurityAnalyticsAggregatedRecommendation",
+    "Get-AzDeviceSecurityGroup": "Get-AzureRmDeviceSecurityGroup",
+    "Set-AzDeviceSecurityGroup": "Set-AzureRmDeviceSecurityGroup",
+    "Remove-AzDeviceSecurityGroup": "Remove-AzureRmDeviceSecurityGroup",
+    "New-AzDeviceSecurityGroupAllowlistCustomAlertRuleObject": "New-AzureRmDeviceSecurityGroupAllowlistCustomAlertRuleObject",
+    "New-AzDeviceSecurityGroupDenylistCustomAlertRuleObject": "New-AzureRmDeviceSecurityGroupDenylistCustomAlertRuleObject",
+    "New-AzDeviceSecurityGroupThresholdCustomAlertRuleObject": "New-AzureRmDeviceSecurityGroupThresholdCustomAlertRuleObject",
+    "New-AzDeviceSecurityGroupTimeWindowRuleObject": "New-AzureRmDeviceSecurityGroupTimeWindowRuleObject",
+    "Get-AzIotSecuritySolution": "Get-AzureRmIotSecuritySolution",
+    "Set-AzIotSecuritySolution": "Set-AzureRmIotSecuritySolution",
+    "Remove-AzIotSecuritySolution": "Remove-AzureRmIotSecuritySolution",
+    "Update-AzIotSecuritySolution": "Update-AzureRmIotSecuritySolution",
+    "New-AzIotSecuritySolutionRecommendationConfigurationObject": "New-AzureRmIotSecuritySolutionRecommendationConfigurationObject",
+    "New-AzIotSecuritySolutionUserDefinedResourcesObject": "New-AzureRmIotSecuritySolutionUserDefinedResourcesObject"
   },
   "Az.ServiceBus": {
     "New-AzServiceBusNamespace": "New-AzureRmServiceBusNamespace",

src/Az.autorest.props

@@ -55,14 +55,20 @@
   <ItemGroup>
         <ModuleCustomFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\custom\**\*.*"/>
         <ModuleHelpFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\help\**\*.*"/>
+        <ModuleGeneratedFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\generated\**\*.*"/>
+        <ModuleTestFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\test\**\*.*"/>
   </ItemGroup>
 
   <Target Name="CopyFiles" AfterTargets="Build">
     <Copy SourceFiles="Az.$(PsModuleName).psd1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)" />
     <Copy SourceFiles="Az.$(PsModuleName).psm1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)" />
     <Copy SourceFiles="Az.$(PsModuleName).format.ps1xml" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)" />
+    <Copy SourceFiles="check-dependencies.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)" Condition="'$(Configuration)'=='Debug'"/>
+    <Copy SourceFiles="test-module.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)" Condition="'$(Configuration)'=='Debug'"/>
     <Copy SourceFiles="@(ModuleCustomFiles)" DestinationFiles="@(ModuleCustomFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\custom\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(ModuleHelpFiles)" DestinationFiles="@(ModuleHelpFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\help\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(ModuleGeneratedFiles)" DestinationFiles="@(ModuleGeneratedFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\generated\%(RecursiveDir)%(Filename)%(Extension)')" Condition="'$(Configuration)'=='Debug'"/>
+    <Copy SourceFiles="@(ModuleTestFiles)" DestinationFiles="@(ModuleTestFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\test\%(RecursiveDir)%(Filename)%(Extension)')" Condition="'$(Configuration)'=='Debug'"/>
     <Copy SourceFiles="exports\ProxyCmdletDefinitions.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\exports" />
     <Copy SourceFiles="internal\ProxyCmdletDefinitions.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\internal" />
     <Copy SourceFiles="internal\Az.$(PsModuleName).internal.psm1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\internal" />

src/Blueprint/Blueprint/Az.Blueprint.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 3/3/2020
+# Generated on: 4/23/2020
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.2.11'
+ModuleVersion = '0.2.12'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -114,8 +114,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Showed DependsOn property value in the table view
-* Added support to accept PolicyDefinitionParameter empty '
+        ReleaseNotes = '* Added support for management group level Blueprint assignment'
 
         # Prerelease string of this module
         # Prerelease = ''

src/Blueprint/Blueprint/ChangeLog.md

@@ -19,6 +19,9 @@
 -->
 ## Upcoming Release
 
+## Version 0.2.12
+* Added support for management group level Blueprint assignment
+
 ## Version 0.2.11
 * Showed DependsOn property value in the table view
 * Added support to accept PolicyDefinitionParameter empty 

src/Blueprint/Blueprint/Properties/AssemblyInfo.cs

@@ -43,8 +43,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.2.11")]
-[assembly: AssemblyFileVersion("0.2.11")]
+[assembly: AssemblyVersion("0.2.12")]
+[assembly: AssemblyFileVersion("0.2.12")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Blueprint.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else

src/Compute/Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1

@@ -1113,7 +1113,7 @@ function Test-VirtualMachineScaleSetIdentity
         $extname2 = 'csetest2';
 
         $ipCfg = New-AzVmssIPConfig -Name 'test' -SubnetId $subnetId;
-        $vmss = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'Manual' -AssignIdentity `
+        $vmss = New-AzVmssConfig -Location $loc -SkuCapacity 2 -SkuName 'Standard_A0' -UpgradePolicyMode 'Manual' -IdentityType "SystemAssigned" `
             | Add-AzVmssNetworkInterfaceConfiguration -Name 'test' -Primary $true -IPConfiguration $ipCfg `
             | Set-AzVmssOSProfile -ComputerNamePrefix 'test' -AdminUsername $adminUsername -AdminPassword $adminPassword `
             | Set-AzVmssStorageProfile -Name 'test' -OsDiskCreateOption 'FromImage' -OsDiskCaching 'None' `

src/Compute/Compute.Test/ScenarioTests/VirtualMachineTests.ps1

@@ -3254,7 +3254,7 @@ function Test-VirtualMachineIdentity
         $computerName = 'test';
         $vhdContainer = "https://$stoname.blob.core.windows.net/test";
 
-        $p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -AssignIdentity `
+        $p = New-AzVMConfig -VMName $vmname -VMSize $vmsize -IdentityType "SystemAssigned" `
              | Add-AzVMNetworkInterface -Id $nicId -Primary `
              | Set-AzVMOSDisk -Name $osDiskName -VhdUri $osDiskVhdUri -Caching $osDiskCaching -CreateOption FromImage `
              | Set-AzVMOperatingSystem -Windows -ComputerName $computerName -Credential $cred;
@@ -3352,7 +3352,7 @@ function Test-VirtualMachineIdentityUpdate
         $vms_output = $vms | Out-String;
         Write-Verbose($vms_output);
 
-        $st = $vm1 | Update-AzVM -AssignIdentity;
+        $st = $vm1 | Update-AzVM -IdentityType "SystemAssigned";
 
         # Get VM
         $vm1 = Get-AzVM -Name $vmname -ResourceGroupName $rgname -DisplayHint "Expand";

src/Compute/Compute.sln

@@ -14,8 +14,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Accounts", "..\Accounts\Acc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyVault", "..\KeyVault\KeyVault\KeyVault.csproj", "{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedServiceIdentity", "..\ManagedServiceIdentity\ManagedServiceIdentity.csproj", "{228EB071-FA04-43B3-95F9-7D76DBF0B850}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{3E016018-D65D-4336-9F64-17DA97783AD0}"
@@ -24,6 +22,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScenarioTest.ResourceManage
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFx", "..\..\tools\TestFx\TestFx.csproj", "{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedServiceIdentity", "..\ManagedServiceIdentity\ManagedServiceIdentity\ManagedServiceIdentity.csproj", "{9F6FD098-3A06-4D8F-9807-7E941FBCFEE4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -50,10 +50,6 @@ Global
 		{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Release|Any CPU.Build.0 = Release|Any CPU
-		{228EB071-FA04-43B3-95F9-7D76DBF0B850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{228EB071-FA04-43B3-95F9-7D76DBF0B850}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{228EB071-FA04-43B3-95F9-7D76DBF0B850}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{228EB071-FA04-43B3-95F9-7D76DBF0B850}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -70,6 +66,10 @@ Global
 		{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F6FD098-3A06-4D8F-9807-7E941FBCFEE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F6FD098-3A06-4D8F-9807-7E941FBCFEE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F6FD098-3A06-4D8F-9807-7E941FBCFEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F6FD098-3A06-4D8F-9807-7E941FBCFEE4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -78,6 +78,7 @@ Global
 		{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{98CFD96B-A6BC-4F15-AE2C-603FC2B58981} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{9F6FD098-3A06-4D8F-9807-7E941FBCFEE4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {54E53EE0-76A1-4911-8FED-63555F09459F}

src/Compute/Compute/ChangeLog.md

@@ -19,6 +19,13 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Breaking changes
+    - FilterExpression parameter is removed from Get-AzVMImage cmdlet.
+    - AssignIdentity parameter is removed from New-AzVmssConfig, New-AzVMConfig and Update-AzVM cmdlets.
+    - AutomaticRepairMaxInstanceRepairsPercent is removed from New-AzVmssConfig and Update-AzVmss cmdlets.
+    - AvailabilitySetsColocationStatus, VirtualMachinesColocationStatus and VirtualMachineScaleSetsColocationStatus properties are removed from ProximityPlacementGroup.
+    - MaxInstanceRepairsPercent property is removed from AutomaticRepairsPolicy.
+    - The types of AvailabilitySets, VirtualMachines and VirtualMachineScaleSets are changed from IList<SubResource> to IList<SubResourceWithColocationStatus>.
 * Description for Get-AzVM cmdlet has been updated to better describe it. 
 
 ## Version 3.7.0

src/Compute/Compute/Extension/Diagnostics/RemoveAzureRmVmssDiagnosticsExtension.cs

@@ -22,7 +22,6 @@
 namespace Microsoft.Azure.Commands.Compute
 {
     [Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "VmssDiagnosticsExtension",SupportsShouldProcess = true)]
-    [CmdletOutputBreakingChangeAttribute(typeof(PSAutomaticRepairsPolicy), "MaxInstanceRepairsPercent property will be removed.")]
     [OutputType(typeof(PSVirtualMachineScaleSet))]
     public class RemoveAzureRmVmssDiagnosticsExtension : Microsoft.Azure.Commands.ResourceManager.Common.AzureRMCmdlet
     {

src/Compute/Compute/Generated/Models/ComputeAutoMapperProfile.cs

@@ -133,14 +133,8 @@ private static void Initialize()
                 cfg.CreateMap<TO.PSImage, FROM.Image>();
                 cfg.CreateMap<FROM.LogAnalyticsOperationResult, TO.PSLogAnalyticsOperationResult>();
                 cfg.CreateMap<TO.PSLogAnalyticsOperationResult, FROM.LogAnalyticsOperationResult>();
-                cfg.CreateMap<FROM.ProximityPlacementGroup, TO.PSProximityPlacementGroup>()
-                    .ForMember(c => c.AvailabilitySetsColocationStatus, o => o.MapFrom(r => r.AvailabilitySets))
-                    .ForMember(c => c.VirtualMachinesColocationStatus, o => o.MapFrom(r => r.VirtualMachines))
-                    .ForMember(c => c.VirtualMachineScaleSetsColocationStatus, o => o.MapFrom(r => r.VirtualMachineScaleSets));
-                cfg.CreateMap<TO.PSProximityPlacementGroup, FROM.ProximityPlacementGroup>()
-                    .ForMember(c => c.AvailabilitySets, o => o.MapFrom(r => r.AvailabilitySetsColocationStatus))
-                    .ForMember(c => c.VirtualMachines, o => o.MapFrom(r => r.VirtualMachinesColocationStatus))
-                    .ForMember(c => c.VirtualMachineScaleSets, o => o.MapFrom(r => r.VirtualMachineScaleSetsColocationStatus));
+                cfg.CreateMap<FROM.ProximityPlacementGroup, TO.PSProximityPlacementGroup>();
+                cfg.CreateMap<TO.PSProximityPlacementGroup, FROM.ProximityPlacementGroup>();
                 cfg.CreateMap<FROM.ResourceSku, TO.PSResourceSku>();
                 cfg.CreateMap<TO.PSResourceSku, FROM.ResourceSku>();
                 cfg.CreateMap<FROM.Snapshot, TO.PSSnapshot>();
@@ -180,8 +174,6 @@ private static void Initialize()
 
                 cfg.CreateMap<FROM.VirtualMachineScaleSetVMProfile, TO.PSVirtualMachineScaleSetVMProfile>();
                 cfg.CreateMap<TO.PSVirtualMachineScaleSetVMProfile, FROM.VirtualMachineScaleSetVMProfile>();
-                cfg.CreateMap<FROM.AutomaticRepairsPolicy, TO.PSAutomaticRepairsPolicy>();
-                cfg.CreateMap<TO.PSAutomaticRepairsPolicy, FROM.AutomaticRepairsPolicy>();
                 cfg.CreateMap<FROM.VirtualMachineScaleSetExtensionProfile, TO.PSVirtualMachineScaleSetExtensionProfile>();
                 cfg.CreateMap<TO.PSVirtualMachineScaleSetExtensionProfile, FROM.VirtualMachineScaleSetExtensionProfile>();
                 cfg.CreateMap<FROM.VirtualMachineScaleSetExtension, TO.PSVirtualMachineScaleSetExtension>()

src/Compute/Compute/Generated/Models/PSProximityPlacementGroup.cs

@@ -41,9 +41,9 @@ public string ResourceGroupName
         }
 
         public string ProximityPlacementGroupType { get; set; }
-        public IList<SubResourceWithColocationStatus> VirtualMachinesColocationStatus { get; set; }
-        public IList<SubResourceWithColocationStatus> VirtualMachineScaleSetsColocationStatus { get; set; }
-        public IList<SubResourceWithColocationStatus> AvailabilitySetsColocationStatus { get; set; }
+        public IList<SubResourceWithColocationStatus> VirtualMachines { get; set; }
+        public IList<SubResourceWithColocationStatus> VirtualMachineScaleSets { get; set; }
+        public IList<SubResourceWithColocationStatus> AvailabilitySets { get; set; }
         public InstanceViewStatus ColocationStatus { get; set; }
         public string Id { get; set; }
         public string Name { get; set; }

src/Compute/Compute/Generated/Models/PSVirtualMachineScaleSet.cs

@@ -43,6 +43,7 @@ public string ResourceGroupName
         public Sku Sku { get; set; }
         public Plan Plan { get; set; }
         public UpgradePolicy UpgradePolicy { get; set; }
+        public AutomaticRepairsPolicy AutomaticRepairsPolicy { get; set; }
         public string ProvisioningState { get; set; }
         public bool? Overprovision { get; set; }
         public bool? DoNotRunExtensionsOnOverprovisionedVMs { get; set; }