Skip to content

Commit 7cfa4ab

Browse files
author
Hovsep
authored
Merge pull request Azure#2487 from lamchester/dev
Fix LocalNetworkGateway, add tests
2 parents cce6c72 + 58c9116 commit 7cfa4ab

File tree

15 files changed

+910
-23
lines changed

15 files changed

+910
-23
lines changed

src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
121121
</Reference>
122122
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
123+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
124124
<Private>True</Private>
125125
</Reference>
126126
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
@@ -642,4 +642,4 @@
642642
<ItemGroup />
643643
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
644644
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
645-
</Project>
645+
</Project>

src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
</Reference>
131131
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
132132
<SpecificVersion>False</SpecificVersion>
133-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
133+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
134134
</Reference>
135135
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
136136
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -352,4 +352,4 @@
352352
</PropertyGroup>
353353
<Exec Command="$(PowerShellExe) $(PSCodeGenScriptPath) $(PSCodeGenTargetFolder) $(MSBuildProjectDirectory) $(ClientLibraryNamesSpace) $(BaseCmdletFullName) $(BaseCmdletClientName)" />
354354
</Target>
355-
</Project>
355+
</Project>

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
130130
</Reference>
131131
<Reference Include="Microsoft.WindowsAzure.Management.Network">
132-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
132+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
133133
</Reference>
134134
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
135135
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -712,4 +712,4 @@
712712
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
713713
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
714714
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
715-
</Project>
715+
</Project>

src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
</Reference>
134134
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
135135
<SpecificVersion>False</SpecificVersion>
136-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
136+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
137137
</Reference>
138138
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
139139
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -581,4 +581,4 @@
581581
</ItemGroup>
582582
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
583583
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
584-
</Project>
584+
</Project>

