HPF PR: dev <- Azure:dev

AzurePowershell.Test.targets

@@ -88,6 +88,19 @@
       <XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\Cdn\Commands.Cdn.Test\bin\Debug\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.dll"/>
       <XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\Automation\Commands.Automation.Test\bin\Debug\Microsoft.Azure.Commands.ResourceManager.Automation.Test.dll"/>
+      <!-- <XUnitTests Include=".\src\ResourceManager\AzureStackAdmin\Commands.AzureStackAdmin.Test\bin\Debug\Microsoft.AzureStack.Commands.Admin.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\AzureStackStorage\Commands.AzureStackStorage.Tests\bin\Debug\Microsoft.AzureStack.Commands.StorageAdmin.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLake.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\DevTestLabs\Commands.DevTestLabs.Test\bin\Debug\Microsoft.Azure.Commands.DevTestLabs.Test.dll"/> 
+      <XUnitTests Include=".\src\ResourceManager\HDInsight\Commands.HDInsight.Test\bin\Debug\Commands.HDInsight.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\Insights\Commands.Insights.Test\bin\Debug\Microsoft.Azure.Commands.Insights.Test.dll"/> 
+      <XUnitTests Include=".\src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServicesArm.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\RecoveryServices.Backup\Commands.RecoveryServices.Backup.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll"/> -->
+      <XUnitTests Include=".\src\ResourceManager\RedisCache\Commands.RedisCache.Test\bin\Debug\Microsoft.Azure.Commands.RedisCache.Test.dll"/>
+      <!--<XUnitTests Include=".\src\ResourceManager\ServerManagement\Commands.ServerManagement.Test\bin\Debug\Microsoft.Azure.Commands.ServerManagement.Test.dll"/>
+      <XUnitTests Include=".\src\ResourceManager\Storage\Commands.Management.Storage.Test\bin\Debug\Microsoft.Azure.Commands.Management.Storage.Test.dll"/>-->
       <XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
       <XUnitTests Include="@(AsmXUnitTests)"/>
     </ItemGroup>

ChangeLog.md

@@ -1,3 +1,13 @@
+##2016.07.04 version 1.6.0
+* Azure SQL DB Backup/Restore
+  * Cmdlets for LTR (Long Term Retention) backup feature
+	* Get-AzureRmSqlServerBackupLongTermRetentionVault
+	* Get-AzureRmSqlDatabaseBackupLongTermRetentionPolicy
+	* Set-AzureRmSqlServerBackupLongTermRetentionVault
+	* Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy
+  * Restore-AzureRmSqlDatabase now supports point-in-time restore of a deleted database
+  * Restore-AzureRmSqlDatabase now supports restoring from a Long Term Retention backup
+
 ##2016.06.01 version 1.5.0
 * Azure Resource Manager
   - (Get/Set/New/Remove)-AzureRmResourceGroup cmdlets will now use the new autorest generated ARM assembly
@@ -279,7 +289,7 @@
     - New-AzureStorageShareSASToken
     - New-AzureStorageQueueSASToken
     - New-AzureStorageTableSASToken
-* Azure SQL DB Backup/restore
+* Azure SQL DB Backup/Restore
   * Get-AzureRmSqlDatabaseGeoBackup
   * Get-AzureRmSqlDeletedDatabaseBackup
   * Restore-AzureRmSqlDatabase

src/ResourceManager/Automation/Commands.Automation/Common/AutomationClient.cs

