Skip to content

Commit 5919291

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#5993 from Nilambari/preview2
Bump up network sdk version from 17.0.0.preview to 18.0.0.preview
2 parents 9427911 + 3869e4c commit 5919291

File tree

154 files changed

+406234
-126927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+406234
-126927
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
44
<Import Project="..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
@@ -66,14 +66,13 @@
6666
<Reference Include="Microsoft.Azure.Management.Compute">
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.18.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
69+
<Reference Include="Microsoft.Azure.Management.Network, Version=18.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
71+
</Reference>
6972
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7073
<SpecificVersion>False</SpecificVersion>
7174
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.3.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
7275
</Reference>
73-
<Reference Include="Microsoft.Azure.Management.Network, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
75-
<Private>True</Private>
76-
</Reference>
7776
<Reference Include="Microsoft.Azure.Management.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7877
<SpecificVersion>False</SpecificVersion>
7978
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.4.1.0-preview\lib\net45\Microsoft.Azure.Management.Storage.dll</HintPath>
@@ -96,6 +95,8 @@
9695
<SpecificVersion>False</SpecificVersion>
9796
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
9897
</Reference>
98+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
99+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
99100
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
100101
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.0-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
101102
<Private>True</Private>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="18.0.0" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="17.0.0-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="18.0.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
@@ -17,6 +17,8 @@
1717
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1818
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1919
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
20+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.11" targetFramework="net452" />
21+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.12" targetFramework="net452" />
2022
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.0-preview" targetFramework="net45" />
2123
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
2224
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.2.2.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Network, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
72-
<Private>True</Private>
69+
<Reference Include="Microsoft.Azure.Management.Network, Version=18.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7371
</Reference>
7472
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7573
<SpecificVersion>False</SpecificVersion>
@@ -81,9 +79,7 @@
8179
<HintPath>..\..\..\packages\Microsoft.Azure.Test.Framework.1.0.6179.26854-prerelease\lib\net45\Microsoft.Azure.Test.Framework.dll</HintPath>
8280
</Reference>
8381
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.7-preview\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
86-
<Private>True</Private>
82+
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.6.8\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
8783
</Reference>
8884
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8985
<SpecificVersion>False</SpecificVersion>
@@ -94,10 +90,10 @@
9490
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
9591
<Private>True</Private>
9692
</Reference>
93+
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
94+
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
9795
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98-
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
100-
<Private>True</Private>
96+
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.10\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
10197
</Reference>
10298
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework">
10399
<HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.2\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrud.json‎

Lines changed: 430 additions & 373 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkIds.json‎

Lines changed: 547 additions & 376 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudByVirtualNetworkObjects.json‎

Lines changed: 368 additions & 425 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudRegistrationVirtualNetwork.json‎

Lines changed: 301 additions & 301 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Dns/Commands.Dns.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.DnsTests.ZoneTests/TestPrivateZoneCrudResolutionVirtualNetwork.json‎

Lines changed: 293 additions & 350 deletions
Large diffs are not rendered by default.

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22
<packages>
33
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
65
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Dns" version="2.2.0-preview" targetFramework="net452" />
9-
<package id="Microsoft.Azure.Management.Network" version="17.0.0-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.Management.Network" version="18.0.0-preview" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.ResourceManager" version="1.1.1-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
12-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
1312
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
13+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.8" targetFramework="net452" />
1414
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1616
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
1717
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1818
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
19+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.11" targetFramework="net452" />
20+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.12" targetFramework="net452" />
21+
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.10" targetFramework="net452" />
1922
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.2" targetFramework="net45" />
20-
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
2123
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
2224
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2325
<package id="xunit" version="2.1.0" targetFramework="net45" />
@@ -27,4 +29,4 @@
2729
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
2830
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
2931
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
30-
</packages>
32+
</packages>

‎src/ResourceManager/Network/AzureRM.Network.Netcore.psd1‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,10 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
317317
'New-AzureRmApplicationSecurityGroup',
318318
'Remove-AzureRmApplicationSecurityGroup',
319319
'Get-AzureRmApplicationSecurityGroup',
320-
'New-AzureRmPublicIpTag'
320+
'New-AzureRmPublicIpTag',
321+
'New-AzureRmDdosProtectionPlan',
322+
'Get-AzureRmDdosProtectionPlan',
323+
'Remove-AzureRmDdosProtectionPlan'
321324

322325
# Variables to export from this module
323326
# VariablesToExport = @()

0 commit comments

Comments
 (0)