src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
107107
</Reference>
108108
<Reference Include="Microsoft.WindowsAzure.Management.Network">
109-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
109+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
110110
</Reference>
111111
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
112112
<SpecificVersion>False</SpecificVersion>
@@ -182,6 +182,7 @@
182182
<Compile Include="Routes\RemoveSubnetRouteTableTests.cs" />
183183
<Compile Include="Routes\SetRouteTests.cs" />
184184
<Compile Include="Routes\SetSubnetRouteTableTests.cs" />
185+
<Compile Include="ScenarioTests\Gateway\GatewayScenarioTests.cs" />
185186
<Compile Include="ScenarioTests\IPForwarding\IPForwardingScenarioTests.cs" />
186187
<Compile Include="ScenarioTests\MultiVip\MultiVip.cs" />
187188
<Compile Include="ScenarioTests\NetworkSecurityGroup\NSGScenarioTests.cs" />
@@ -193,6 +194,9 @@
193194
<ItemGroup>
194195
<None Include="MSSharedLibKey.snk" />
195196
<None Include="packages.config" />
197+
<None Include="ScenarioTests\Gateway\GatewayTests.ps1">
198+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
199+
</None>
196200
<None Include="ScenarioTests\IPForwarding\IPForwardingTests.ps1">
197201
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
198202
</None>
@@ -308,6 +312,12 @@
308312
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.ReservedIP\SetReservedIPAssocSimple.json">
309313
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
310314
</None>
315+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.GatewayScenarioTests\LocalNetworkGateway.json">
316+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
317+
</None>
318+
<None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.GatewayScenarioTests\LocalNetworkGatewayBgp.json">
319+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
320+
</None>
311321
<None Include="TestData\EmptyNetworkConfiguration.xml">
312322
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
313323
</None>
@@ -318,6 +328,7 @@
318328
<ItemGroup>
319329
<Content Include="Readme.txt" />
320330
</ItemGroup>
331+
<ItemGroup />
321332
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
322333
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
323-
</Project>
334+
</Project>
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
16+
namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests
17+
{
18+
using Microsoft.Azure.Commands.Common.Authentication;
19+
using Microsoft.Azure.Test;
20+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
21+
using Microsoft.WindowsAzure.Management;
22+
using Microsoft.WindowsAzure.Management.Compute;
23+
using Microsoft.WindowsAzure.Management.Network;
24+
using Microsoft.WindowsAzure.Management.Storage;
25+
using Microsoft.WindowsAzure.Commands.Utilities.Common;
26+
using System;
27+
using System.Collections.Generic;
28+
using System.IO;
29+
using System.Linq;
30+
using Xunit;
31+
32+
public class GatewayScenarioTests
33+
{
34+
private readonly EnvironmentSetupHelper helper = new EnvironmentSetupHelper();
35+
36+
[Fact]
37+
[Trait(Category.Service, Category.Network)]
38+
[Trait(Category.AcceptanceType, Category.CheckIn)]
39+
public void LocalNetworkGateway()
40+
{
41+
RunPowerShellTest("Test-LocalNetworkGateway");
42+
}
43+
44+
[Fact]
45+
[Trait(Category.Service, Category.Network)]
46+
[Trait(Category.AcceptanceType, Category.CheckIn)]
47+
public void LocalNetworkGatewayBgp()
48+
{
49+
RunPowerShellTest("Test-LocalNetworkGatewayBgp");
50+
}
51+
52+
#region Test setup
53+
54+
protected void SetupManagementClients()
55+
{
56+
var client = TestBase.GetServiceClient<NetworkManagementClient>(new RDFETestEnvironmentFactory());
57+
var client2 = TestBase.GetServiceClient<ManagementClient>(new RDFETestEnvironmentFactory());
58+
var client3 = TestBase.GetServiceClient<StorageManagementClient>(new RDFETestEnvironmentFactory());
59+
var client4 = TestBase.GetServiceClient<ComputeManagementClient>(new RDFETestEnvironmentFactory());
60+
helper.SetupManagementClients(client, client2, client3, client4);
61+
}
62+
63+
protected void RunPowerShellTest(params string[] scripts)
64+
{
65+
using (UndoContext context = UndoContext.Current)
66+
{
67+
context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2));
68+
69+
List<string> modules = Directory.GetFiles("ScenarioTests\\Gateway".AsAbsoluteLocation(), "*.ps1").ToList();
70+
modules.AddRange(Directory.GetFiles("ScenarioTests".AsAbsoluteLocation(), "*.ps1"));
71+
72+
SetupManagementClients();
73+
74+
helper.SetupEnvironment(AzureModule.AzureServiceManagement);
75+
helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray());
76+
77+
helper.RunPowerShellTest(scripts);
78+
}
79+
}
80+
#endregion
81+
}
82+
}
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
########################################################################### Gateway tests ###################################################################
16+
17+
<#
18+
.SYNOPSIS
19+
Tests for local network gateway right now
20+
#>
21+
22+
function Test-LocalNetworkGateway
23+
{
24+
# Setup
25+
$lngname = getAssetName
26+
$location="West US"
27+
28+
$subscription = Get-AzureSubscription -Current
29+
Set-AzureSubscription -SubscriptionId $subscription.SubscriptionId
30+
31+
# Create a local network gateway
32+
$ipAddr = "1.2.3.4"
33+
$addrSpace = "10.0.0.0/8"
34+
New-AzureLocalNetworkGateway -GatewayName $lngname -IpAddress $ipAddr -AddressSpace $addrSpace
35+
36+
# Retrieve a list of local network gateways, and get the one created above by name
37+
$lnglist = Get-AzureLocalNetworkGateway
38+
$lng = $lnglist | Where-Object { $_.GatewayName -eq $lngname }
39+
Assert-AreEqual $lng.IpAddress $ipAddr
40+
Assert-AreEqual $lng.AddressSpace $addrSpace
41+
42+
# Retrieve the local network gateway by ID
43+
$lng = Get-AzureLocalNetworkGateway -GatewayId $lng.GatewayId
44+
Assert-AreEqual $lng.IpAddress $ipAddr
45+
Assert-AreEqual $lng.AddressSpace $addrSpace
46+
47+
# Delete the local network gateway
48+
Remove-AzureLocalNetworkGateway -GatewayId $lng.GatewayId
49+
}
50+
51+
function Test-LocalNetworkGatewayBgp
52+
{
53+
# Setup
54+
$lngname = getAssetName
55+
$location="West US"
56+
57+
$subscription = Get-AzureSubscription -Current
58+
Set-AzureSubscription -SubscriptionId $subscription.SubscriptionId
59+
60+
# Create a local network gateway
61+
$ipAddr = "1.2.3.4"
62+
$addrSpace = "10.0.0.0/8"
63+
$asn = "1234"
64+
$bgpaddr = "10.0.0.1"
65+
New-AzureLocalNetworkGateway -GatewayName $lngname -IpAddress $ipAddr -AddressSpace $addrSpace -Asn $asn -BgpPeeringAddress $bgpaddr
66+
67+
# Retrieve a list of local network gateways, and get the one created above by name
68+
$lnglist = Get-AzureLocalNetworkGateway
69+
$lng = $lnglist | Where-Object { $_.GatewayName -eq $lngname }
70+
Assert-AreEqual $lng.IpAddress $ipAddr
71+
Assert-AreEqual $lng.AddressSpace $addrSpace
72+
Assert-AreEqual $lng.Asn $asn
73+
Assert-AreEqual $lng.BgpPeeringAddress $bgpaddr
74+
75+
# Retrieve the local network gateway by ID
76+
$lng = Get-AzureLocalNetworkGateway -GatewayId $lng.GatewayId
77+
Assert-AreEqual $lng.IpAddress $ipAddr
78+
Assert-AreEqual $lng.AddressSpace $addrSpace
79+
Assert-AreEqual $lng.Asn $asn
80+
Assert-AreEqual $lng.BgpPeeringAddress $bgpaddr
81+
82+
# Delete the local network gateway
83+
Remove-AzureLocalNetworkGateway -GatewayId $lng.GatewayId
84+
}