@@ -867,7 +867,7 @@ public CredentialInfo CreateCredential(string resourceGroupName, string automati
 
             if (createdCredential == null || createdCredential.StatusCode != HttpStatusCode.Created)
             {
-                new AzureAutomationOperationException(string.Format(Resources.AutomationOperationFailed, "Create",
+                throw new AzureAutomationOperationException(string.Format(Resources.AutomationOperationFailed, "Create",
                     "credential", name, automationAccountName));
             }
             return new CredentialInfo(resourceGroupName, automationAccountName, createdCredential.Credential);
@@ -891,7 +891,7 @@ public CredentialInfo UpdateCredential(string resourceGroupName, string automati
 
             if (credential == null || credential.StatusCode != HttpStatusCode.OK)
             {
-                new AzureAutomationOperationException(string.Format(Resources.AutomationOperationFailed, "Update",
+                throw new AzureAutomationOperationException(string.Format(Resources.AutomationOperationFailed, "Update",
                     "credential", name, automationAccountName));
             }
 

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureRMBackupJob.cs

@@ -90,7 +90,6 @@ public override void ExecuteCmdlet()
                         throw new Exception(Resources.AzureBackupJobArguementException);
                     }
                     WriteDebug(Resources.SettingStartTime);
-                    From = new DateTime();
                     From = AzureBackupJobHelper.MinimumAllowedDate;
                 }
 
@@ -112,7 +111,6 @@ public override void ExecuteCmdlet()
                     else
                     {
                         WriteDebug(Resources.SettingEndTime);
-                        To = new DateTime();
                         To = AzureBackupJobHelper.MinimumAllowedDate;
                     }
                 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/WaitAzureRMBackupJob.cs

@@ -96,7 +96,6 @@ public override void ExecuteCmdlet()
             {
                 if (!TimeOut.HasValue)
                 {
-                    TimeOut = new long();
                     TimeOut = Int64.MaxValue;
                 }
 

src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/GetBatchTaskCommandTests.cs

@@ -172,9 +172,7 @@ public void ListBatchTasksODataTest()
                 };
 
             RequestInterceptor requestInterceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(responseToUse: response, requestAction: extractTaskListAction);
-            cmdlet.AdditionalBehaviors = new List<BatchClientBehavior>() { requestInterceptor };
-
-            cmdlet.AdditionalBehaviors = new List<BatchClientBehavior>() { requestInterceptor };
+            cmdlet.AdditionalBehaviors = new List<BatchClientBehavior> { requestInterceptor };
 
             cmdlet.ExecuteCmdlet();
 

src/ResourceManager/Insights/Commands.Insights/OutputClasses/CustomPrinter.cs

@@ -79,7 +79,7 @@ private static void Print(object obj, string name, string currentIndent, StringB
 
             ICollection objAsCollection = obj as ICollection;
 
-            propName.Replace(':', ' ');
+            propName = propName.Replace(':', ' ');
             if (!string.IsNullOrWhiteSpace(propName))
             {
                 sb.AppendLine(propName);

src/ResourceManager/Network/Commands.Network/ApplicationGateway/NewAzureApplicationGatewayCommand.cs

@@ -162,61 +162,51 @@ private PSApplicationGateway CreateApplicationGateway()
 
             if (this.GatewayIPConfigurations != null)
             {
-                applicationGateway.GatewayIPConfigurations = new List<PSApplicationGatewayIPConfiguration>();
                 applicationGateway.GatewayIPConfigurations = this.GatewayIPConfigurations;
             }
 
             if (this.SslCertificates != null)
             {
-                applicationGateway.SslCertificates = new List<PSApplicationGatewaySslCertificate>();
                 applicationGateway.SslCertificates = this.SslCertificates;
             }
 
             if (this.FrontendIPConfigurations != null)
             {
-                applicationGateway.FrontendIPConfigurations = new List<PSApplicationGatewayFrontendIPConfiguration>();
                 applicationGateway.FrontendIPConfigurations = this.FrontendIPConfigurations;
             }
 
             if (this.FrontendPorts != null)
             {
-                applicationGateway.FrontendPorts = new List<PSApplicationGatewayFrontendPort>();
                 applicationGateway.FrontendPorts = this.FrontendPorts;
             }
 
             if (this.Probes != null)
             {
-                applicationGateway.Probes = new List<PSApplicationGatewayProbe>();
                 applicationGateway.Probes = this.Probes;
             }
 
             if (this.BackendAddressPools != null)
             {
-                applicationGateway.BackendAddressPools = new List<PSApplicationGatewayBackendAddressPool>();
                 applicationGateway.BackendAddressPools = this.BackendAddressPools;
             }
 
             if (this.BackendHttpSettingsCollection != null)
             {
-                applicationGateway.BackendHttpSettingsCollection = new List<PSApplicationGatewayBackendHttpSettings>();
                 applicationGateway.BackendHttpSettingsCollection = this.BackendHttpSettingsCollection;
             }
 
             if (this.HttpListeners != null)
             {
-                applicationGateway.HttpListeners = new List<PSApplicationGatewayHttpListener>();
                 applicationGateway.HttpListeners = this.HttpListeners;
             }
 
             if (this.UrlPathMaps != null)
             {
-                applicationGateway.UrlPathMaps = new List<PSApplicationGatewayUrlPathMap>();
                 applicationGateway.UrlPathMaps = this.UrlPathMaps;
             }
 
             if (this.RequestRoutingRules != null)
             {
-                applicationGateway.RequestRoutingRules = new List<PSApplicationGatewayRequestRoutingRule>();
                 applicationGateway.RequestRoutingRules = this.RequestRoutingRules;
             }
 

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/NewAzureExpressRouteCircuitCommand.cs

@@ -161,9 +161,7 @@ private PSExpressRouteCircuit CreateExpressRouteCircuit()
                 circuit.ServiceProviderProperties.BandwidthInMbps = this.BandwidthInMbps;
             }
 
-            circuit.Peerings = new List<PSPeering>();
             circuit.Peerings = this.Peering;
-            circuit.Authorizations = new List<PSExpressRouteCircuitAuthorization>();
             circuit.Authorizations = this.Authorization;
             circuit.AllowClassicOperations = this.AllowClassicOperations;
 

src/ResourceManager/Network/Commands.Network/LoadBalancer/NewAzureLoadBalancerCommand.cs

@@ -130,37 +130,31 @@ private PSLoadBalancer CreateLoadBalancer()
 
             if (this.FrontendIpConfiguration != null)
             {
-                loadBalancer.FrontendIpConfigurations = new List<PSFrontendIPConfiguration>();
                 loadBalancer.FrontendIpConfigurations = this.FrontendIpConfiguration;
             }
 
             if (this.BackendAddressPool != null)
             {
-                loadBalancer.BackendAddressPools = new List<PSBackendAddressPool>();
                 loadBalancer.BackendAddressPools = this.BackendAddressPool;
             }
 
             if (this.Probe != null)
             {
-                loadBalancer.Probes = new List<PSProbe>();
                 loadBalancer.Probes = this.Probe;
             }
 
             if (this.InboundNatRule != null)
             {
-                loadBalancer.InboundNatRules = new List<PSInboundNatRule>();
                 loadBalancer.InboundNatRules = this.InboundNatRule;
             }
 
             if (this.LoadBalancingRule != null)
             {
-                loadBalancer.LoadBalancingRules = new List<PSLoadBalancingRule>();
                 loadBalancer.LoadBalancingRules = this.LoadBalancingRule;
             }
 
             if (this.InboundNatPool != null)
             {
-                loadBalancer.InboundNatPools = new List<PSInboundNatPool>();
                 loadBalancer.InboundNatPools = this.InboundNatPool;
             }
 

src/ResourceManager/Network/Commands.Network/VirtualNetwork/NewAzureVirtualNetworkCommand.cs

@@ -118,7 +118,6 @@ private PSVirtualNetwork CreateVirtualNetwork()
                 vnet.DhcpOptions.DnsServers = this.DnsServer;
             }
 
-            vnet.Subnets = new List<PSSubnet>();
             vnet.Subnets = this.Subnet;
 
             // Map to the sdk object

src/ResourceManager/Network/Commands.Network/VirtualNetworkGateway/NewAzureVirtualNetworkGatewayCommand.cs

@@ -176,7 +176,6 @@ private PSVirtualNetworkGateway CreateVirtualNetworkGateway()
 
             if (this.IpConfigurations != null)
             {
-                vnetGateway.IpConfigurations = new List<PSVirtualNetworkGatewayIpConfiguration>();
                 vnetGateway.IpConfigurations = this.IpConfigurations;
             }
 

src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Models/PSSearchListSavedSearchResponse.cs

@@ -26,19 +26,17 @@ public PSSearchListSavedSearchResponse()
 
         public PSSearchListSavedSearchResponse(SearchListSavedSearchResponse searchResponse)
         {
-            if (searchResponse != null)
+            if (searchResponse == null)
             {
-                if (searchResponse == null)
-                {
-                    throw new ArgumentNullException("saved search response");
-                }
-                SearchMetadata m = searchResponse.Metadata;
-                this.Metadata = new PSSearchMetadata(searchResponse.Metadata);
-                this.Value = new List<PSSavedSearchValue>();
-                foreach (SavedSearchValue v in searchResponse.Value)
-                {
-                    this.Value.Add(new PSSavedSearchValue(v));
-                }
+                throw new ArgumentNullException("saved search response");
+            }
+
+            SearchMetadata m = searchResponse.Metadata;
+            this.Metadata = new PSSearchMetadata(searchResponse.Metadata);
+            this.Value = new List<PSSavedSearchValue>();
+            foreach (SavedSearchValue v in searchResponse.Value)
+            {
+                this.Value.Add(new PSSavedSearchValue(v));
             }
         }
 

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/SdkClient/ResourceManagerSdkClient.cs

@@ -351,13 +351,11 @@ private List<DeploymentOperation> GetNewOperations(List<DeploymentOperation> old
                     Enum.TryParse<HttpStatusCode>(operation.Properties.StatusCode, out statusCode);
                     if (!statusCode.IsClientFailureRequest())
                     {
-                        List<DeploymentOperation> newNestedOperations = new List<DeploymentOperation>();
-
                         var result = ResourceManagementClient.DeploymentOperations.List(
                             resourceGroupName: ResourceIdUtility.GetResourceGroupName(operation.Properties.TargetResource.Id),
                             deploymentName: operation.Properties.TargetResource.ResourceName);
 
-                        newNestedOperations = GetNewOperations(operations, result);
+                        List<DeploymentOperation>  newNestedOperations = GetNewOperations(operations, result);
 
                         foreach (DeploymentOperation op in newNestedOperations)
                         {

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/TemplateUtility.cs

@@ -39,7 +39,6 @@ public static class TemplateUtility
         /// <returns>The template parameters</returns>
         public static RuntimeDefinedParameterDictionary GetTemplateParametersFromFile(string templateFilePath, Hashtable templateParameterObject, string templateParameterFilePath, string[] staticParameters)
         {
-            RuntimeDefinedParameterDictionary dynamicParameters = new RuntimeDefinedParameterDictionary();
             string templateContent = null;
 
             if (templateFilePath != null)
@@ -54,7 +53,7 @@ public static RuntimeDefinedParameterDictionary GetTemplateParametersFromFile(st
                 }
             }
 
-            dynamicParameters = ParseTemplateAndExtractParameters(templateContent, templateParameterObject, templateParameterFilePath, staticParameters);
+            RuntimeDefinedParameterDictionary dynamicParameters = ParseTemplateAndExtractParameters(templateContent, templateParameterObject, templateParameterFilePath, staticParameters);
 
             return dynamicParameters;
         }

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/StartAzureSiteRecoveryTestFailoverJob.cs

@@ -236,7 +236,7 @@ private void StartPETestFailover()
                 }
                 else
                 {
-                    new ArgumentException(Properties.Resources.UnsupportedDirectionForTFO);// Throw Unsupported Direction Exception
+                    throw new ArgumentException(Properties.Resources.UnsupportedDirectionForTFO);// Throw Unsupported Direction Exception
                 }
             }
 
@@ -290,7 +290,7 @@ private void StartRpTestFailover()
                     }
                     else
                     {
-                        new ArgumentException(Properties.Resources.UnsupportedDirectionForTFO);// Throw Unsupported Direction Exception
+                        throw new ArgumentException(Properties.Resources.UnsupportedDirectionForTFO);// Throw Unsupported Direction Exception
                     }
                 }
             }

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

@@ -71,7 +71,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Sql">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.46.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.47.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
@@ -231,7 +231,7 @@
     <None Include="ScenarioTests\ElasticPoolCrudTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-	<None Include="ScenarioTests\ImportExportTests.ps1">
+    <None Include="ScenarioTests\ImportExportTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <Compile Include="ScenarioTests\LocationCapabilitiesTests.cs" />
@@ -248,8 +248,8 @@
     <Compile Include="ScenarioTests\SqlTestsBase.cs" />
     <Compile Include="ScenarioTests\TransparentDataEncryptionCrudTests.cs" />
     <Compile Include="ScenarioTests\IndexRecommendationTests.cs" />
-	<Compile Include="ScenarioTests\ImportExportTests.cs" />
-	<Compile Include="UnitTests\AzureSqlDatabaseImportExportTests.cs" />
+    <Compile Include="ScenarioTests\ImportExportTests.cs" />
+    <Compile Include="UnitTests\AzureSqlDatabaseImportExportTests.cs" />
     <Compile Include="UnitTests\AzureSqlCmdletBaseAttributeTests.cs" />
     <Compile Include="UnitTests\AzureSqlDatabaseActivationAttributeTest.cs" />
     <Compile Include="UnitTests\AzureSqlDatabaseAttributeTests.cs" />
@@ -431,6 +431,15 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests\TestRestorePointInTimeBackup.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests\TestRestoreLongTermRetentionBackup.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests\TestServerBackupLongTermRetentionVault.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseBackupTests\TestDatabaseBackupLongTermRetentionPolicy.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseCreate.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -608,7 +617,7 @@
     <None Include="Templates\sql-ddm-test-env-setup.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-	<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ImportExportTests\TestExportDatabase.json">
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ImportExportTests\TestExportDatabase.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ImportExportTests\TestImportDatabase.json">