NrpBugFixes

Author: deepakswifty

ChangeLog.txt

@@ -32,7 +32,7 @@
     * Get-AzureLoadBalancerBackendAddressPoolConfig
     * Get-AzureLoadBalancerFrontendIpConfig
     * Get-AzureLoadBalancerInboundNatRuleConfig
-    * Get-AzureLoadBalancerProbeConfig*
+    * Get-AzureLoadBalancerProbeConfig
     * Get-AzureLoadBalancerRuleConfig
     * New-AzureLoadBalancer
     * New-AzureLoadBalancerBackendAddressPoolConfig
@@ -60,6 +60,7 @@
     * Remove-AzureNetworkSecurityRuleConfig
     * Add-AzureNetworkSecurityRuleConfig
     * Set-AzureNetworkSecurityRuleConfig
+    * Get-AzureRemoteDesktopFile
 * Azure Storage
   * Added cmdlets in AzureResourceManager Mode
     * New-AzureStorageAccount

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

@@ -64,7 +64,10 @@ public PSVirtualNetwork GetVirtualNetwork(string resourceGroupName, string name)
             virtualNetwork.Tag =
                 TagsConversionHelper.CreateTagHashtable(getNetworkInterfaceResponse.VirtualNetwork.Tags);
 
-            virtualNetwork.DhcpOptions = new PSDhcpOptions();
+            if (virtualNetwork.DhcpOptions == null)
+            {
+                virtualNetwork.DhcpOptions = new PSDhcpOptions();
+            }
 
             return virtualNetwork;
         }