Merge branch 'release-2020-03-31' into task-adls-breakingchangebulktransfer

Author: isra-fel

src/Accounts/Accounts/ChangeLog.md

@@ -18,7 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Fix Get-AzTenant/Get-AzDefault/Set-AzDefault throw NullReferenceException when not login
+* Fixed `Get-AzTenant`/`Get-AzDefault`/`Set-AzDefault` throw NullReferenceException when not login [#10292]
 
 ## Version 1.7.3
 * Open Azure PowerShell survey page in `Send-Feedback` [#11020]

src/Compute/Compute/ChangeLog.md

@@ -19,14 +19,18 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Add the following parameters to New-AzDiskConfig cmdlet: 
+* Added the following parameters to `New-AzDiskConfig` cmdlet: 
     - DiskIOPSReadOnly, DiskMBpsReadOnly, MaxSharesCount, GalleryImageReference
-* Allow Encryption property to Target parameter of New-AzGalleryImageVersion cmdlet.
-* Fix tempDisk issue for Set-AzVmss -Reimage and Invoke-AzVMReimage cmdlets.
-* Set-AzVMAEMExtension, Get-AzVMAEMExtension, Remove-AzVMAEMExtension, Update-AzVMAEMExtension: Add support for new SAP Extension
-* Fix errors in examples of help document
-* Show the exact string value for VM PowerState in the table format.
-* New-AzVmssConfig does not create AutomaticRepairs property when it is disabled.
+* Allowed Encryption property to Target parameter of `New-AzGalleryImageVersion` cmdlet.
+* Fixed tempDisk issue for `Set-AzVmss` -Reimage and `Invoke-AzVMReimage` cmdlets. [#11354]
+* Added support to below cmdlets for new SAP Extension
+    - `Set-AzVMAEMExtension`
+    - `Get-AzVMAEMExtension`
+    - `Remove-AzVMAEMExtension`
+    - `Update-AzVMAEMExtension`
+* Fixed errors in examples of help document
+* Showed the exact string value for VM PowerState in the table format.
+* `New-AzVmssConfig`: fixed serialization of AutomaticRepairs property when SinglePlacementGroup is disabled. [#11257]
 
 ## Version 3.5.0
 * Allowed empty value for ProximityPlacementGroupId during update

src/DataFactory/DataFactoryV2/Changelog.md

@@ -18,8 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Update ADF .Net SDK version to 4.8.0
-* Add optional parameters to Invoke-AzDataFactoryV2Pipeline command to support rerun
+* Updated ADF .Net SDK version to 4.8.0
+* Added optional parameters to `Invoke-AzDataFactoryV2Pipeline` command to support rerun
 
 ## Version 1.6.1
 * Update ADF .Net SDK version to 4.7.0

src/DataLakeStore/DataLakeStore/ChangeLog.md

@@ -18,8 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Added option of Byte encoding for New-AzDataLakeStoreItem, Add-AzDAtaLakeStoreItemContent, Get-AzDAtaLakeStoreItemContent
-* Add breaking change description for Export-AzDataLakeStoreItem and Import-AzDataLakeStoreItem
+* Added breaking change description for `Export-AzDataLakeStoreItem` and `Import-AzDataLakeStoreItem`
+* Added option of Byte encoding for `New-AzDataLakeStoreItem`, `Add-AzDAtaLakeStoreItemContent`, and `Get-AzDAtaLakeStoreItemContent`
 
 ## Version 1.2.7
 * Added reference to System.Buffers explicitly in csproj and psd1.

src/HDInsight/HDInsight/ChangeLog.md

@@ -18,7 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-Supported specifying minimal supported TLS version when creating cluster.
+* Supported specifying minimal supported TLS version when creating cluster.
 
 ## Version 3.0.3
 * Fix document error of New-AzHDInsightCluster.

src/Monitor/Monitor/ChangeLog.md

@@ -19,7 +19,7 @@
 -->
 
 ## Upcoming Release
-* update documentation for New-AzScheduledQueryRuleLogMetricTrigger
+* Updated documentation for `New-AzScheduledQueryRuleLogMetricTrigger`
 
 ## Version 1.6.1
 * Fixed output value for `Get-AzMetricDefinition` [#9714]

src/Network/Network/ChangeLog.md

@@ -20,10 +20,10 @@
 
 ## Upcoming Release
 * Updated cmdlets to allow cross-tenant VirtualHubVnetConnections
-    - New-AzVirtualHubVnetConnection
-    - Update-AzVirtualHubVnetConnection
-    - New-AzVirtualHub
-    - Update-AzVirtualHub
+    - `New-AzVirtualHubVnetConnection`
+    - `Update-AzVirtualHubVnetConnection`
+    - `New-AzVirtualHub`
+    - `Update-AzVirtualHub`
 * Removed Sql Management SDK dependency
 
 ## Version 2.3.2

src/Network/Network/help/New-AzNetworkInterface.md

@@ -70,15 +70,17 @@ created automatically using the name IPConfiguration1.
 
 ### Example 2: Create an Azure network interface using an IP configuration object
 ```
-PS C:\>$IPconfig = New-AzNetworkInterfaceIpConfig -Name "IPConfig1" -PrivateIpAddressVersion IPv4 -PrivateIpAddress "10.0.1.10" -SubnetId "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/ResourceGroup1/providers/Microsoft.Network/virtualNetworks/VirtualNetwork1/subnets/Subnet1"
+PS C:\>$Subnet = Get-AzVirtualNetwork -Name "VirtualNetwork1" -ResourceGroupName "ResourceGroup1" 
+PS C:\>$IPconfig = New-AzNetworkInterfaceIpConfig -Name "IPConfig1" -PrivateIpAddressVersion IPv4 -PrivateIpAddress "10.0.1.10" -SubnetId $Subnet.Subnets[0].Id
 PS C:\> New-AzNetworkInterface -Name "NetworkInterface1" -ResourceGroupName "ResourceGroup1" -Location "centralus" -IpConfiguration $IPconfig
 ```
 
 This example creates a new network interface using an IP configuration object. The IP configuration
 object specifies a static private IPv4 address.
-The first command creates a network interface IP configuration named IPConfig1 and stores the
+The first command retrieves an existing specified virtual network used to assign the subnet in the second command.
+The second command creates a network interface IP configuration named IPConfig1 and stores the
 configuration in the variable named $IPconfig.
-The second command creates a network interface named NetworkInterface1 that uses the network
+The third command creates a network interface named NetworkInterface1 that uses the network
 interface IP configuration stored in the variable named $IPconfig.
 
 ## PARAMETERS

src/PolicyInsights/PolicyInsights/ChangeLog.md

@@ -18,7 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Improve error messages
+* Improved error messages
 
 ## Version 1.2.0
 * Support evaluating compliance prior to determining what resource to remediate

src/RecoveryServices/RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs

@@ -170,6 +170,10 @@ public static PolicyBase GetPolicyModelForAzureIaaSVM(ServiceClientModel.Protect
             iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicy((ServiceClientModel.SimpleSchedulePolicy)
                                              ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).SchedulePolicy,
                                              ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).TimeZone);
+            iaasPolicyModel.AzureBackupRGName = 
+                ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).InstantRPDetails.AzureBackupRGNamePrefix;
+            iaasPolicyModel.AzureBackupRGNameSuffix = 
+                ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).InstantRPDetails.AzureBackupRGNameSuffix;
             return policyModel;
         }
 

src/RecoveryServices/RecoveryServices.Backup.Models/AzureModels/AzureItem.cs

@@ -27,6 +27,11 @@ public class AzureItem : ItemBase
         /// </summary>
         public ItemProtectionStatus ProtectionStatus { get; set; }
 
+        /// <summary>
+        /// Policy ID Associated with item
+        /// </summary>
+        public string PolicyId { get; set; }
+
         /// <summary>
         /// Protection State of the item
         /// </summary>
@@ -67,6 +72,7 @@ public AzureItem(ProtectedItemResource protectedItemResource,
             : base(protectedItemResource, containerName, containerType)
         {
             ProtectionPolicyName = policyName;
+            PolicyId = protectedItemResource.Properties.PolicyId;
         }
     }
     public class AzureItemExtendedInfo : ItemExtendedInfoBase

src/RecoveryServices/RecoveryServices.Backup.Models/AzureVmModels/AzureVmPolicy.cs

@@ -12,6 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.Common.Compute.Version_2018_04.Models;
+
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
 {
     /// <summary>
@@ -28,6 +30,16 @@ public class AzureVmPolicy : AzurePolicy
         /// Object defining the number of associated items for the policy
         /// </summary>
         public int? ProtectedItemsCount { get; set; }
+
+        /// <summary>
+        /// object defining the RG Name to store Restore Points
+        /// </summary>
+        public string AzureBackupRGName { get; set; }
+
+        /// <summary>
+        /// object defining the RG Name suffix to store Restore Points
+        /// </summary>
+        public string AzureBackupRGNameSuffix { get; set; }
     }
 
 }

