Merge branch 'master' into fileaadga

Author: blueww

src/ApiManagement/ApiManagement/help/New-AzApiManagementProperty.md

@@ -36,7 +36,7 @@ The second command creates a property and assigns the strings in $Tags as tags o
 ### Example 2: Create a property that has a secret value
 ```powershell
 PS C:\>$apimContext = New-AzApiManagementContext -ResourceGroupName "Api-Default-WestUS" -ServiceName "contoso"
-PS C:\>New-AzApiManagementProperty -Context $apimContext -PropertyId "Property12" -Name "Secret Property -Value "Secret Property Value" -Secret
+PS C:\>New-AzApiManagementProperty -Context $apimContext -PropertyId "Property12" -Name "Secret Property" -Value "Secret Property Value" -Secret
 ```
 
 This command creates a **Property** that has a value that is encrypted.

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

@@ -67,9 +67,6 @@ public static LongTermRetentionPolicy GetPSLongTermRetentionPolicy(
                 ltrPolicy.YearlySchedule = GetPSLTRYearlySchedule(serviceClientRetPolicy.YearlySchedule, timeZone);
             }
 
-            // safe side validate
-            ltrPolicy.Validate();
-
             return ltrPolicy;
         }
 

src/RecoveryServices/RecoveryServices.Backup.Test/ScenarioTests/IaasVm/PolicyTests.ps1

@@ -19,6 +19,11 @@ $defaultPolicyName = "DefaultPolicy";
 $DefaultSnapshotDays = 2;
 $UpdatedSnapShotDays = 5;
 
+# Test old polices in the VaultId
+$oldResourceGroupName = "shracrg"
+$oldVaultName = "shracsql"
+$oldPolicyName = "iaasvmretentioncheck"
+
 function Test-AzureVMPolicy
 {
 	$location = Get-ResourceGroupLocation
@@ -47,6 +52,11 @@ function Test-AzureVMPolicy
 		Assert-AreEqual $policy.Name $policyName
 		Assert-AreEqual $policy.SnapshotRetentionInDays $DefaultSnapshotDays
 
+		# Get policy to test older policies
+		$oldVault = Get-AzRecoveryServicesVault -ResourceGroupName $oldResourceGroupName -Name $oldVaultName
+		$oldPolicy = Get-AzRecoveryServicesBackupProtectionPolicy -Name $oldPolicyName -VaultId $oldVault.ID
+		Assert-AreEqual $oldPolicy.RetentionPolicy.DailySchedule.DurationCountInDays 1
+		
 		# Get policy
 	    $policy = Get-AzRecoveryServicesBackupProtectionPolicy `
 			-VaultId $vault.ID `

src/RecoveryServices/RecoveryServices.Backup.Test/SessionRecords/Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests.PolicyTests/TestAzureVMPolicy.json

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fix for get-policy command for IaaSVMs
 
 ## Version 1.4.1
 * IaaSVM policy minimum retention in days changed to 7 from 1

src/RecoveryServices/RecoveryServices/ChangeLog.md

@@ -154,7 +154,8 @@ CmdletsToExport = 'Get-AzStorageAccount', 'Get-AzStorageAccountKey',
                'Update-AzStorageBlobServiceProperty', 
                'Get-AzStorageBlobServiceProperty', 
                'Enable-AzStorageBlobDeleteRetentionPolicy', 
-               'Disable-AzStorageBlobDeleteRetentionPolicy'
+               'Disable-AzStorageBlobDeleteRetentionPolicy', 
+               'Get-AzStorageFileHandle','Close-AzStorageFileHandle'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/Storage/Storage.Management/Az.Storage.psd1

@@ -18,10 +18,15 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Change 2 parameters "-IndexDocument" and "-ErrorDocument404Path" from required to optional  in cmdlet:
+    -  Enable-AzStorageStaticWebsite
 * Show more error information when cmdlet failed with StorageException 
 * Support create or update Storage account with Azure Files AAD DS Authentication
     -  New-AzStorageAccount
     -  Set-AzStorageAccount
+* Support list or close file handles of a file share, file directory or a file
+    - Get-AzStorageFileHandle
+    - Close-AzStorageFileHandle
 
 ## Version 1.4.0
 * Support Kind FileStorage and SkuName Premium_ZRS when create Storage account

src/Storage/Storage.Management/ChangeLog.md

@@ -15,9 +15,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="12.0.0" />
-    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="10.0.1" />
-    <PackageReference Include="Microsoft.Azure.Storage.File" Version="10.0.1" />
-    <PackageReference Include="Microsoft.Azure.Storage.Queue" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Azure.Storage.File" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Azure.Storage.Queue" Version="10.0.3" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(StorageToolsPath)Adapters\ARM.Storage.6\ARMStorageProvider.cs" Link="Common\ARMStorageProvider.cs" />

src/Storage/Storage.Management/Storage.Management.csproj

@@ -20,6 +20,9 @@ Adds an action to the input ManagementPolicy Action Group object, or creates a M
 ### [Add-AzStorageAccountNetworkRule](Add-AzStorageAccountNetworkRule.md)
  Add IpRules or VirtualNetworkRules to the NetworkRule property of a Storage account
 
+### [Close-AzStorageFileHandle](Close-AzStorageFileHandle.md)
+Closes file handles of a file share, a file directory or a file.
+
 ### [Disable-AzStorageBlobDeleteRetentionPolicy](Disable-AzStorageBlobDeleteRetentionPolicy.md)
 Disable delete retention policy for the Azure Storage Blob service.
 
@@ -89,6 +92,9 @@ Downloads the contents of a file.
 ### [Get-AzStorageFileCopyState](Get-AzStorageFileCopyState.md)
 Gets the state of a copy operation.
 
+### [Get-AzStorageFileHandle](Get-AzStorageFileHandle.md)
+Lists file handles of a file share, a file directory or a file.
+
 ### [Get-AzStorageQueue](Get-AzStorageQueue.md)
 Lists storage queues.