Merge branch 'master' into merge-network

anton-evseev · web-flow · commit 235b24f479f4 · 2019-10-24T18:24:06.000-07:00
diff --git a/src/Network/Network/ChangeLog.md b/src/Network/Network/ChangeLog.md
@@ -43,6 +43,7 @@
         - Update-AzureRmVpnConnection : added parameter EnableInternetSecurity
         - New-AzureRmExpressRouteConnection : added parameter EnableInternetSecurity
         - Set-AzureRmExpressRouteConnection : added parameter EnableInternetSecurity
+* Fix required subnet with name AzureBastionSubnet in `PSBastion` can be case insensitive
 
 ## Version 1.15.0
 * Add new cmdlet Get-AzAvailableServiceAlias which can be called to get the aliases that can be used for Service Endpoint Policies.
diff --git a/src/Network/Network/Models/Bastion/PSBastion.cs b/src/Network/Network/Models/Bastion/PSBastion.cs
@@ -53,7 +53,7 @@ public void Allocate(PSVirtualNetwork virtualNetwork, PSPublicIpAddress publicIp
             PSSubnet BastionSubnet = null;
             try
             {
-                BastionSubnet = virtualNetwork.Subnets.Single(subnet => BastionSubnetName.Equals(subnet.Name));
+                BastionSubnet = virtualNetwork.Subnets.Single(subnet => BastionSubnetName.Equals(subnet.Name, StringComparison.OrdinalIgnoreCase));
             }
 
             catch (InvalidOperationException)

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void Allocate(PSVirtualNetwork virtualNetwork, PSPublicIpAddress publicIp`
`53`	`53`	`PSSubnet BastionSubnet = null;`
`54`	`54`	`try`
`55`	`55`	`{`
`56`		`- BastionSubnet = virtualNetwork.Subnets.Single(subnet => BastionSubnetName.Equals(subnet.Name));`
	`56`	`+ BastionSubnet = virtualNetwork.Subnets.Single(subnet => BastionSubnetName.Equals(subnet.Name, StringComparison.OrdinalIgnoreCase));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`catch (InvalidOperationException)`