src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.GatewayScenarioTests/LocalNetworkGateway.json

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

src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.ScenarioTests.GatewayScenarioTests/LocalNetworkGatewayBgp.json

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

src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</Reference>
110110
<Reference Include="Microsoft.WindowsAzure.Management.Network">
111111
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
112+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
113113
</Reference>
114114
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115115
<SpecificVersion>False</SpecificVersion>
@@ -315,4 +315,4 @@
315315
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
316316
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
317317
<Import Project="..\..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets" Condition="Exists('..\..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets')" />
318-
</Project>
318+
</Project>

src/ServiceManagement/Network/Commands.Network/NetworkClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,9 +1235,9 @@ public IEnumerable<GetLocalNetworkGatewayContext> ListLocalNetworkGateways()
12351235
GatewayName = localNetworkGateway.GatewayName,
12361236
IpAddress = localNetworkGateway.IpAddress,
12371237
AddressSpace = localNetworkGateway.AddressSpace.ToList(),
1238-
Asn = localNetworkGateway.BgpSettings.Asn,
1239-
BgpPeeringAddress = localNetworkGateway.BgpSettings.BgpPeeringAddress,
1240-
PeerWeight = localNetworkGateway.BgpSettings.PeerWeight,
1238+
Asn = localNetworkGateway.BgpSettings != null?localNetworkGateway.BgpSettings.Asn : 0,
1239+
BgpPeeringAddress = localNetworkGateway.BgpSettings != null?localNetworkGateway.BgpSettings.BgpPeeringAddress : "",
1240+
PeerWeight = localNetworkGateway.BgpSettings != null?localNetworkGateway.BgpSettings.PeerWeight : 0,
12411241
};
12421242
});
12431243
PopulateOperationContext(response.RequestId, localNetworkGateways);

src/ServiceManagement/Network/Commands.Network/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.8.0" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.Management.Network" version="7.1.1" targetFramework="net45" />
21+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.1.2" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
2424
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
25-
</packages>
25+
</packages>

src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111111
</Reference>
112112
<Reference Include="Microsoft.WindowsAzure.Management.Network">
113-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
113+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
114114
</Reference>
115115
<Reference Include="Microsoft.WindowsAzure.Management.RemoteApp, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
116116
<SpecificVersion>False</SpecificVersion>
@@ -249,4 +249,4 @@
249249
</ItemGroup>
250250
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
251251
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
252-
</Project>
252+
</Project>

src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
</Reference>
140140
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
141141
<SpecificVersion>False</SpecificVersion>
142-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
142+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
143143
</Reference>
144144
<Reference Include="Microsoft.WindowsAzure.Management.Scheduler, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
145145
<SpecificVersion>False</SpecificVersion>
@@ -707,4 +707,4 @@
707707
<PostBuildEvent>powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "$(TargetDir)\"</PostBuildEvent>
708708
</PropertyGroup>
709709
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
710-
</Project>
710+
</Project>

0 commit comments

Comments
 (0)