Merge pull request Azure#10718 from VeryEarly/merge-2019-11-29-RecoveryServices

Merge 2019 11 29 recovery services

Author: VeryEarly

src/RecoveryServices/RecoveryServices/Az.RecoveryServices.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 12/11/2019
+# Generated on: 12/16/2019
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '2.2.0'
+ModuleVersion = '2.3.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -264,7 +264,6 @@ PrivateData = @{
 
         # ReleaseNotes of this module
         ReleaseNotes = '* Update references in .psd1 to use relative path
-* Added SoftDelete feature for VM and added tests for softdelete
 * Azure Site Recovery support for Azure Disk Encryption One Pass for Azure to Azure.'
 
         # Prerelease string of this module

src/RecoveryServices/RecoveryServices/ChangeLog.md

@@ -19,18 +19,20 @@
 -->
 ## Upcoming Release
 
-## Version 2.2.0
+## Version 2.3.0
 * Update references in .psd1 to use relative path
-* Added SoftDelete feature for VM and added tests for softdelete
 * Azure Site Recovery support for Azure Disk Encryption One Pass for Azure to Azure.
 
+## Version 2.2.0
+* Azure Backup added support for enabling and disabling soft delete feature for Recovery Services Vault.
+
 ## Version 2.1.0
 
 * Azure Site Recovery support to select disk type at enabling protection.
 * Azure Site Recovery bug fix for recovery plan action edit.
 * Azure Backup SQL Restore support to accept filestream DBs.
 * Azure Backup updated SDK version.
-* Azure Backup added support for enabling and disabling soft delete feature for Recovery Services Vault.
+
 
 ## Version 2.0.1
 

src/RecoveryServices/RecoveryServices/Properties/AssemblyInfo.cs

@@ -42,5 +42,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.2.0")]
-[assembly: AssemblyFileVersion("2.2.0")]
+[assembly: AssemblyVersion("2.3.0")]
+[assembly: AssemblyFileVersion("2.3.0")]

tools/Az/Az.psd1

@@ -93,7 +93,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.5'; },
                @{ModuleName = 'Az.PolicyInsights'; RequiredVersion = '1.1.4'; }, 
                @{ModuleName = 'Az.PowerBIEmbedded'; RequiredVersion = '1.1.1'; }, 
                @{ModuleName = 'Az.PrivateDns'; RequiredVersion = '1.0.2'; }, 
-               @{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '2.2.0'; }, 
+               @{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '2.3.0'; }, 
                @{ModuleName = 'Az.RedisCache'; RequiredVersion = '1.2.1'; }, 
                @{ModuleName = 'Az.Relay'; RequiredVersion = '1.0.3'; }, 
                @{ModuleName = 'Az.Resources'; RequiredVersion = '1.9.0'; }, 
@@ -297,7 +297,6 @@ Az.PrivateDns
 
 Az.RecoveryServices
 * Update references in .psd1 to use relative path
-* Added SoftDelete feature for VM and added tests for softdelete
 * Azure Site Recovery support for Azure Disk Encryption One Pass for Azure to Azure.
 
 Az.RedisCache