diff --git a/src/ResourceManager/Common/Commands.Common.Strategies/Common.Strategies.Netcore.csproj b/src/ResourceManager/Common/Commands.Common.Strategies/Common.Strategies.Netcore.csproj index def43c8dd476..f0ba016157d4 100644 --- a/src/ResourceManager/Common/Commands.Common.Strategies/Common.Strategies.Netcore.csproj +++ b/src/ResourceManager/Common/Commands.Common.Strategies/Common.Strategies.Netcore.csproj @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj index f973f8557517..21f7b39abb90 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj +++ b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj @@ -66,8 +66,8 @@ ..\..\..\packages\Microsoft.Azure.Management.Compute.18.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll - - ..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll + + ..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll True diff --git a/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj b/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj index 4ed2939e09f5..9c2fb8036663 100644 --- a/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj +++ b/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj @@ -66,9 +66,9 @@ ..\..\..\packages\Microsoft.Azure.Management.Dns.2.2.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll True - + False - ..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll + ..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll True diff --git a/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj b/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj index c868fc4b79cb..0dd587f31d0e 100644 --- a/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj +++ b/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj @@ -64,8 +64,8 @@ ..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll True - - ..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll + + ..\..\..\packages\Microsoft.Azure.Management.Network.19.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll True diff --git a/src/ResourceManager/Network/Commands.Network.Test/packages.config b/src/ResourceManager/Network/Commands.Network.Test/packages.config index e07521731bbd..5f42af89b306 100644 --- a/src/ResourceManager/Network/Commands.Network.Test/packages.config +++ b/src/ResourceManager/Network/Commands.Network.Test/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj b/src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj index 507052fc9790..3edc88776502 100644 --- a/src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj +++ b/src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj index 19c65d0e9baf..60e8d38dc006 100644 --- a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj +++ b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj @@ -57,8 +57,8 @@ ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True - - ..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll + + ..\..\..\packages\Microsoft.Azure.Management.Network.19.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll True diff --git a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/AzureExpressRouteCircuitPeeringConfigBase.cs b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/AzureExpressRouteCircuitPeeringConfigBase.cs index 40fa7d86f756..f91bc44988c7 100644 --- a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/AzureExpressRouteCircuitPeeringConfigBase.cs +++ b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/AzureExpressRouteCircuitPeeringConfigBase.cs @@ -38,9 +38,9 @@ public class AzureExpressRouteCircuitPeeringConfigBase : NetworkBaseCmdlet HelpMessage = "The PeeringType")] [ValidateNotNullOrEmpty] [ValidateSet( - MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering, - MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering, - MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering, + MNM.ExpressRoutePeeringType.AzurePrivatePeering, + MNM.ExpressRoutePeeringType.AzurePublicPeering, + MNM.ExpressRoutePeeringType.MicrosoftPeering, IgnoreCase = true)] public string PeeringType { get; set; } diff --git a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/RemoveAzureExpressRouteCircuitPeeringConfigCommand.cs b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/RemoveAzureExpressRouteCircuitPeeringConfigCommand.cs index ae77880e4043..ccdce8d4d6fb 100644 --- a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/RemoveAzureExpressRouteCircuitPeeringConfigCommand.cs +++ b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/RemoveAzureExpressRouteCircuitPeeringConfigCommand.cs @@ -59,8 +59,8 @@ public override void Execute() // For example if the peering has only IPv4 properties set and the user tries to remove IPv6 address family peering, we can ignore the remove operation bool validateAddressFamilyPresent = true; - if ((this.PeerAddressType == IPv4 && peering.PeeringType == MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering && peering.MicrosoftPeeringConfig == null) || - (this.PeerAddressType == IPv6 && peering.PeeringType == MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering && (peering.Ipv6PeeringConfig == null || peering.Ipv6PeeringConfig.MicrosoftPeeringConfig == null))) + if ((this.PeerAddressType == IPv4 && peering.PeeringType == MNM.ExpressRoutePeeringType.MicrosoftPeering && peering.MicrosoftPeeringConfig == null) || + (this.PeerAddressType == IPv6 && peering.PeeringType == MNM.ExpressRoutePeeringType.MicrosoftPeering && (peering.Ipv6PeeringConfig == null || peering.Ipv6PeeringConfig.MicrosoftPeeringConfig == null))) { validateAddressFamilyPresent = false; } diff --git a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitARPTableCommand.cs b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitARPTableCommand.cs index fe76f2982d82..3d64fe7a22e7 100644 --- a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitARPTableCommand.cs +++ b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitARPTableCommand.cs @@ -54,9 +54,9 @@ public class GetAzureExpressRouteCircuitARPTableCommand : NetworkBaseCmdlet Mandatory = false, HelpMessage = "The PeeringType")] [ValidateSet( - MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering, - MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering, - MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering, + MNM.ExpressRoutePeeringType.AzurePrivatePeering, + MNM.ExpressRoutePeeringType.AzurePublicPeering, + MNM.ExpressRoutePeeringType.MicrosoftPeering, IgnoreCase = true)] public string PeeringType { get; set; } diff --git a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableCommand.cs b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableCommand.cs index 26ae394dc416..81e9e81455a2 100644 --- a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableCommand.cs +++ b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableCommand.cs @@ -48,9 +48,9 @@ public class GetAzureRmExpressRouteCircuitRouteTable : NetworkBaseCmdlet Mandatory = false, HelpMessage = "The PeeringType")] [ValidateSet( - MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering, - MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering, - MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering, + MNM.ExpressRoutePeeringType.AzurePrivatePeering, + MNM.ExpressRoutePeeringType.AzurePublicPeering, + MNM.ExpressRoutePeeringType.MicrosoftPeering, IgnoreCase = true)] public string PeeringType { get; set; } diff --git a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableSummaryCommand.cs b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableSummaryCommand.cs index b8874cf298ad..1103494ae859 100644 --- a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableSummaryCommand.cs +++ b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableSummaryCommand.cs @@ -48,9 +48,9 @@ public class GetAzureRmExpressRouteCircuitRouteTableSummaryCommand : NetworkBase Mandatory = false, HelpMessage = "The PeeringType")] [ValidateSet( - MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering, - MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering, - MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering, + MNM.ExpressRoutePeeringType.AzurePrivatePeering, + MNM.ExpressRoutePeeringType.AzurePublicPeering, + MNM.ExpressRoutePeeringType.MicrosoftPeering, IgnoreCase = true)] public string PeeringType { get; set; } diff --git a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteStatsCommand.cs b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteStatsCommand.cs index 41ab59c2ee69..1c763462b775 100644 --- a/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteStatsCommand.cs +++ b/src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteStatsCommand.cs @@ -43,9 +43,9 @@ public class GetAzureExpressRouteCircuitStatsCommand : NetworkBaseCmdlet Mandatory = false, HelpMessage = "The PeeringType")] [ValidateSet( - MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering, - MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering, - MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering, + MNM.ExpressRoutePeeringType.AzurePrivatePeering, + MNM.ExpressRoutePeeringType.AzurePublicPeering, + MNM.ExpressRoutePeeringType.MicrosoftPeering, IgnoreCase = true)] public string PeeringType { get; set; } diff --git a/src/ResourceManager/Network/Commands.Network/packages.config b/src/ResourceManager/Network/Commands.Network/packages.config index d084afd5ecff..56082d509bad 100644 --- a/src/ResourceManager/Network/Commands.Network/packages.config +++ b/src/ResourceManager/Network/Commands.Network/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj index 1be93d288314..fab714cc6bef 100644 --- a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj +++ b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj @@ -44,8 +44,8 @@ ..\..\..\packages\Microsoft.Azure.Management.Compute.18.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll True - - ..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll + + ..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll True diff --git a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj index 6d5f55a751a8..3ca847da127d 100644 --- a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj +++ b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj index a51cc5365f36..06b9c79db0ed 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj +++ b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj @@ -73,8 +73,8 @@ ..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll True - - ..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll + + ..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll True diff --git a/tools/LocalFeed/Microsoft.Azure.Management.Network.19.0.0.nupkg b/tools/LocalFeed/Microsoft.Azure.Management.Network.19.0.0.nupkg new file mode 100644 index 000000000000..9e06e2ad3c79 Binary files /dev/null and b/tools/LocalFeed/Microsoft.Azure.Management.Network.19.0.0.nupkg differ diff --git a/tools/LocalFeed/Microsoft.Azure.Management.Network.19.0.0.symbols.nupkg b/tools/LocalFeed/Microsoft.Azure.Management.Network.19.0.0.symbols.nupkg new file mode 100644 index 000000000000..b897b30f93e4 Binary files /dev/null and b/tools/LocalFeed/Microsoft.Azure.Management.Network.19.0.0.symbols.nupkg differ