Skip to content

Commit 42b838b

Browse files
markcowlmarkcowl
authored
Merge pull request #4265 from DeepakRajendranMsft/UpdateNrpSdk
update ps with network SDK with Network 11.1.0
2 parents 12ec911 + 7ae15ff commit 42b838b

25 files changed

+128
-40
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.16.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
71-
<Private>True</Private>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7271
</Reference>
7372
<Reference Include="Microsoft.Azure.Management.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7473
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
10-
<package id="Microsoft.Azure.Management.Network" version="11.0.0-preview" targetFramework="net452" />
10+
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<Private>True</Private>
8585
</Reference>
8686
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
87+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
8888
</Reference>
8989
<Reference Include="Microsoft.Azure.Management.Storage">
9090
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.4.1.0-preview\lib\net45\Microsoft.Azure.Management.Storage.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
12-
<package id="Microsoft.Azure.Management.Network" version="11.0.0-preview" targetFramework="net452" />
12+
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.ResourceManager">
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
@@ -537,6 +537,10 @@
537537
<Project>{e1f5201d-6067-430e-b303-4e367652991b}</Project>
538538
<Name>Commands.Resources</Name>
539539
</ProjectReference>
540+
<ProjectReference Include="..\Commands.Network\Commands.Network.csproj">
541+
<Project>{98cfd96b-a6bc-4f15-ae2c-603fc2b58981}</Project>
542+
<Name>Commands.Network</Name>
543+
</ProjectReference>
540544
</ItemGroup>
541545
<ItemGroup>
542546
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎src/ResourceManager/Network/Commands.Network.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Insights" version="0.13.1-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="11.0.0-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Redis" version="3.1.1-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.ResourceManager" version="1.6.0-preview" targetFramework="net452" />
1414
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/BackendHttpSettings/AzureApplicationGatewayBackendHttpSettingsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class AzureApplicationGatewayBackendHttpSettingsBase : NetworkBaseCmdlet
5050
Mandatory = false,
5151
HelpMessage = "Request Timeout. Default value 30 seconds.")]
5252
[ValidateNotNullOrEmpty]
53-
public uint RequestTimeout { get; set; }
53+
public int RequestTimeout { get; set; }
5454

5555

5656
[Parameter(

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/ConnectionDraining/AzureApplicationGatewayConnectionDrainingBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class AzureApplicationGatewayConnectionDrainingBase : NetworkBaseCmdlet
2828
Mandatory = true,
2929
HelpMessage = "The number of seconds connection draining is active. Acceptable values are from 1 second to 3600 seconds.")]
3030
[ValidateNotNullOrEmpty]
31-
public uint DrainTimeoutInSec { get; set; }
31+
public int DrainTimeoutInSec { get; set; }
3232

3333
public override void ExecuteCmdlet()
3434
{

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/HttpListener/AzureApplicationGatewayHttpListenerBase.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.Network.Models;
16+
using System;
1617
using System.Management.Automation;
1718

1819
namespace Microsoft.Azure.Commands.Network
@@ -106,7 +107,15 @@ public PSApplicationGatewayHttpListener NewObject()
106107
httpListener.Name = this.Name;
107108
httpListener.Protocol = this.Protocol;
108109
httpListener.HostName = this.HostName;
109-
httpListener.RequireServerNameIndication = this.RequireServerNameIndication;
110+
111+
if(string.Equals(this.RequireServerNameIndication,"true", StringComparison.OrdinalIgnoreCase))
112+
{
113+
httpListener.RequireServerNameIndication = true;
114+
}
115+
else if(string.Equals(this.RequireServerNameIndication, "false", StringComparison.OrdinalIgnoreCase))
116+
{
117+
httpListener.RequireServerNameIndication = false;
118+
}
110119

111120
if (!string.IsNullOrEmpty(this.FrontendIPConfigurationId))
112121
{

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/Probe/AzureApplicationGatewayProbeConfigBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ public class AzureApplicationGatewayProbeConfigBase : NetworkBaseCmdlet
4949
Mandatory = true,
5050
HelpMessage = "Probe interval in seconds. This is the time interval between two consecutive probes")]
5151
[ValidateNotNullOrEmpty]
52-
public uint Interval { get; set; }
52+
public int Interval { get; set; }
5353

5454
[Parameter(
5555
Mandatory = true,
5656
HelpMessage = "Probe timeout in seconds. Probe marked as failed if valid response is not received with this timeout period")]
5757
[ValidateNotNullOrEmpty]
58-
public uint Timeout { get; set; }
58+
public int Timeout { get; set; }
5959

6060
[Parameter(
6161
Mandatory = true,
6262
HelpMessage = "Probe retry count. Backend server is marked down after consecutive probe failure count reaches UnhealthyThreshold")]
6363
[ValidateNotNullOrEmpty]
64-
public uint UnhealthyThreshold { get; set; }
64+
public int UnhealthyThreshold { get; set; }
6565

6666
[Parameter(
6767
Mandatory = false,
@@ -72,7 +72,7 @@ public class AzureApplicationGatewayProbeConfigBase : NetworkBaseCmdlet
7272
Mandatory = false,
7373
HelpMessage = "Minimum number of servers that are always marked healthy. Default value is 0")]
7474
[ValidateRange(0, int.MaxValue)]
75-
public uint MinServers { get; set; }
75+
public int MinServers { get; set; }
7676

7777
[Parameter(
7878
Mandatory = false,

0 commit comments

Comments
 (0)