src/RecoveryServices/RecoveryServices.Backup.Models/CmdletParamEnums.cs

@@ -58,7 +58,10 @@ public enum RestoreBackupItemParams
     public enum RestoreVMBackupItemParams
     {
         TargetResourceGroupName,
-        OsaOption
+        OsaOption,
+        RestoreDiskList,
+        RestoreOnlyOSDisk,
+        RestoreAsUnmanagedDisks
     }
 
     public enum RestoreFSBackupItemParams
@@ -68,7 +71,8 @@ public enum RestoreFSBackupItemParams
         SourceFileType,
         TargetStorageAccountName,
         TargetFileShareName,
-        TargetFolder
+        TargetFolder,
+        MultipleSourceFilePath
     }
     public enum RestoreWLBackupItemParams
     {
@@ -118,7 +122,11 @@ public enum ItemParams
         BackupType,
         EnableCompression,
         DeleteState,
-        FriendlyName
+        FriendlyName,
+        InclusionDisksList,
+        ExclusionDisksList,
+        ResetExclusionSettings,
+        ExcludeAllDataDisks
     }
 
     public enum ProtectionCheckParams

src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -586,4 +586,19 @@ Please contact Microsoft for further assistance.</value>
   <data name="TargetContainerRequiredException" xml:space="preserve">
     <value>Target Container parameter is required for this operation.</value>
   </data>
+  <data name="DiskExclusionParametersRedundant" xml:space="preserve">
+    <value>Multiple Parameters Provided. Please specify only one of the parameters from InclusionDisksList, ExclusionDisksList, ResetExclusionSetting and ExcludeAllDataDisks.</value>
+  </data>
+  <data name="InclusionListRedundantError" xml:space="preserve">
+    <value>Both Inclusion and Exclusion lists provided. Please provide only one of them.</value>
+  </data>
+  <data name="TargetRGUnmanagedRestoreDuplicateParamsException" xml:space="preserve">
+    <value>Both RestoreAsUnmanagedDisks and TargetResourceGroupName can't be spceified. Please give Only one parameter and retry.</value>
+  </data>
+  <data name="UnmanagedVMRestoreWarning" xml:space="preserve">
+    <value>The disks of the managed VM will be restored as unmanaged since TargetResourceGroupName parameter is not provided. This will NOT leverage the instant restore functionality and hence can be significantly slow based on given storage account. To leverage instant restore, provide the TargetResourceGroupName parameter. Otherwise, provide the intent next time by passing the RestoreAsUnmanagedDisks parameter</value>
+  </data>
+  <data name="AzureFileSourceFilePathRedundantException" xml:space="preserve">
+    <value>Both source file path and multiple source file paths provided. Please give only one option</value>
+  </data>
 </root>

src/RecoveryServices/RecoveryServices.Backup.Models/Properties/Resources.resx

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PsModuleName>RecoveryServices</PsModuleName>
@@ -14,5 +14,5 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />
   </ItemGroup>
-
+  
 </Project>